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 -----
 .../2011_03_11_00_characters_channels.sql          |   7 +
 .../auth_char/2011_03_11_0_characters_channels.sql |   7 -
 .../auth_char/2011_03_17_00_characters_corpse.sql  |   1 +
 .../auth_char/2011_03_17_0_characters_corpse.sql   |   1 -
 .../2011_03_18_00_characters_game_event_misc.sql   |  19 +
 .../2011_03_18_01_characters_game_event_misc.sql   |   2 +
 .../2011_03_18_0_characters_game_event_misc.sql    |  19 -
 .../2011_03_18_1_characters_game_event_misc.sql    |   2 -
 .../world/2011_03_05_01_world_spell_proc_event.sql |   4 +
 .../world/2011_03_05_02_world_creatures.sql        |  79 ++
 .../world/2011_03_05_03_world_spell_area.sql       |   4 +
 .../world/2011_03_05_04_world_creatures.sql        | 133 ++++
 .../world/2011_03_05_05_world_creatures.sql        |  58 ++
 .../world/2011_03_05_1_world_spell_proc_event.sql  |   4 -
 sql/updates/world/2011_03_05_2_world_creatures.sql |  79 --
 .../world/2011_03_05_3_world_spell_area.sql        |   4 -
 sql/updates/world/2011_03_05_4_world_creatures.sql | 133 ----
 sql/updates/world/2011_03_05_5_world_creatures.sql |  58 --
 .../world/2011_03_06_00_world_creatures.sql        |   1 +
 .../world/2011_03_06_01_world_loot_template.sql    | 392 +++++++++
 .../world/2011_03_06_02_world_creatures.sql        |  64 ++
 .../world/2011_03_06_03_world_creatures.sql        |  24 +
 .../world/2011_03_06_04_world_creatures.sql        |  53 ++
 .../2011_03_06_05_world_vehicle_accessory.sql      |  12 +
 sql/updates/world/2011_03_06_0_world_creatures.sql |   1 -
 .../world/2011_03_06_1_world_loot_template.sql     | 392 ---------
 sql/updates/world/2011_03_06_2_world_creatures.sql |  64 --
 sql/updates/world/2011_03_06_3_world_creatures.sql |  24 -
 sql/updates/world/2011_03_06_4_world_creatures.sql |  53 --
 .../world/2011_03_06_5_world_vehicle_accessory.sql |  12 -
 sql/updates/world/2011_03_07_00_world_misc.sql     |   4 +
 .../world/2011_03_07_01_world_spell_proc_event.sql |   3 +
 .../world/2011_03_07_02_world_achievement.sql      |   4 +
 .../2011_03_07_03_world_creature_template.sql      |   4 +
 sql/updates/world/2011_03_07_04_world_command.sql  |   4 +
 .../world/2011_03_07_05_world_creatures.sql        |  40 +
 .../2011_03_07_06_world_spell_script_names.sql     |   3 +
 sql/updates/world/2011_03_07_0_world_misc.sql      |   4 -
 .../world/2011_03_07_1_world_spell_proc_event.sql  |   3 -
 .../world/2011_03_07_2_world_achievement.sql       |   4 -
 .../world/2011_03_07_3_world_creature_template.sql |   4 -
 sql/updates/world/2011_03_07_4_world_command.sql   |   4 -
 sql/updates/world/2011_03_07_5_world_creatures.sql |  40 -
 .../2011_03_07_6_world_spell_script_names.sql      |   3 -
 sql/updates/world/2011_03_08_00_world_sai.sql      |  20 +
 sql/updates/world/2011_03_08_0_world_sai.sql       |  20 -
 .../world/2011_03_09_00_world_creature_addon.sql   |   1 +
 sql/updates/world/2011_03_09_01_world_misc.sql     |  74 ++
 .../world/2011_03_09_02_world_page_text.sql        |  11 +
 sql/updates/world/2011_03_09_03_world_misc.sql     |   8 +
 .../world/2011_03_09_0_world_creature_addon.sql    |   1 -
 sql/updates/world/2011_03_09_1_world_misc.sql      |  74 --
 sql/updates/world/2011_03_09_2_world_page_text.sql |  11 -
 sql/updates/world/2011_03_09_3_world_misc.sql      |   8 -
 .../world/2011_03_10_00_world_creatures.sql        |  10 +
 .../world/2011_03_10_01_world_pool_quest.sql       |  45 ++
 .../2011_03_10_02_world_creature_template.sql      |   2 +
 .../2011_03_10_03_world_creature_loot_template.sql |   2 +
 sql/updates/world/2011_03_10_04_world_disables.sql |   7 +
 .../2011_03_10_05_world_creature_questrelation.sql |   4 +
 .../world/2011_03_10_06_world_conditions.sql       |   5 +
 .../world/2011_03_10_07_world_conditions.sql       |   1 +
 .../2011_03_10_08_world_spell_script_names.sql     |   3 +
 sql/updates/world/2011_03_10_09_world_sai.sql      |  55 ++
 sql/updates/world/2011_03_10_0_world_creatures.sql |  10 -
 .../world/2011_03_10_1_world_pool_quest.sql        |  45 --
 .../world/2011_03_10_2_world_creature_template.sql |   2 -
 .../2011_03_10_3_world_creature_loot_template.sql  |   2 -
 sql/updates/world/2011_03_10_4_world_disables.sql  |   7 -
 .../2011_03_10_5_world_creature_questrelation.sql  |   4 -
 .../world/2011_03_10_6_world_conditions.sql        |   5 -
 .../world/2011_03_10_7_world_conditions.sql        |   1 -
 .../2011_03_10_8_world_spell_script_names.sql      |   3 -
 sql/updates/world/2011_03_10_9_world_sai.sql       |  55 --
 sql/updates/world/2011_03_11_00_world_sai.sql      |  27 +
 .../world/2011_03_11_00_world_scriptname.sql       |   1 +
 sql/updates/world/2011_03_11_01_world_sai.sql      |  45 ++
 .../world/2011_03_11_02_world_trinity_string.sql   |   6 +
 sql/updates/world/2011_03_11_0_world_sai.sql       |  27 -
 .../world/2011_03_11_0_world_scriptname.sql        |   1 -
 sql/updates/world/2011_03_11_1_world_sai.sql       |  45 --
 .../world/2011_03_11_2_world_trinity_string.sql    |   6 -
 .../2011_03_12_00_world_creature_template.sql      |  43 +
 .../world/2011_03_12_0_world_creature_template.sql |  43 -
 .../world/2011_03_13_00_world_scriptname.sql       |   1 +
 .../2011_03_13_01_world_areatrigger_scripts.sql    |   3 +
 .../world/2011_03_13_01_world_creatures.sql        |  26 +
 .../world/2011_03_13_0_world_scriptname.sql        |   1 -
 .../2011_03_13_1_world_areatrigger_scripts.sql     |   3 -
 sql/updates/world/2011_03_13_1_world_creatures.sql |  26 -
 .../world/2011_03_16_00_world_creatures.sql        |  34 +
 sql/updates/world/2011_03_16_0_world_creatures.sql |  34 -
 sql/updates/world/2011_03_17_00_world_sai.sql      | 297 +++++++
 sql/updates/world/2011_03_17_01_world_sai.sql      | 118 +++
 sql/updates/world/2011_03_17_02_world_sai.sql      |  78 ++
 .../2011_03_17_03_world_creature_template.sql      |  44 ++
 sql/updates/world/2011_03_17_04_world_sai.sql      |  19 +
 sql/updates/world/2011_03_17_05_world_sai.sql      |  29 +
 sql/updates/world/2011_03_17_06_world_sai.sql      |   8 +
 sql/updates/world/2011_03_17_07_world_sai.sql      |   8 +
 sql/updates/world/2011_03_17_08_world_sai.sql      |  11 +
 sql/updates/world/2011_03_17_09_world_sai.sql      |   7 +
 sql/updates/world/2011_03_17_0_world_sai.sql       | 297 -------
 sql/updates/world/2011_03_17_1_world_sai.sql       | 118 ---
 sql/updates/world/2011_03_17_2_world_sai.sql       |  78 --
 .../world/2011_03_17_3_world_creature_template.sql |  44 --
 sql/updates/world/2011_03_17_4_world_sai.sql       |  19 -
 sql/updates/world/2011_03_17_5_world_sai.sql       |  29 -
 sql/updates/world/2011_03_17_6_world_sai.sql       |   8 -
 sql/updates/world/2011_03_17_7_world_sai.sql       |   8 -
 sql/updates/world/2011_03_17_8_world_sai.sql       |  11 -
 sql/updates/world/2011_03_17_9_world_sai.sql       |   7 -
 .../world/2011_03_18_00_world_game_event_misc.sql  |  93 +++
 .../2011_03_18_01_world_instance_pit_of_saron.sql  |  39 +
 .../world/2011_03_18_02_world_creatures.sql        |   8 +
 .../world/2011_03_18_0_world_game_event_misc.sql   |  93 ---
 .../2011_03_18_1_world_instance_pit_of_saron.sql   |  39 -
 sql/updates/world/2011_03_18_2_world_creatures.sql |   8 -
 .../world/2011_03_19_00_world_spell_proc_event.sql |   7 +
 .../world/2011_03_19_0_world_spell_proc_event.sql  |   7 -
 .../world/2011_03_20_00_world_game_event.sql       |   2 +
 .../world/2011_03_20_0_world_game_event.sql        |   2 -
 sql/updates/world/2011_03_21_00_world_sai.sql      |   3 +
 .../2011_03_21_01_world_creature_template.sql      |   2 +
 .../2011_03_21_02_world_creature_template.sql      |   2 +
 ...11_03_21_03_world_achievement_criteria_data.sql |  32 +
 .../world/2011_03_21_04_world_spell_required.sql   |   3 +
 .../world/2011_03_21_05_world_spell_ranks.sql      |   6 +
 sql/updates/world/2011_03_21_06_world_creature.sql |  16 +
 .../world/2011_03_21_07_world_spell_required.sql   |   1 +
 .../world/2011_03_21_08_world_spell_required.sql   |   1 +
 sql/updates/world/2011_03_21_0_world_sai.sql       |   3 -
 .../world/2011_03_21_1_world_creature_template.sql |   2 -
 .../world/2011_03_21_2_world_creature_template.sql |   2 -
 ...011_03_21_3_world_achievement_criteria_data.sql |  32 -
 .../world/2011_03_21_4_world_spell_required.sql    |   3 -
 .../world/2011_03_21_5_world_spell_ranks.sql       |   6 -
 sql/updates/world/2011_03_21_6_world_creature.sql  |  16 -
 .../world/2011_03_21_7_world_spell_required.sql    |   1 -
 .../world/2011_03_21_8_world_spell_required.sql    |   1 -
 sql/updates/world/2011_03_22_00_world_sai.sql      |  22 +
 sql/updates/world/2011_03_22_01_world_sai.sql      |  83 ++
 sql/updates/world/2011_03_22_02_world_sai.sql      | 121 +++
 .../2011_03_22_03_world_creature_template.sql      |   8 +
 sql/updates/world/2011_03_22_0_world_sai.sql       |  22 -
 sql/updates/world/2011_03_22_1_world_sai.sql       |  83 --
 sql/updates/world/2011_03_22_2_world_sai.sql       | 121 ---
 .../world/2011_03_22_3_world_creature_template.sql |   8 -
 .../world/2011_03_23_00_world_conditions.sql       |   3 +
 .../2011_03_23_01_world_creature_template.sql      | 874 +++++++++++++++++++++
 .../2011_03_23_02_world_creature_transport.sql     |   3 +
 sql/updates/world/2011_03_23_03_world_creature.sql |   1 +
 sql/updates/world/2011_03_23_04_world_creature.sql |  42 +
 .../world/2011_03_23_06_world_quest_template.sql   |   2 +
 ...011_03_23_07_world_creatureinvolvedrelation.sql |   4 +
 .../2011_03_23_08_world_gameobject_template.sql    |   8 +
 sql/updates/world/2011_03_23_09_world_creature.sql | 132 ++++
 .../world/2011_03_23_0_world_conditions.sql        |   3 -
 .../world/2011_03_23_1_world_creature_template.sql | 874 ---------------------
 .../2011_03_23_2_world_creature_transport.sql      |   3 -
 sql/updates/world/2011_03_23_3_world_creature.sql  |   1 -
 sql/updates/world/2011_03_23_4_world_creature.sql  |  42 -
 .../world/2011_03_23_6_world_quest_template.sql    |   2 -
 ...2011_03_23_7_world_creatureinvolvedrelation.sql |   4 -
 .../2011_03_23_8_world_gameobject_template.sql     |   8 -
 sql/updates/world/2011_03_23_9_world_creature.sql  | 132 ----
 .../2011_03_24_00_world_creature_template.sql      |  69 ++
 .../world/2011_03_24_01_world_loot_template.sql    | 382 +++++++++
 sql/updates/world/2011_03_24_02_world_sai.sql      | 137 ++++
 sql/updates/world/2011_03_24_03_world_sai.sql      |  61 ++
 sql/updates/world/2011_03_24_04_world_sai.sql      | 448 +++++++++++
 .../world/2011_03_24_0_world_creature_template.sql |  69 --
 .../world/2011_03_24_1_world_loot_template.sql     | 382 ---------
 sql/updates/world/2011_03_24_2_world_sai.sql       | 137 ----
 sql/updates/world/2011_03_24_3_world_sai.sql       |  61 --
 sql/updates/world/2011_03_24_4_world_sai.sql       | 448 -----------
 .../2011_03_25_00_world_creature_template.sql      |   2 +
 .../world/2011_03_25_01_world_gameobjects.sql      |   7 +
 .../world/2011_03_25_02_world_creatures.sql        |  11 +
 sql/updates/world/2011_03_25_03_world_misc.sql     |  47 ++
 .../world/2011_03_25_0_world_creature_template.sql |   2 -
 .../world/2011_03_25_1_world_gameobjects.sql       |   7 -
 sql/updates/world/2011_03_25_2_world_creatures.sql |  11 -
 sql/updates/world/2011_03_25_3_world_misc.sql      |  47 --
 ...11_03_26_00_world_achievement_criteria_data.sql |  29 +
 .../world/2011_03_26_00_world_conditions.sql       |   8 +
 .../2011_03_26_00_world_creature_template.sql      |  24 +
 ...2011_03_26_00_world_creature_template_addon.sql |   2 +
 .../world/2011_03_26_00_world_creature_text.sql    |  30 +
 .../world/2011_03_26_00_world_gameobject.sql       |   9 +
 .../2011_03_26_00_world_npc_spellclick_spells.sql  |   5 +
 .../world/2011_03_26_00_world_scriptname.sql       |  15 +
 .../world/2011_03_26_00_world_smart_scripts.sql    |  11 +
 ...1_03_26_00_world_vehicle_template_accessory.sql |   5 +
 ...11_03_26_01_world_achievement_criteria_data.sql |  14 +
 .../2011_03_26_02_world_spell_linked_spell.sql     |   3 +
 .../world/2011_03_26_03_world_quest_template.sql   |   3 +
 .../2011_03_26_03_world_spell_linked_spell.sql     |   3 +
 ...011_03_26_0_world_achievement_criteria_data.sql |  29 -
 .../world/2011_03_26_0_world_conditions.sql        |   8 -
 .../world/2011_03_26_0_world_creature_template.sql |  24 -
 .../2011_03_26_0_world_creature_template_addon.sql |   2 -
 .../world/2011_03_26_0_world_creature_text.sql     |  30 -
 .../world/2011_03_26_0_world_gameobject.sql        |   9 -
 .../2011_03_26_0_world_npc_spellclick_spells.sql   |   5 -
 .../world/2011_03_26_0_world_scriptname.sql        |  15 -
 .../world/2011_03_26_0_world_smart_scripts.sql     |  11 -
 ...11_03_26_0_world_vehicle_template_accessory.sql |   5 -
 ...011_03_26_1_world_achievement_criteria_data.sql |  14 -
 .../2011_03_26_2_world_spell_linked_spell.sql      |   3 -
 .../world/2011_03_26_3_world_quest_template.sql    |   3 -
 .../2011_03_26_3_world_spell_linked_spell.sql      |   3 -
 .../world/2011_03_27_00_world_quest_template.sql   |   3 +
 sql/updates/world/2011_03_27_01_world_misc.sql     | 150 ++++
 .../world/2011_03_27_0_world_quest_template.sql    |   3 -
 sql/updates/world/2011_03_27_1_world_misc.sql      | 150 ----
 724 files changed, 10577 insertions(+), 10577 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
 create mode 100644 sql/updates/auth_char/2011_03_11_00_characters_channels.sql
 delete mode 100644 sql/updates/auth_char/2011_03_11_0_characters_channels.sql
 create mode 100644 sql/updates/auth_char/2011_03_17_00_characters_corpse.sql
 delete mode 100644 sql/updates/auth_char/2011_03_17_0_characters_corpse.sql
 create mode 100644 sql/updates/auth_char/2011_03_18_00_characters_game_event_misc.sql
 create mode 100644 sql/updates/auth_char/2011_03_18_01_characters_game_event_misc.sql
 delete mode 100644 sql/updates/auth_char/2011_03_18_0_characters_game_event_misc.sql
 delete mode 100644 sql/updates/auth_char/2011_03_18_1_characters_game_event_misc.sql
 create mode 100644 sql/updates/world/2011_03_05_01_world_spell_proc_event.sql
 create mode 100644 sql/updates/world/2011_03_05_02_world_creatures.sql
 create mode 100644 sql/updates/world/2011_03_05_03_world_spell_area.sql
 create mode 100644 sql/updates/world/2011_03_05_04_world_creatures.sql
 create mode 100644 sql/updates/world/2011_03_05_05_world_creatures.sql
 delete mode 100644 sql/updates/world/2011_03_05_1_world_spell_proc_event.sql
 delete mode 100644 sql/updates/world/2011_03_05_2_world_creatures.sql
 delete mode 100644 sql/updates/world/2011_03_05_3_world_spell_area.sql
 delete mode 100644 sql/updates/world/2011_03_05_4_world_creatures.sql
 delete mode 100644 sql/updates/world/2011_03_05_5_world_creatures.sql
 create mode 100644 sql/updates/world/2011_03_06_00_world_creatures.sql
 create mode 100644 sql/updates/world/2011_03_06_01_world_loot_template.sql
 create mode 100644 sql/updates/world/2011_03_06_02_world_creatures.sql
 create mode 100644 sql/updates/world/2011_03_06_03_world_creatures.sql
 create mode 100644 sql/updates/world/2011_03_06_04_world_creatures.sql
 create mode 100644 sql/updates/world/2011_03_06_05_world_vehicle_accessory.sql
 delete mode 100644 sql/updates/world/2011_03_06_0_world_creatures.sql
 delete mode 100644 sql/updates/world/2011_03_06_1_world_loot_template.sql
 delete mode 100644 sql/updates/world/2011_03_06_2_world_creatures.sql
 delete mode 100644 sql/updates/world/2011_03_06_3_world_creatures.sql
 delete mode 100644 sql/updates/world/2011_03_06_4_world_creatures.sql
 delete mode 100644 sql/updates/world/2011_03_06_5_world_vehicle_accessory.sql
 create mode 100644 sql/updates/world/2011_03_07_00_world_misc.sql
 create mode 100644 sql/updates/world/2011_03_07_01_world_spell_proc_event.sql
 create mode 100644 sql/updates/world/2011_03_07_02_world_achievement.sql
 create mode 100644 sql/updates/world/2011_03_07_03_world_creature_template.sql
 create mode 100644 sql/updates/world/2011_03_07_04_world_command.sql
 create mode 100644 sql/updates/world/2011_03_07_05_world_creatures.sql
 create mode 100644 sql/updates/world/2011_03_07_06_world_spell_script_names.sql
 delete mode 100644 sql/updates/world/2011_03_07_0_world_misc.sql
 delete mode 100644 sql/updates/world/2011_03_07_1_world_spell_proc_event.sql
 delete mode 100644 sql/updates/world/2011_03_07_2_world_achievement.sql
 delete mode 100644 sql/updates/world/2011_03_07_3_world_creature_template.sql
 delete mode 100644 sql/updates/world/2011_03_07_4_world_command.sql
 delete mode 100644 sql/updates/world/2011_03_07_5_world_creatures.sql
 delete mode 100644 sql/updates/world/2011_03_07_6_world_spell_script_names.sql
 create mode 100644 sql/updates/world/2011_03_08_00_world_sai.sql
 delete mode 100644 sql/updates/world/2011_03_08_0_world_sai.sql
 create mode 100644 sql/updates/world/2011_03_09_00_world_creature_addon.sql
 create mode 100644 sql/updates/world/2011_03_09_01_world_misc.sql
 create mode 100644 sql/updates/world/2011_03_09_02_world_page_text.sql
 create mode 100644 sql/updates/world/2011_03_09_03_world_misc.sql
 delete mode 100644 sql/updates/world/2011_03_09_0_world_creature_addon.sql
 delete mode 100644 sql/updates/world/2011_03_09_1_world_misc.sql
 delete mode 100644 sql/updates/world/2011_03_09_2_world_page_text.sql
 delete mode 100644 sql/updates/world/2011_03_09_3_world_misc.sql
 create mode 100644 sql/updates/world/2011_03_10_00_world_creatures.sql
 create mode 100644 sql/updates/world/2011_03_10_01_world_pool_quest.sql
 create mode 100644 sql/updates/world/2011_03_10_02_world_creature_template.sql
 create mode 100644 sql/updates/world/2011_03_10_03_world_creature_loot_template.sql
 create mode 100644 sql/updates/world/2011_03_10_04_world_disables.sql
 create mode 100644 sql/updates/world/2011_03_10_05_world_creature_questrelation.sql
 create mode 100644 sql/updates/world/2011_03_10_06_world_conditions.sql
 create mode 100644 sql/updates/world/2011_03_10_07_world_conditions.sql
 create mode 100644 sql/updates/world/2011_03_10_08_world_spell_script_names.sql
 create mode 100644 sql/updates/world/2011_03_10_09_world_sai.sql
 delete mode 100644 sql/updates/world/2011_03_10_0_world_creatures.sql
 delete mode 100644 sql/updates/world/2011_03_10_1_world_pool_quest.sql
 delete mode 100644 sql/updates/world/2011_03_10_2_world_creature_template.sql
 delete mode 100644 sql/updates/world/2011_03_10_3_world_creature_loot_template.sql
 delete mode 100644 sql/updates/world/2011_03_10_4_world_disables.sql
 delete mode 100644 sql/updates/world/2011_03_10_5_world_creature_questrelation.sql
 delete mode 100644 sql/updates/world/2011_03_10_6_world_conditions.sql
 delete mode 100644 sql/updates/world/2011_03_10_7_world_conditions.sql
 delete mode 100644 sql/updates/world/2011_03_10_8_world_spell_script_names.sql
 delete mode 100644 sql/updates/world/2011_03_10_9_world_sai.sql
 create mode 100644 sql/updates/world/2011_03_11_00_world_sai.sql
 create mode 100644 sql/updates/world/2011_03_11_00_world_scriptname.sql
 create mode 100644 sql/updates/world/2011_03_11_01_world_sai.sql
 create mode 100644 sql/updates/world/2011_03_11_02_world_trinity_string.sql
 delete mode 100644 sql/updates/world/2011_03_11_0_world_sai.sql
 delete mode 100644 sql/updates/world/2011_03_11_0_world_scriptname.sql
 delete mode 100644 sql/updates/world/2011_03_11_1_world_sai.sql
 delete mode 100644 sql/updates/world/2011_03_11_2_world_trinity_string.sql
 create mode 100644 sql/updates/world/2011_03_12_00_world_creature_template.sql
 delete mode 100644 sql/updates/world/2011_03_12_0_world_creature_template.sql
 create mode 100644 sql/updates/world/2011_03_13_00_world_scriptname.sql
 create mode 100644 sql/updates/world/2011_03_13_01_world_areatrigger_scripts.sql
 create mode 100644 sql/updates/world/2011_03_13_01_world_creatures.sql
 delete mode 100644 sql/updates/world/2011_03_13_0_world_scriptname.sql
 delete mode 100644 sql/updates/world/2011_03_13_1_world_areatrigger_scripts.sql
 delete mode 100644 sql/updates/world/2011_03_13_1_world_creatures.sql
 create mode 100644 sql/updates/world/2011_03_16_00_world_creatures.sql
 delete mode 100644 sql/updates/world/2011_03_16_0_world_creatures.sql
 create mode 100644 sql/updates/world/2011_03_17_00_world_sai.sql
 create mode 100644 sql/updates/world/2011_03_17_01_world_sai.sql
 create mode 100644 sql/updates/world/2011_03_17_02_world_sai.sql
 create mode 100644 sql/updates/world/2011_03_17_03_world_creature_template.sql
 create mode 100644 sql/updates/world/2011_03_17_04_world_sai.sql
 create mode 100644 sql/updates/world/2011_03_17_05_world_sai.sql
 create mode 100644 sql/updates/world/2011_03_17_06_world_sai.sql
 create mode 100644 sql/updates/world/2011_03_17_07_world_sai.sql
 create mode 100644 sql/updates/world/2011_03_17_08_world_sai.sql
 create mode 100644 sql/updates/world/2011_03_17_09_world_sai.sql
 delete mode 100644 sql/updates/world/2011_03_17_0_world_sai.sql
 delete mode 100644 sql/updates/world/2011_03_17_1_world_sai.sql
 delete mode 100644 sql/updates/world/2011_03_17_2_world_sai.sql
 delete mode 100644 sql/updates/world/2011_03_17_3_world_creature_template.sql
 delete mode 100644 sql/updates/world/2011_03_17_4_world_sai.sql
 delete mode 100644 sql/updates/world/2011_03_17_5_world_sai.sql
 delete mode 100644 sql/updates/world/2011_03_17_6_world_sai.sql
 delete mode 100644 sql/updates/world/2011_03_17_7_world_sai.sql
 delete mode 100644 sql/updates/world/2011_03_17_8_world_sai.sql
 delete mode 100644 sql/updates/world/2011_03_17_9_world_sai.sql
 create mode 100644 sql/updates/world/2011_03_18_00_world_game_event_misc.sql
 create mode 100644 sql/updates/world/2011_03_18_01_world_instance_pit_of_saron.sql
 create mode 100644 sql/updates/world/2011_03_18_02_world_creatures.sql
 delete mode 100644 sql/updates/world/2011_03_18_0_world_game_event_misc.sql
 delete mode 100644 sql/updates/world/2011_03_18_1_world_instance_pit_of_saron.sql
 delete mode 100644 sql/updates/world/2011_03_18_2_world_creatures.sql
 create mode 100644 sql/updates/world/2011_03_19_00_world_spell_proc_event.sql
 delete mode 100644 sql/updates/world/2011_03_19_0_world_spell_proc_event.sql
 create mode 100644 sql/updates/world/2011_03_20_00_world_game_event.sql
 delete mode 100644 sql/updates/world/2011_03_20_0_world_game_event.sql
 create mode 100644 sql/updates/world/2011_03_21_00_world_sai.sql
 create mode 100644 sql/updates/world/2011_03_21_01_world_creature_template.sql
 create mode 100644 sql/updates/world/2011_03_21_02_world_creature_template.sql
 create mode 100644 sql/updates/world/2011_03_21_03_world_achievement_criteria_data.sql
 create mode 100644 sql/updates/world/2011_03_21_04_world_spell_required.sql
 create mode 100644 sql/updates/world/2011_03_21_05_world_spell_ranks.sql
 create mode 100644 sql/updates/world/2011_03_21_06_world_creature.sql
 create mode 100644 sql/updates/world/2011_03_21_07_world_spell_required.sql
 create mode 100644 sql/updates/world/2011_03_21_08_world_spell_required.sql
 delete mode 100644 sql/updates/world/2011_03_21_0_world_sai.sql
 delete mode 100644 sql/updates/world/2011_03_21_1_world_creature_template.sql
 delete mode 100644 sql/updates/world/2011_03_21_2_world_creature_template.sql
 delete mode 100644 sql/updates/world/2011_03_21_3_world_achievement_criteria_data.sql
 delete mode 100644 sql/updates/world/2011_03_21_4_world_spell_required.sql
 delete mode 100644 sql/updates/world/2011_03_21_5_world_spell_ranks.sql
 delete mode 100644 sql/updates/world/2011_03_21_6_world_creature.sql
 delete mode 100644 sql/updates/world/2011_03_21_7_world_spell_required.sql
 delete mode 100644 sql/updates/world/2011_03_21_8_world_spell_required.sql
 create mode 100644 sql/updates/world/2011_03_22_00_world_sai.sql
 create mode 100644 sql/updates/world/2011_03_22_01_world_sai.sql
 create mode 100644 sql/updates/world/2011_03_22_02_world_sai.sql
 create mode 100644 sql/updates/world/2011_03_22_03_world_creature_template.sql
 delete mode 100644 sql/updates/world/2011_03_22_0_world_sai.sql
 delete mode 100644 sql/updates/world/2011_03_22_1_world_sai.sql
 delete mode 100644 sql/updates/world/2011_03_22_2_world_sai.sql
 delete mode 100644 sql/updates/world/2011_03_22_3_world_creature_template.sql
 create mode 100644 sql/updates/world/2011_03_23_00_world_conditions.sql
 create mode 100644 sql/updates/world/2011_03_23_01_world_creature_template.sql
 create mode 100644 sql/updates/world/2011_03_23_02_world_creature_transport.sql
 create mode 100644 sql/updates/world/2011_03_23_03_world_creature.sql
 create mode 100644 sql/updates/world/2011_03_23_04_world_creature.sql
 create mode 100644 sql/updates/world/2011_03_23_06_world_quest_template.sql
 create mode 100644 sql/updates/world/2011_03_23_07_world_creatureinvolvedrelation.sql
 create mode 100644 sql/updates/world/2011_03_23_08_world_gameobject_template.sql
 create mode 100644 sql/updates/world/2011_03_23_09_world_creature.sql
 delete mode 100644 sql/updates/world/2011_03_23_0_world_conditions.sql
 delete mode 100644 sql/updates/world/2011_03_23_1_world_creature_template.sql
 delete mode 100644 sql/updates/world/2011_03_23_2_world_creature_transport.sql
 delete mode 100644 sql/updates/world/2011_03_23_3_world_creature.sql
 delete mode 100644 sql/updates/world/2011_03_23_4_world_creature.sql
 delete mode 100644 sql/updates/world/2011_03_23_6_world_quest_template.sql
 delete mode 100644 sql/updates/world/2011_03_23_7_world_creatureinvolvedrelation.sql
 delete mode 100644 sql/updates/world/2011_03_23_8_world_gameobject_template.sql
 delete mode 100644 sql/updates/world/2011_03_23_9_world_creature.sql
 create mode 100644 sql/updates/world/2011_03_24_00_world_creature_template.sql
 create mode 100644 sql/updates/world/2011_03_24_01_world_loot_template.sql
 create mode 100644 sql/updates/world/2011_03_24_02_world_sai.sql
 create mode 100644 sql/updates/world/2011_03_24_03_world_sai.sql
 create mode 100644 sql/updates/world/2011_03_24_04_world_sai.sql
 delete mode 100644 sql/updates/world/2011_03_24_0_world_creature_template.sql
 delete mode 100644 sql/updates/world/2011_03_24_1_world_loot_template.sql
 delete mode 100644 sql/updates/world/2011_03_24_2_world_sai.sql
 delete mode 100644 sql/updates/world/2011_03_24_3_world_sai.sql
 delete mode 100644 sql/updates/world/2011_03_24_4_world_sai.sql
 create mode 100644 sql/updates/world/2011_03_25_00_world_creature_template.sql
 create mode 100644 sql/updates/world/2011_03_25_01_world_gameobjects.sql
 create mode 100644 sql/updates/world/2011_03_25_02_world_creatures.sql
 create mode 100644 sql/updates/world/2011_03_25_03_world_misc.sql
 delete mode 100644 sql/updates/world/2011_03_25_0_world_creature_template.sql
 delete mode 100644 sql/updates/world/2011_03_25_1_world_gameobjects.sql
 delete mode 100644 sql/updates/world/2011_03_25_2_world_creatures.sql
 delete mode 100644 sql/updates/world/2011_03_25_3_world_misc.sql
 create mode 100644 sql/updates/world/2011_03_26_00_world_achievement_criteria_data.sql
 create mode 100644 sql/updates/world/2011_03_26_00_world_conditions.sql
 create mode 100644 sql/updates/world/2011_03_26_00_world_creature_template.sql
 create mode 100644 sql/updates/world/2011_03_26_00_world_creature_template_addon.sql
 create mode 100644 sql/updates/world/2011_03_26_00_world_creature_text.sql
 create mode 100644 sql/updates/world/2011_03_26_00_world_gameobject.sql
 create mode 100644 sql/updates/world/2011_03_26_00_world_npc_spellclick_spells.sql
 create mode 100644 sql/updates/world/2011_03_26_00_world_scriptname.sql
 create mode 100644 sql/updates/world/2011_03_26_00_world_smart_scripts.sql
 create mode 100644 sql/updates/world/2011_03_26_00_world_vehicle_template_accessory.sql
 create mode 100644 sql/updates/world/2011_03_26_01_world_achievement_criteria_data.sql
 create mode 100644 sql/updates/world/2011_03_26_02_world_spell_linked_spell.sql
 create mode 100644 sql/updates/world/2011_03_26_03_world_quest_template.sql
 create mode 100644 sql/updates/world/2011_03_26_03_world_spell_linked_spell.sql
 delete mode 100644 sql/updates/world/2011_03_26_0_world_achievement_criteria_data.sql
 delete mode 100644 sql/updates/world/2011_03_26_0_world_conditions.sql
 delete mode 100644 sql/updates/world/2011_03_26_0_world_creature_template.sql
 delete mode 100644 sql/updates/world/2011_03_26_0_world_creature_template_addon.sql
 delete mode 100644 sql/updates/world/2011_03_26_0_world_creature_text.sql
 delete mode 100644 sql/updates/world/2011_03_26_0_world_gameobject.sql
 delete mode 100644 sql/updates/world/2011_03_26_0_world_npc_spellclick_spells.sql
 delete mode 100644 sql/updates/world/2011_03_26_0_world_scriptname.sql
 delete mode 100644 sql/updates/world/2011_03_26_0_world_smart_scripts.sql
 delete mode 100644 sql/updates/world/2011_03_26_0_world_vehicle_template_accessory.sql
 delete mode 100644 sql/updates/world/2011_03_26_1_world_achievement_criteria_data.sql
 delete mode 100644 sql/updates/world/2011_03_26_2_world_spell_linked_spell.sql
 delete mode 100644 sql/updates/world/2011_03_26_3_world_quest_template.sql
 delete mode 100644 sql/updates/world/2011_03_26_3_world_spell_linked_spell.sql
 create mode 100644 sql/updates/world/2011_03_27_00_world_quest_template.sql
 create mode 100644 sql/updates/world/2011_03_27_01_world_misc.sql
 delete mode 100644 sql/updates/world/2011_03_27_0_world_quest_template.sql
 delete mode 100644 sql/updates/world/2011_03_27_1_world_misc.sql

(limited to 'sql')

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);
diff --git a/sql/updates/auth_char/2011_03_11_00_characters_channels.sql b/sql/updates/auth_char/2011_03_11_00_characters_channels.sql
new file mode 100644
index 00000000000..8c399617998
--- /dev/null
+++ b/sql/updates/auth_char/2011_03_11_00_characters_channels.sql
@@ -0,0 +1,7 @@
+ALTER TABLE `channels` CHANGE COLUMN `m_name` `name` varchar(128) NOT NULL,
+  CHANGE COLUMN `m_team` `team` int(10) unsigned NOT NULL,
+  CHANGE COLUMN `m_announce` `announce` tinyint(3) unsigned NOT NULL DEFAULT '1',
+  CHANGE COLUMN `m_ownership` `ownership` tinyint(3) unsigned NOT NULL DEFAULT '1',
+  CHANGE COLUMN `m_password` `password` varchar(32) DEFAULT NULL,
+  CHANGE COLUMN `BannedList` `bannedList` text,
+  CHANGE COLUMN `last_used` `lastUsed` int(10) unsigned NOT NULL;
diff --git a/sql/updates/auth_char/2011_03_11_0_characters_channels.sql b/sql/updates/auth_char/2011_03_11_0_characters_channels.sql
deleted file mode 100644
index 8c399617998..00000000000
--- a/sql/updates/auth_char/2011_03_11_0_characters_channels.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-ALTER TABLE `channels` CHANGE COLUMN `m_name` `name` varchar(128) NOT NULL,
-  CHANGE COLUMN `m_team` `team` int(10) unsigned NOT NULL,
-  CHANGE COLUMN `m_announce` `announce` tinyint(3) unsigned NOT NULL DEFAULT '1',
-  CHANGE COLUMN `m_ownership` `ownership` tinyint(3) unsigned NOT NULL DEFAULT '1',
-  CHANGE COLUMN `m_password` `password` varchar(32) DEFAULT NULL,
-  CHANGE COLUMN `BannedList` `bannedList` text,
-  CHANGE COLUMN `last_used` `lastUsed` int(10) unsigned NOT NULL;
diff --git a/sql/updates/auth_char/2011_03_17_00_characters_corpse.sql b/sql/updates/auth_char/2011_03_17_00_characters_corpse.sql
new file mode 100644
index 00000000000..d9464f53f49
--- /dev/null
+++ b/sql/updates/auth_char/2011_03_17_00_characters_corpse.sql
@@ -0,0 +1 @@
+ALTER TABLE `corpse` CHANGE COLUMN `phaseMask` `phaseMask` smallint(5) unsigned NOT NULL DEFAULT '1';
diff --git a/sql/updates/auth_char/2011_03_17_0_characters_corpse.sql b/sql/updates/auth_char/2011_03_17_0_characters_corpse.sql
deleted file mode 100644
index d9464f53f49..00000000000
--- a/sql/updates/auth_char/2011_03_17_0_characters_corpse.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE `corpse` CHANGE COLUMN `phaseMask` `phaseMask` smallint(5) unsigned NOT NULL DEFAULT '1';
diff --git a/sql/updates/auth_char/2011_03_18_00_characters_game_event_misc.sql b/sql/updates/auth_char/2011_03_18_00_characters_game_event_misc.sql
new file mode 100644
index 00000000000..cc2772a31ac
--- /dev/null
+++ b/sql/updates/auth_char/2011_03_18_00_characters_game_event_misc.sql
@@ -0,0 +1,19 @@
+-- Create temporary table that holds the entry conversion data. (See corresponding world db update)
+CREATE TABLE `game_event_temp` (
+  `entryOld` TINYINT(3) UNSIGNED NOT NULL,
+  `entryNew` TINYINT(3) UNSIGNED NOT NULL
+) ENGINE=INNODB DEFAULT CHARSET=utf8;
+
+-- Renumbered entry data
+INSERT INTO `game_event_temp` (`entryOld`,`entryNew`) VALUES
+(1,1),(2,2),(3,3),(4,4),(5,5),(6,6),(7,7),(8,8),(9,9),(10,10),(11,11),(12,12),(13,13),(14,14),(15,15),(16,16),(17,17),(18,18),(19,19),(20,20),(21,21),(22,22),
+(23,23),(26,24),(27,25),(28,26),(29,27),(30,28),(31,29),(32,30),(33,31),(34,32),(35,33),(36,34),(37,35),(38,36),(39,37),(40,38),(41,39),(42,40),(43,41),(44,42),
+(45,43),(46,44),(47,45),(48,46),(49,47),(50,48),(51,49),(52,50),(53,51),(54,52),(124,53),(125,54),(126,55),(127,56),(128,57),(129,58),(130,59),(131,60);
+
+-- Update game_event_save
+UPDATE `game_event_save`, `game_event_temp` SET `game_event_save`.`event_id` = `game_event_temp`.`entryNew` WHERE `game_event_save`.`event_id` = `game_event_temp`.`entryOld`;
+ALTER TABLE `game_event_save` CHANGE `event_id` `eventEntry` TINYINT(3) UNSIGNED NOT NULL;
+
+-- Update game_event_condition_save
+UPDATE `game_event_condition_save`, `game_event_temp` SET `game_event_condition_save`.`event_id` = `game_event_temp`.`entryNew` WHERE `game_event_condition_save`.`event_id` = `game_event_temp`.`entryOld`;
+ALTER TABLE `game_event_condition_save` CHANGE `event_id` `eventEntry` TINYINT(3) UNSIGNED NOT NULL;
diff --git a/sql/updates/auth_char/2011_03_18_01_characters_game_event_misc.sql b/sql/updates/auth_char/2011_03_18_01_characters_game_event_misc.sql
new file mode 100644
index 00000000000..85dc9cb2d5b
--- /dev/null
+++ b/sql/updates/auth_char/2011_03_18_01_characters_game_event_misc.sql
@@ -0,0 +1,2 @@
+-- Remove temporary table
+DROP TABLE `game_event_temp`;
\ No newline at end of file
diff --git a/sql/updates/auth_char/2011_03_18_0_characters_game_event_misc.sql b/sql/updates/auth_char/2011_03_18_0_characters_game_event_misc.sql
deleted file mode 100644
index cc2772a31ac..00000000000
--- a/sql/updates/auth_char/2011_03_18_0_characters_game_event_misc.sql
+++ /dev/null
@@ -1,19 +0,0 @@
--- Create temporary table that holds the entry conversion data. (See corresponding world db update)
-CREATE TABLE `game_event_temp` (
-  `entryOld` TINYINT(3) UNSIGNED NOT NULL,
-  `entryNew` TINYINT(3) UNSIGNED NOT NULL
-) ENGINE=INNODB DEFAULT CHARSET=utf8;
-
--- Renumbered entry data
-INSERT INTO `game_event_temp` (`entryOld`,`entryNew`) VALUES
-(1,1),(2,2),(3,3),(4,4),(5,5),(6,6),(7,7),(8,8),(9,9),(10,10),(11,11),(12,12),(13,13),(14,14),(15,15),(16,16),(17,17),(18,18),(19,19),(20,20),(21,21),(22,22),
-(23,23),(26,24),(27,25),(28,26),(29,27),(30,28),(31,29),(32,30),(33,31),(34,32),(35,33),(36,34),(37,35),(38,36),(39,37),(40,38),(41,39),(42,40),(43,41),(44,42),
-(45,43),(46,44),(47,45),(48,46),(49,47),(50,48),(51,49),(52,50),(53,51),(54,52),(124,53),(125,54),(126,55),(127,56),(128,57),(129,58),(130,59),(131,60);
-
--- Update game_event_save
-UPDATE `game_event_save`, `game_event_temp` SET `game_event_save`.`event_id` = `game_event_temp`.`entryNew` WHERE `game_event_save`.`event_id` = `game_event_temp`.`entryOld`;
-ALTER TABLE `game_event_save` CHANGE `event_id` `eventEntry` TINYINT(3) UNSIGNED NOT NULL;
-
--- Update game_event_condition_save
-UPDATE `game_event_condition_save`, `game_event_temp` SET `game_event_condition_save`.`event_id` = `game_event_temp`.`entryNew` WHERE `game_event_condition_save`.`event_id` = `game_event_temp`.`entryOld`;
-ALTER TABLE `game_event_condition_save` CHANGE `event_id` `eventEntry` TINYINT(3) UNSIGNED NOT NULL;
diff --git a/sql/updates/auth_char/2011_03_18_1_characters_game_event_misc.sql b/sql/updates/auth_char/2011_03_18_1_characters_game_event_misc.sql
deleted file mode 100644
index 85dc9cb2d5b..00000000000
--- a/sql/updates/auth_char/2011_03_18_1_characters_game_event_misc.sql
+++ /dev/null
@@ -1,2 +0,0 @@
--- Remove temporary table
-DROP TABLE `game_event_temp`;
\ No newline at end of file
diff --git a/sql/updates/world/2011_03_05_01_world_spell_proc_event.sql b/sql/updates/world/2011_03_05_01_world_spell_proc_event.sql
new file mode 100644
index 00000000000..22412fcb8ec
--- /dev/null
+++ b/sql/updates/world/2011_03_05_01_world_spell_proc_event.sql
@@ -0,0 +1,4 @@
+DELETE FROM `spell_proc_event` WHERE `entry` IN (71880,71892);
+INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES
+(71880,0x00,0,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,1,0,0), -- Item - Icecrown 25 Normal Dagger Proc
+(71892,0x00,0,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,1,0,0); -- Item - Icecrown 25 Heroic Dagger Proc
diff --git a/sql/updates/world/2011_03_05_02_world_creatures.sql b/sql/updates/world/2011_03_05_02_world_creatures.sql
new file mode 100644
index 00000000000..4c593672dc7
--- /dev/null
+++ b/sql/updates/world/2011_03_05_02_world_creatures.sql
@@ -0,0 +1,79 @@
+-- Vehicle updates
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=25765; -- Fizzcrank Bomber
+UPDATE `creature_template` SET `speed_run`=3.42857 WHERE `entry`=26572; -- Kor'kron War Rider
+UPDATE `creature_template` SET `speed_run`=1.71429 WHERE `entry`=29500; -- Brunnhildar Warbear
+UPDATE `creature_template` SET `speed_run`=1.71429 WHERE `entry`=30174; -- Hyldsmeet Warbear
+UPDATE `creature_template` SET `unit_flags`=`unit_flags`|32768,`speed_walk`=1.444444,`speed_run`=1.5873 WHERE `entry`=30228; -- Argent Skytalon
+UPDATE `creature_template` SET `exp`=0,`speed_run`=1.38571 WHERE `entry`=31269; -- Kor'kron Battle Wyvern
+UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=31881; -- Kor'kron Troop Transport
+UPDATE `creature_template` SET `speed_walk`=2.8,`speed_run`=1.71429 WHERE `entry`=29351; -- Niffelem Frost Giant
+UPDATE `creature_template` SET `speed_walk`=2.8,`speed_run`=1.71429 WHERE `entry`=29358; -- Frostworg
+UPDATE `creature_template` SET `speed_run`=0.99206 WHERE `entry`=29931; -- Drakkari Rhino
+UPDATE `creature_template` SET `unit_flags`=`unit_flags`|33587200,`speed_walk`=2,`speed_run`=1.71429 WHERE `entry`=30204; -- Forgotten Depths Ambusher
+UPDATE `creature_template` SET `speed_walk`=1.444444 WHERE `entry`=36891; -- Iceborn Proto-Drake
+UPDATE `creature_template` SET `exp`=0,`baseattacktime`=2000,`speed_run`=1.38571 WHERE `entry`=38500; -- Argent Warhorse
+
+UPDATE `creature_model_info` SET `bounding_radius`=0.15,`combat_reach`=2.5,`gender`=0 WHERE `modelid`=31187; -- Argent Skytalon
+UPDATE `creature_model_info` SET `bounding_radius`=0.825,`combat_reach`=4.125,`gender`=0 WHERE `modelid`=26388; -- Brunnhildar Warbear
+UPDATE `creature_model_info` SET `bounding_radius`=0.31,`combat_reach`=1,`gender`=0 WHERE `modelid`=17722; -- Kor'kron Battle Wyvern
+UPDATE `creature_model_info` SET `bounding_radius`=1.68025,`combat_reach`=4.125,`gender`=0 WHERE `modelid`=26323; -- Injured Icemaw Matriarch
+UPDATE `creature_model_info` SET `bounding_radius`=0.31,`combat_reach`=6,`gender`=0 WHERE `modelid`=24531; -- Niffelem Frost Giant
+UPDATE `creature_model_info` SET `bounding_radius`=3,`combat_reach`=0,`gender`=0 WHERE `modelid`=26331; -- Frostworg
+UPDATE `creature_model_info` SET `bounding_radius`=0.465,`combat_reach`=2.25,`gender`=0 WHERE `modelid`=25729; -- Forgotten Depths Ambusher
+
+DELETE FROM `creature_template_addon` WHERE `entry` IN (24418,25765,26572,27761,28054,29500,30013,30174,30228,31269,31881,29563,29351,29358,29931,30204,36476,36794,36891,36896,38500);
+INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
+(24418,0,33554433,1,0, NULL), -- Steel Gate Flying Machine
+(25765,0,0,1,0, NULL), -- Fizzcrank Bomber
+(26572,0,0,1,0, NULL), -- Kor'kron War Rider
+(27761,0,65536,1,0, NULL), -- Fordragon Battle Steed
+(28054,0,4,257,0, NULL), -- Lucky Wilhelm
+(29500,0,0,1,0, NULL), -- Brunnhildar Warbear
+(30013,0,50331648,1,0, NULL), -- Stormcrest Eagle
+(30174,0,0,1,0, NULL), -- Hyldsmeet Warbear
+(30228,0,50331648,1,0, NULL), -- Argent Skytalon
+(31269,0,50331648,1,0, NULL), -- Kor'kron Battle Wyvern
+(31881,0,50331649,1,0, NULL), -- Kor'kron Troop Transport
+(29563,0,7,1,0, NULL), -- Injured Icemaw Matriarch
+(29351,0,0,1,0, NULL), -- Niffelem Frost Giant
+(29358,0,0,1,0, NULL), -- Frostworg
+(29931,0,0,1,0, NULL), -- Drakkari Rhino
+(30204,0,0,1,0, '56422 0'), -- Forgotten Depths Ambusher, Auras: Nerubian Submerge
+(36476,0,0,1,0, NULL), -- Ick
+(36794,0,0,1,0, NULL), -- Scourgelord Tyrannus
+(36891,0,0,1,0, NULL), -- Iceborn Proto-Drake
+(36896,0,0,1,0, NULL), -- Stonespine Gargoyle
+(38500,0,0,1,0, NULL); -- Argent Warhorse
+
+DELETE FROM `npc_spellclick_spells` WHERE `npc_entry` IN (24418,25765,26572,27761,28054,29500,30013,30174,30228,31269,31269,29563,28222,24750,27241,28018,29351,29358,29698,29931,30204,36477,36794,36891,36896,38500);
+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
+(24418,43768,0,0,0,3,0,0,0),  -- Steel Gate Flying Machine - Flying Machine Controls
+(25765,43671,0,0,0,1,0,0,0),  -- Fizzcrank Bomber - Ride Vehicle
+(26572,46598,0,0,0,1,0,0,0),  -- Kor'kron War Rider - Ride Vehicle Hardcoded
+(27761,43671,0,0,0,1,0,0,0),  -- Fordragon Battle Steed - Ride Vehicle
+(28054,50556,0,0,0,1,0,0,0),  -- Lucky Wilhelm - Ride Wilhelm
+(29500,46598,0,0,0,1,0,0,0),  -- Brunnhildar Warbear - Ride Vehicle Hardcoded
+(30013,43671,0,0,0,1,0,0,0),  -- Stormcrest Eagle - Ride Vehicle
+(30174,46598,0,0,0,1,0,0,0),  -- Hyldsmeet Warbear - Ride Vehicle Hardcoded
+(30228,56678,0,0,0,1,0,0,0),  -- Argent Skytalon - Command Argent Skytalon
+(31269,46598,0,0,0,1,0,0,0),  -- Kor'kron Battle Wyvern - Ride Vehicle Hardcoded
+(31269,46598,0,0,0,1,0,0,0),  -- Kor'kron Troop Transport - Ride Vehicle Hardcoded
+(29563,56795,12983,1,1,2,0,0,0), -- Injured Icemaw Matriarch - Harnessed Icemaw Matriarch
+(28222,52082,0,0,0,1,0,0,0),  -- The Etymidian - The Etymidian's Call
+(24750,46598,0,0,0,1,0,0,0), -- Hidalgo the Master Falconer - Ride Vehicle Hardcoded
+(27241,46598,0,0,0,1,0,0,0), -- Risen Gryphon - Ride Vehicle Hardcoded
+(28018,46598,0,0,0,1,0,0,0), -- Thiassi the Lightning Bringer - Ride Vehicle Hardcoded
+(29351,46598,0,0,0,1,0,0,0), -- Niffelem Frost Giant - Ride Vehicle Hardcoded
+(29358,46598,0,0,0,1,0,0,0), -- Frostworg - Ride Vehicle Hardcoded
+(29698,46598,0,0,0,1,0,0,0), -- Drakuru Raptor - Ride Vehicle Hardcoded
+(29931,46598,0,0,0,1,0,0,0), -- Drakkari Rhino - Ride Vehicle Hardcoded
+(30204,46598,0,0,0,1,0,0,0), -- Forgotten Depths Ambusher - Ride Vehicle Hardcoded
+(36477,46598,0,0,0,0,0,0,0), -- Krick - Ride Vehicle Hardcoded
+(36794,46598,0,0,0,1,0,0,0), -- Scourgelord Tyrannus - Ride Vehicle Hardcoded
+(36891,46598,0,0,0,1,0,0,0), -- Iceborn Proto-Drake - Ride Vehicle Hardcoded
+(36896,46598,0,0,0,1,0,0,0), -- Stonespine Gargoyle - Ride Vehicle Hardcoded
+(38500,46598,0,0,0,1,0,0,0); -- Argent Warhorse - Ride Vehicle Hardcoded
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=43768;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`Comment`) VALUES
+(13,0,43768,0,18,1,24418,0, 'Steel Gate Flying Machine');
diff --git a/sql/updates/world/2011_03_05_03_world_spell_area.sql b/sql/updates/world/2011_03_05_03_world_spell_area.sql
new file mode 100644
index 00000000000..b7efd814e3e
--- /dev/null
+++ b/sql/updates/world/2011_03_05_03_world_spell_area.sql
@@ -0,0 +1,4 @@
+-- Dragonmaw Fel Orc illusion for Netherwing Mines area after Netherwing quest chain for reputation is complete
+DELETE FROM `spell_area` WHERE `spell`=40214 AND `area`=3965;
+INSERT INTO `spell_area` (`spell`, `area`, `quest_start`, `quest_start_active`, `quest_end`, `aura_spell`, `racemask`, `gender`, `autocast`) VALUES
+(40214,3965,11013,1,0,0,0,2,1);
diff --git a/sql/updates/world/2011_03_05_04_world_creatures.sql b/sql/updates/world/2011_03_05_04_world_creatures.sql
new file mode 100644
index 00000000000..1ee645a097e
--- /dev/null
+++ b/sql/updates/world/2011_03_05_04_world_creatures.sql
@@ -0,0 +1,133 @@
+-- Some Dalran and Area Updates (sniff)
+-- Template updates 
+UPDATE `creature_template` SET `exp`=0,`npcflag`=`npcflag`|640 WHERE `entry`=32415; -- Hamaka
+UPDATE `creature_template` SET `exp`=0,`npcflag`=`npcflag`|130 WHERE `entry`=31031; -- Misensi
+UPDATE `creature_template` SET `unit_flags`=`unit_flags`|768 WHERE `entry`=35826; -- Kaye Toogie
+UPDATE `creature_template` SET `dynamicflags`=`dynamicflags`|4 WHERE `entry`=32428; -- Underbelly Rat
+UPDATE `creature_template` SET `npcflag`=`npcflag`|3 WHERE `entry`=36670; -- Magister Hathorel
+UPDATE `creature_template` SET `exp`=2,`minlevel`=82,`maxlevel`=82,`baseattacktime`=2000,`unit_flags`=`unit_flags`|33555200 WHERE `entry`=37858; -- Razorscale Image
+UPDATE `creature_template` SET `exp`=0 WHERE `entry`=32328; -- [DND] Dalaran Sewer Arena - Controller - Death
+UPDATE `creature_template` SET `exp`=0 WHERE `entry`=32339; -- [DND] Dalaran Sewer Arena - Controller
+UPDATE `creature_template` SET `minlevel`=75,`maxlevel`=75,`npcflag`=`npcflag`|4224,`unit_flags`=`unit_flags`|768 WHERE `entry`=33938; -- Zom Bocom
+UPDATE `creature_template` SET `minlevel`=75,`maxlevel`=75,`npcflag`=`npcflag`|4224,`unit_flags`=`unit_flags`|768 WHERE `entry`=33937; -- Xazi Smolderpipe
+UPDATE `creature_template` SET `minlevel`=75,`maxlevel`=75,`npcflag`=`npcflag`|4224,`unit_flags`=`unit_flags`|512 WHERE `entry`=33936; -- Nargle Lashcord
+UPDATE `creature_template` SET `npcflag`=`npcflag`|4224,`unit_flags`=`unit_flags`|512 WHERE `entry`=34095; -- Trapjaw Rix
+UPDATE `creature_template` SET `baseattacktime`=2000,`unit_flags`=`unit_flags`|33544 WHERE `entry`=42078; -- Mini Thor
+UPDATE `creature_template` SET `exp`=0 WHERE `entry`=32322; -- Gold Warrior
+UPDATE `creature_template` SET `exp`=0 WHERE `entry`=32325; -- Gold Priest
+
+-- Model data 
+UPDATE `creature_model_info` SET `bounding_radius`=1.05,`combat_reach`=1.05,`gender`=0 WHERE `modelid`=10957; -- Dappled Stag
+UPDATE `creature_model_info` SET `bounding_radius`=0.236,`combat_reach`=1.5,`gender`=0 WHERE `modelid`=27957; -- Hamaka
+UPDATE `creature_model_info` SET `bounding_radius`=1,`combat_reach`=1,`gender`=2 WHERE `modelid`=1141; -- Underbelly Rat
+UPDATE `creature_model_info` SET `bounding_radius`=0.5,`combat_reach`=0.75,`gender`=0 WHERE `modelid`=4449; -- Imp
+UPDATE `creature_model_info` SET `bounding_radius`=0.09,`combat_reach`=1.5,`gender`=1 WHERE `modelid`=30806; -- Razorscale Image
+UPDATE `creature_model_info` SET `bounding_radius`=0.75,`combat_reach`=1.5,`gender`=0 WHERE `modelid`=27766; -- [DND] Dalaran Sewer Arena - Controller
+UPDATE `creature_model_info` SET `bounding_radius`=0.09,`combat_reach`=0,`gender`=2 WHERE `modelid`=32670; -- Mini Thor
+
+-- Addon data
+DELETE FROM `creature_template_addon` WHERE `entry` IN (417,31233,31228,33778,34244,31236,29631,32692,32687,30352,31085,30755,31081,28671,28160,31031,28674,31238,29238,31229,
+32596,32415,32419,32418,32253,32412,32602,32732,31439,35826,32428,36670,32251,32252,32420,30659,32730,28991,32470,27047,29497,29534,31851,29493,28989,29533,32686,32683,
+29325,31080,20735,28742,29496,32265,31517,29499,37858,29156,29476,28993,32691,32675,30885,32328,32339,32743,23472,33938,33937,33936,34095,29527,28956,28691,28332,28994,28692,
+42078,29494,35497,29523,35500,28992,32683,29763,29764,29765,29766,37776,32509,29529,29529,28776,30726,28774,29528,32601,32710,32752,
+32322,32325);
+INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
+(32322,0,0,1,0, NULL), -- Gold Warrior
+(32325,0,0,1,0, NULL), -- Gold Priest
+(32752,0,0,1,0, NULL), -- Tabitha
+(32710,0,0,1,0, NULL), -- Garl Grimgrizzle
+(29763,0,0,1,0, NULL), -- Cosmetic Totem Alliance Air
+(29764,0,0,1,0, NULL), -- Cosmetic Totem Alliance Earth
+(29765,0,0,1,0, NULL), -- Cosmetic Totem Alliance Fire
+(29766,0,0,1,0, NULL), -- Cosmetic Totem Alliance Water
+(37776,0,0,1,0, NULL), -- Apprentice Nelphi
+(32509,0,0,257,0, NULL), -- Brammold Deepmine
+(29528,0,0,257,0, NULL), -- Debbi Moore
+(29529,0,0,257,0, NULL), -- Ninsianna
+(28776,0,0,257,0, NULL), -- Elizabeth Ross
+(30726,0,0,257,0, NULL), -- Archivist Betha
+(28774,0,0,257,0, NULL), -- Andrew Matthews
+(42078,0,0,1,0, NULL), -- Mini Thor
+(29494,0,0,257,0, NULL), -- Shen Kang Cheng
+(35497,0,0,257,0, NULL), -- Rafael Langrom
+(29523,0,0,257,0, NULL), -- Bragund Brightlink
+(35500,0,0,257,0, NULL), -- Matilda Brightlink
+(28992,0,0,257,0, NULL), -- Valerie Langrom
+(32683,0,0,257,0, NULL), -- Grezla the Hag
+(32686,0,0,257,0, NULL), -- Crafticus Mindbender
+(28692,0,0,257,0, NULL), -- "Red" Jack Findle
+(28994,0,0,257,0, NULL), -- Abra Cadabra
+(28332,0,0,1,0, NULL), -- Generic Trigger LAB (Large AOI)
+(28691,0,0,257,0, NULL), -- Susana Averoy
+(30885,0,0,1,0, NULL), -- Blazik Fireclaw
+(32328,0,0,1,0, NULL), -- [DND] Dalaran Sewer Arena - Controller - Death
+(32339,0,0,1,0, NULL), -- [DND] Dalaran Sewer Arena - Controller
+(32743,0,1,1,0, NULL), -- Willard Blauvelt
+(23472,0,0,1,0, NULL), -- World Trigger (Large AOI, Not Immune PC/NPC)
+(33938,0,0,1,0, NULL), -- Zom Bocom
+(33937,0,0,1,0, NULL), -- Xazi Smolderpipe
+(33936,0,0,1,0, NULL), -- Nargle Lashcord
+(34095,0,0,1,0, NULL), -- Trapjaw Rix
+(29527,0,0,257,0, NULL), -- Orton Bennet
+(28956,0,0,257,0, NULL), -- Warcaster Fanoraithe
+(29534,0,0,1,0, NULL), -- "Baroness" Llana
+(31851,0,65536,1,0, NULL), -- Wooly Mammoth
+(29493,0,0,257,0, NULL), -- Jarold Puller
+(28989,0,0,258,0, NULL), -- Aemara
+(29533,0,0,1,0, NULL), -- Schembari "Uncle Sal" Shearbolt
+(32675,0,0,257,0, NULL), -- Babagahnoosh the Grumpy
+(32691,0,0,257,0, NULL), -- Magus Fansy Goodbringer
+(28993,0,0,1,0, NULL), -- Aerith Primrose
+(29476,0,0,258,0, NULL), -- Dagna Flintlock
+(29156,0,0,257,0, NULL), -- Archmage Celindra
+(37858,0,50331648,0,0, NULL), -- Razorscale Image
+(32265,0,50331648,1,0, NULL), -- Northrend Daily Dungeon Image Bunny
+(31517,0,0,1,0, NULL), -- Dalaran Fountain Invis Stalker
+(29499,0,0,257,0, NULL), -- Bartram Haller
+(31228,0,0,1,0, NULL), -- Grove Walker
+(33778,0,1,1,0, NULL), -- Tournament Hippogryph
+(34244,0,0,1,0, NULL), -- Jean Pierre Poulain
+(31236,0,0,1,0, NULL), -- Dappled Stag
+(29631,0,0,1,0, NULL), -- Awilo Lon'gomba
+(32692,0,0,257,0, NULL), -- Arcanist Alec
+(32687,0,0,257,0, NULL), -- Linda Ann Kastinglow
+(30352,0,0,256,0, NULL), -- Skybreaker Marine
+(31085,0,0,1,0, NULL), -- Sky-Reaver Klum
+(30755,0,0,256,0, NULL), -- Kor'kron Reaver
+(31081,0,0,1,0, NULL), -- Officer Van Rossem
+(28160,0,0,257,0, NULL), -- Archmage Pentarus
+(28674,0,0,257,0, NULL), -- Aludane Whitecloud
+(31031,0,0,1,69, NULL), -- Misensi
+(31238,27525,0,257,0, NULL), -- Hira Snowdawn
+(29238,0,0,1,0, NULL), -- Scourge Haunt
+(31229,0,0,1,0, NULL), -- Ancient Watcher
+(32596,0,0,257,0, NULL), -- Dalaran Visitor
+(32602,25833,0,257,0, NULL), -- Dalaran Visitor
+(32601,22471,0,257,0, NULL), -- Dalaran Visitor
+(32415,0,0,1,0, NULL), -- Hamaka
+(32419,0,0,1,0, NULL), -- Umbiwa
+(32418,0,0,1,0, NULL), -- Abohba
+(32253,0,0,2,0, NULL), -- Kyunghee
+(32412,0,0,1,0, NULL), -- Mato
+(32732,0,0,257,0, NULL), -- Dorfus Alphamage
+(31439,0,0,1,0, NULL), -- Archmage Timear
+(35826,0,1,1,0, NULL), -- Kaye Toogie
+(32428,0,0,1,0, NULL), -- Underbelly Rat
+(36670,0,0,1,0, NULL), -- Magister Hathorel
+(32251,0,0,2,0, NULL), -- Shokavis
+(32252,0,0,2,0, NULL), -- Wanathan
+(32420,0,0,1,10, NULL), -- Mimbihi
+(30659,0,0,1,333, NULL), -- Violet Hold Guard
+(32730,0,0,257,0, NULL), -- Goldlilly Gleamingfell
+(28991,0,0,257,0, NULL), -- Valaden Silverblade
+(32470,0,0,1,0, NULL), -- Sewer Frog
+(27047,0,0,1,0, NULL), -- Invisible Stalker (Floating Only)
+(29497,0,0,257,0, NULL), -- Walther Whiteford
+(29325,0,0,1,379, NULL), -- Torgo the Younger
+(31080,0,0,1,0, NULL), -- Warden Alturas
+(20735,0,0,1,0, NULL), -- Archmage Lan'dalock
+(28742,0,0,257,0, NULL), -- Marcia Chase
+(29496,0,0,257,0, NULL); -- Kerta the Bold
+
+-- Template updates for gameobject 
+UPDATE `gameobject_template` SET `faction`=0 WHERE `entry`=35591; -- Fishing Bobber
diff --git a/sql/updates/world/2011_03_05_05_world_creatures.sql b/sql/updates/world/2011_03_05_05_world_creatures.sql
new file mode 100644
index 00000000000..6eb520e6f0a
--- /dev/null
+++ b/sql/updates/world/2011_03_05_05_world_creatures.sql
@@ -0,0 +1,58 @@
+-- Dalaran Violet Citadel/Purple Parlor - npc scripts
+SET @CGuid = 151893; -- Set by TDB team
+
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=32739; -- Baroness Zildjia
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=32736; -- Scribe Whitman
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=32741; -- Conjurer Weinhaus
+UPDATE `creature_template` SET `exp`=0 WHERE `entry`=32631; -- Alfred Copperworth
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=32734; -- Arcanist Ginsberg
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=32735; -- Alchemist Burroughs
+
+DELETE FROM `creature` WHERE `id`=32741; -- Conjurer Weinhaus
+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
+(@CGuid+0,32741,571,1,1,0,0,5871.94,852.655,846.336,6.21344,300,0,0,1,0,0,0,0,0,0);
+DELETE FROM `creature_template_addon` WHERE `entry` IN (31848,32287,32739,32736,32631,32737,32734,32735);
+INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
+(31848,0,0,1,0, NULL), -- Zidormi
+(32287,0,0,257,0, NULL), -- Archmage Alvareaux
+(32739,0,0,257,0, NULL), -- Baroness Zildjia
+(32736,0,0,257,0, NULL), -- Scribe Whitman
+(32631,0,0,1,0, NULL), -- Alfred Copperworth
+(32737,0,0,257,0, NULL), -- Archmage John Nicholas
+(32734,0,0,257,0, NULL), -- Arcanist Ginsberg
+(32735,0,0,257,0, NULL); -- Alchemist Burroughs
+UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=27756; -- Zidormi
+UPDATE `creature_model_info` SET `bounding_radius`=0.3672,`combat_reach`=1,`gender`=0 WHERE `modelid`=27886; -- Archmage Alvareaux
+UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=1 WHERE `modelid`=28176; -- Baroness Zildjia
+UPDATE `creature_model_info` SET `bounding_radius`=0.3519,`combat_reach`=1,`gender`=0 WHERE `modelid`=28179; -- Scribe Whitman
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=28119; -- Alfred Copperworth
+UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=0 WHERE `modelid`=28174; -- Archmage John Nicholas
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=28173; -- Arcanist Ginsberg
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=28172; -- Alchemist Burroughs
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=19284; -- Archmage Vargoth
+
+-- Add teleport to gossip option "Teleport me to Caverns of Time." - Zidormi
+UPDATE `gossip_menu_option` SET `action_script_id`=10131 WHERE `menu_id`=10131 AND `id`=0;
+DELETE FROM `gossip_scripts` WHERE `id`=10131;
+INSERT INTO `gossip_scripts` (`id`,`delay`,`command`,`datalong`,`datalong2`,`dataint`,`x`,`y`,`z`,`o`) VALUES
+(10131,0,6,1,0,0,-8167.24,-4766.05,33.8599,1.74123);
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=10131 AND `SourceEntry`=0;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(15,10131,0,0,27,65,3,0,0, '', 'Zidormi - Teleport to CoT level restriction'); -- Zidormi
+
+-- Talk events for Baroness Zildjia, Scribe Whitman and Conjurer Weinhaus
+DELETE FROM `creature_text` WHERE `entry` IN (32739,32736,32741) AND `groupid`=0;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(32739,0,0, 'The view up here is amazing!',0,0,0,5,0,0, 'Baroness Zildjia'), -- Baroness Zildjia
+(32739,0,1, 'Too bad I left my light feathers at home... Slow Fall would work perfect here!',0,0,0,1,0,0, 'Baroness Zildjia'), -- Baroness Zildjia
+(32736,0,0, 'The view up here is amazing!',0,0,0,5,0,0, 'Scribe Whitman'), -- Scribe Whitman
+(32736,0,1, 'Too bad I left my light feathers at home... Slow Fall would work perfect here!',0,0,0,1,0,0, 'Scribe Whitman'), -- Scribe Whitman
+(32741,0,0, 'The view up here is amazing!',0,0,0,5,0,0, 'Conjurer Weinhaus'), -- Conjurer Weinhaus
+(32741,0,1, 'Too bad I left my light feathers at home... Slow Fall would work perfect here!',0,0,0,1,0,0, 'Conjurer Weinhaus'); -- Conjurer Weinhaus
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (32739,32736,32741,32734,32735) 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
+(32739,0,0,0,1,0,100,0,0,0,420000,1000000,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Baroness Zildjia: Say rand text every 7-14 minutes'), -- Baroness Zildjia
+(32736,0,0,0,1,0,100,0,0,0,300000,840000,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Scribe Whitman: Say rand text every 5-14 minutes'), -- Scribe Whitman
+(32741,0,0,0,1,0,100,0,0,0,400000,520000,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Conjurer Weinhaus: Say rand text every 5-7 minutes'), -- Conjurer Weinhaus
+(32734,0,0,0,1,0,100,0,0,0,5000,30000,10,274,1,11,0,0,0,1,0,0,0,0,0,0,0, 'Arcanist Ginsberg: Random emote every 5-30 seconds'), -- Arcanist Ginsberg
+(32735,0,0,0,1,0,100,0,0,0,5000,30000,10,274,1,11,0,0,0,1,0,0,0,0,0,0,0, 'Alchemist Burroughs: Random emote every 5-30 seconds'); -- Alchemist Burroughs
diff --git a/sql/updates/world/2011_03_05_1_world_spell_proc_event.sql b/sql/updates/world/2011_03_05_1_world_spell_proc_event.sql
deleted file mode 100644
index 22412fcb8ec..00000000000
--- a/sql/updates/world/2011_03_05_1_world_spell_proc_event.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-DELETE FROM `spell_proc_event` WHERE `entry` IN (71880,71892);
-INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES
-(71880,0x00,0,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,1,0,0), -- Item - Icecrown 25 Normal Dagger Proc
-(71892,0x00,0,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,1,0,0); -- Item - Icecrown 25 Heroic Dagger Proc
diff --git a/sql/updates/world/2011_03_05_2_world_creatures.sql b/sql/updates/world/2011_03_05_2_world_creatures.sql
deleted file mode 100644
index 4c593672dc7..00000000000
--- a/sql/updates/world/2011_03_05_2_world_creatures.sql
+++ /dev/null
@@ -1,79 +0,0 @@
--- Vehicle updates
-UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=25765; -- Fizzcrank Bomber
-UPDATE `creature_template` SET `speed_run`=3.42857 WHERE `entry`=26572; -- Kor'kron War Rider
-UPDATE `creature_template` SET `speed_run`=1.71429 WHERE `entry`=29500; -- Brunnhildar Warbear
-UPDATE `creature_template` SET `speed_run`=1.71429 WHERE `entry`=30174; -- Hyldsmeet Warbear
-UPDATE `creature_template` SET `unit_flags`=`unit_flags`|32768,`speed_walk`=1.444444,`speed_run`=1.5873 WHERE `entry`=30228; -- Argent Skytalon
-UPDATE `creature_template` SET `exp`=0,`speed_run`=1.38571 WHERE `entry`=31269; -- Kor'kron Battle Wyvern
-UPDATE `creature_template` SET `speed_run`=1 WHERE `entry`=31881; -- Kor'kron Troop Transport
-UPDATE `creature_template` SET `speed_walk`=2.8,`speed_run`=1.71429 WHERE `entry`=29351; -- Niffelem Frost Giant
-UPDATE `creature_template` SET `speed_walk`=2.8,`speed_run`=1.71429 WHERE `entry`=29358; -- Frostworg
-UPDATE `creature_template` SET `speed_run`=0.99206 WHERE `entry`=29931; -- Drakkari Rhino
-UPDATE `creature_template` SET `unit_flags`=`unit_flags`|33587200,`speed_walk`=2,`speed_run`=1.71429 WHERE `entry`=30204; -- Forgotten Depths Ambusher
-UPDATE `creature_template` SET `speed_walk`=1.444444 WHERE `entry`=36891; -- Iceborn Proto-Drake
-UPDATE `creature_template` SET `exp`=0,`baseattacktime`=2000,`speed_run`=1.38571 WHERE `entry`=38500; -- Argent Warhorse
-
-UPDATE `creature_model_info` SET `bounding_radius`=0.15,`combat_reach`=2.5,`gender`=0 WHERE `modelid`=31187; -- Argent Skytalon
-UPDATE `creature_model_info` SET `bounding_radius`=0.825,`combat_reach`=4.125,`gender`=0 WHERE `modelid`=26388; -- Brunnhildar Warbear
-UPDATE `creature_model_info` SET `bounding_radius`=0.31,`combat_reach`=1,`gender`=0 WHERE `modelid`=17722; -- Kor'kron Battle Wyvern
-UPDATE `creature_model_info` SET `bounding_radius`=1.68025,`combat_reach`=4.125,`gender`=0 WHERE `modelid`=26323; -- Injured Icemaw Matriarch
-UPDATE `creature_model_info` SET `bounding_radius`=0.31,`combat_reach`=6,`gender`=0 WHERE `modelid`=24531; -- Niffelem Frost Giant
-UPDATE `creature_model_info` SET `bounding_radius`=3,`combat_reach`=0,`gender`=0 WHERE `modelid`=26331; -- Frostworg
-UPDATE `creature_model_info` SET `bounding_radius`=0.465,`combat_reach`=2.25,`gender`=0 WHERE `modelid`=25729; -- Forgotten Depths Ambusher
-
-DELETE FROM `creature_template_addon` WHERE `entry` IN (24418,25765,26572,27761,28054,29500,30013,30174,30228,31269,31881,29563,29351,29358,29931,30204,36476,36794,36891,36896,38500);
-INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
-(24418,0,33554433,1,0, NULL), -- Steel Gate Flying Machine
-(25765,0,0,1,0, NULL), -- Fizzcrank Bomber
-(26572,0,0,1,0, NULL), -- Kor'kron War Rider
-(27761,0,65536,1,0, NULL), -- Fordragon Battle Steed
-(28054,0,4,257,0, NULL), -- Lucky Wilhelm
-(29500,0,0,1,0, NULL), -- Brunnhildar Warbear
-(30013,0,50331648,1,0, NULL), -- Stormcrest Eagle
-(30174,0,0,1,0, NULL), -- Hyldsmeet Warbear
-(30228,0,50331648,1,0, NULL), -- Argent Skytalon
-(31269,0,50331648,1,0, NULL), -- Kor'kron Battle Wyvern
-(31881,0,50331649,1,0, NULL), -- Kor'kron Troop Transport
-(29563,0,7,1,0, NULL), -- Injured Icemaw Matriarch
-(29351,0,0,1,0, NULL), -- Niffelem Frost Giant
-(29358,0,0,1,0, NULL), -- Frostworg
-(29931,0,0,1,0, NULL), -- Drakkari Rhino
-(30204,0,0,1,0, '56422 0'), -- Forgotten Depths Ambusher, Auras: Nerubian Submerge
-(36476,0,0,1,0, NULL), -- Ick
-(36794,0,0,1,0, NULL), -- Scourgelord Tyrannus
-(36891,0,0,1,0, NULL), -- Iceborn Proto-Drake
-(36896,0,0,1,0, NULL), -- Stonespine Gargoyle
-(38500,0,0,1,0, NULL); -- Argent Warhorse
-
-DELETE FROM `npc_spellclick_spells` WHERE `npc_entry` IN (24418,25765,26572,27761,28054,29500,30013,30174,30228,31269,31269,29563,28222,24750,27241,28018,29351,29358,29698,29931,30204,36477,36794,36891,36896,38500);
-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
-(24418,43768,0,0,0,3,0,0,0),  -- Steel Gate Flying Machine - Flying Machine Controls
-(25765,43671,0,0,0,1,0,0,0),  -- Fizzcrank Bomber - Ride Vehicle
-(26572,46598,0,0,0,1,0,0,0),  -- Kor'kron War Rider - Ride Vehicle Hardcoded
-(27761,43671,0,0,0,1,0,0,0),  -- Fordragon Battle Steed - Ride Vehicle
-(28054,50556,0,0,0,1,0,0,0),  -- Lucky Wilhelm - Ride Wilhelm
-(29500,46598,0,0,0,1,0,0,0),  -- Brunnhildar Warbear - Ride Vehicle Hardcoded
-(30013,43671,0,0,0,1,0,0,0),  -- Stormcrest Eagle - Ride Vehicle
-(30174,46598,0,0,0,1,0,0,0),  -- Hyldsmeet Warbear - Ride Vehicle Hardcoded
-(30228,56678,0,0,0,1,0,0,0),  -- Argent Skytalon - Command Argent Skytalon
-(31269,46598,0,0,0,1,0,0,0),  -- Kor'kron Battle Wyvern - Ride Vehicle Hardcoded
-(31269,46598,0,0,0,1,0,0,0),  -- Kor'kron Troop Transport - Ride Vehicle Hardcoded
-(29563,56795,12983,1,1,2,0,0,0), -- Injured Icemaw Matriarch - Harnessed Icemaw Matriarch
-(28222,52082,0,0,0,1,0,0,0),  -- The Etymidian - The Etymidian's Call
-(24750,46598,0,0,0,1,0,0,0), -- Hidalgo the Master Falconer - Ride Vehicle Hardcoded
-(27241,46598,0,0,0,1,0,0,0), -- Risen Gryphon - Ride Vehicle Hardcoded
-(28018,46598,0,0,0,1,0,0,0), -- Thiassi the Lightning Bringer - Ride Vehicle Hardcoded
-(29351,46598,0,0,0,1,0,0,0), -- Niffelem Frost Giant - Ride Vehicle Hardcoded
-(29358,46598,0,0,0,1,0,0,0), -- Frostworg - Ride Vehicle Hardcoded
-(29698,46598,0,0,0,1,0,0,0), -- Drakuru Raptor - Ride Vehicle Hardcoded
-(29931,46598,0,0,0,1,0,0,0), -- Drakkari Rhino - Ride Vehicle Hardcoded
-(30204,46598,0,0,0,1,0,0,0), -- Forgotten Depths Ambusher - Ride Vehicle Hardcoded
-(36477,46598,0,0,0,0,0,0,0), -- Krick - Ride Vehicle Hardcoded
-(36794,46598,0,0,0,1,0,0,0), -- Scourgelord Tyrannus - Ride Vehicle Hardcoded
-(36891,46598,0,0,0,1,0,0,0), -- Iceborn Proto-Drake - Ride Vehicle Hardcoded
-(36896,46598,0,0,0,1,0,0,0), -- Stonespine Gargoyle - Ride Vehicle Hardcoded
-(38500,46598,0,0,0,1,0,0,0); -- Argent Warhorse - Ride Vehicle Hardcoded
-
-DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=43768;
-INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`Comment`) VALUES
-(13,0,43768,0,18,1,24418,0, 'Steel Gate Flying Machine');
diff --git a/sql/updates/world/2011_03_05_3_world_spell_area.sql b/sql/updates/world/2011_03_05_3_world_spell_area.sql
deleted file mode 100644
index b7efd814e3e..00000000000
--- a/sql/updates/world/2011_03_05_3_world_spell_area.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- Dragonmaw Fel Orc illusion for Netherwing Mines area after Netherwing quest chain for reputation is complete
-DELETE FROM `spell_area` WHERE `spell`=40214 AND `area`=3965;
-INSERT INTO `spell_area` (`spell`, `area`, `quest_start`, `quest_start_active`, `quest_end`, `aura_spell`, `racemask`, `gender`, `autocast`) VALUES
-(40214,3965,11013,1,0,0,0,2,1);
diff --git a/sql/updates/world/2011_03_05_4_world_creatures.sql b/sql/updates/world/2011_03_05_4_world_creatures.sql
deleted file mode 100644
index 1ee645a097e..00000000000
--- a/sql/updates/world/2011_03_05_4_world_creatures.sql
+++ /dev/null
@@ -1,133 +0,0 @@
--- Some Dalran and Area Updates (sniff)
--- Template updates 
-UPDATE `creature_template` SET `exp`=0,`npcflag`=`npcflag`|640 WHERE `entry`=32415; -- Hamaka
-UPDATE `creature_template` SET `exp`=0,`npcflag`=`npcflag`|130 WHERE `entry`=31031; -- Misensi
-UPDATE `creature_template` SET `unit_flags`=`unit_flags`|768 WHERE `entry`=35826; -- Kaye Toogie
-UPDATE `creature_template` SET `dynamicflags`=`dynamicflags`|4 WHERE `entry`=32428; -- Underbelly Rat
-UPDATE `creature_template` SET `npcflag`=`npcflag`|3 WHERE `entry`=36670; -- Magister Hathorel
-UPDATE `creature_template` SET `exp`=2,`minlevel`=82,`maxlevel`=82,`baseattacktime`=2000,`unit_flags`=`unit_flags`|33555200 WHERE `entry`=37858; -- Razorscale Image
-UPDATE `creature_template` SET `exp`=0 WHERE `entry`=32328; -- [DND] Dalaran Sewer Arena - Controller - Death
-UPDATE `creature_template` SET `exp`=0 WHERE `entry`=32339; -- [DND] Dalaran Sewer Arena - Controller
-UPDATE `creature_template` SET `minlevel`=75,`maxlevel`=75,`npcflag`=`npcflag`|4224,`unit_flags`=`unit_flags`|768 WHERE `entry`=33938; -- Zom Bocom
-UPDATE `creature_template` SET `minlevel`=75,`maxlevel`=75,`npcflag`=`npcflag`|4224,`unit_flags`=`unit_flags`|768 WHERE `entry`=33937; -- Xazi Smolderpipe
-UPDATE `creature_template` SET `minlevel`=75,`maxlevel`=75,`npcflag`=`npcflag`|4224,`unit_flags`=`unit_flags`|512 WHERE `entry`=33936; -- Nargle Lashcord
-UPDATE `creature_template` SET `npcflag`=`npcflag`|4224,`unit_flags`=`unit_flags`|512 WHERE `entry`=34095; -- Trapjaw Rix
-UPDATE `creature_template` SET `baseattacktime`=2000,`unit_flags`=`unit_flags`|33544 WHERE `entry`=42078; -- Mini Thor
-UPDATE `creature_template` SET `exp`=0 WHERE `entry`=32322; -- Gold Warrior
-UPDATE `creature_template` SET `exp`=0 WHERE `entry`=32325; -- Gold Priest
-
--- Model data 
-UPDATE `creature_model_info` SET `bounding_radius`=1.05,`combat_reach`=1.05,`gender`=0 WHERE `modelid`=10957; -- Dappled Stag
-UPDATE `creature_model_info` SET `bounding_radius`=0.236,`combat_reach`=1.5,`gender`=0 WHERE `modelid`=27957; -- Hamaka
-UPDATE `creature_model_info` SET `bounding_radius`=1,`combat_reach`=1,`gender`=2 WHERE `modelid`=1141; -- Underbelly Rat
-UPDATE `creature_model_info` SET `bounding_radius`=0.5,`combat_reach`=0.75,`gender`=0 WHERE `modelid`=4449; -- Imp
-UPDATE `creature_model_info` SET `bounding_radius`=0.09,`combat_reach`=1.5,`gender`=1 WHERE `modelid`=30806; -- Razorscale Image
-UPDATE `creature_model_info` SET `bounding_radius`=0.75,`combat_reach`=1.5,`gender`=0 WHERE `modelid`=27766; -- [DND] Dalaran Sewer Arena - Controller
-UPDATE `creature_model_info` SET `bounding_radius`=0.09,`combat_reach`=0,`gender`=2 WHERE `modelid`=32670; -- Mini Thor
-
--- Addon data
-DELETE FROM `creature_template_addon` WHERE `entry` IN (417,31233,31228,33778,34244,31236,29631,32692,32687,30352,31085,30755,31081,28671,28160,31031,28674,31238,29238,31229,
-32596,32415,32419,32418,32253,32412,32602,32732,31439,35826,32428,36670,32251,32252,32420,30659,32730,28991,32470,27047,29497,29534,31851,29493,28989,29533,32686,32683,
-29325,31080,20735,28742,29496,32265,31517,29499,37858,29156,29476,28993,32691,32675,30885,32328,32339,32743,23472,33938,33937,33936,34095,29527,28956,28691,28332,28994,28692,
-42078,29494,35497,29523,35500,28992,32683,29763,29764,29765,29766,37776,32509,29529,29529,28776,30726,28774,29528,32601,32710,32752,
-32322,32325);
-INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
-(32322,0,0,1,0, NULL), -- Gold Warrior
-(32325,0,0,1,0, NULL), -- Gold Priest
-(32752,0,0,1,0, NULL), -- Tabitha
-(32710,0,0,1,0, NULL), -- Garl Grimgrizzle
-(29763,0,0,1,0, NULL), -- Cosmetic Totem Alliance Air
-(29764,0,0,1,0, NULL), -- Cosmetic Totem Alliance Earth
-(29765,0,0,1,0, NULL), -- Cosmetic Totem Alliance Fire
-(29766,0,0,1,0, NULL), -- Cosmetic Totem Alliance Water
-(37776,0,0,1,0, NULL), -- Apprentice Nelphi
-(32509,0,0,257,0, NULL), -- Brammold Deepmine
-(29528,0,0,257,0, NULL), -- Debbi Moore
-(29529,0,0,257,0, NULL), -- Ninsianna
-(28776,0,0,257,0, NULL), -- Elizabeth Ross
-(30726,0,0,257,0, NULL), -- Archivist Betha
-(28774,0,0,257,0, NULL), -- Andrew Matthews
-(42078,0,0,1,0, NULL), -- Mini Thor
-(29494,0,0,257,0, NULL), -- Shen Kang Cheng
-(35497,0,0,257,0, NULL), -- Rafael Langrom
-(29523,0,0,257,0, NULL), -- Bragund Brightlink
-(35500,0,0,257,0, NULL), -- Matilda Brightlink
-(28992,0,0,257,0, NULL), -- Valerie Langrom
-(32683,0,0,257,0, NULL), -- Grezla the Hag
-(32686,0,0,257,0, NULL), -- Crafticus Mindbender
-(28692,0,0,257,0, NULL), -- "Red" Jack Findle
-(28994,0,0,257,0, NULL), -- Abra Cadabra
-(28332,0,0,1,0, NULL), -- Generic Trigger LAB (Large AOI)
-(28691,0,0,257,0, NULL), -- Susana Averoy
-(30885,0,0,1,0, NULL), -- Blazik Fireclaw
-(32328,0,0,1,0, NULL), -- [DND] Dalaran Sewer Arena - Controller - Death
-(32339,0,0,1,0, NULL), -- [DND] Dalaran Sewer Arena - Controller
-(32743,0,1,1,0, NULL), -- Willard Blauvelt
-(23472,0,0,1,0, NULL), -- World Trigger (Large AOI, Not Immune PC/NPC)
-(33938,0,0,1,0, NULL), -- Zom Bocom
-(33937,0,0,1,0, NULL), -- Xazi Smolderpipe
-(33936,0,0,1,0, NULL), -- Nargle Lashcord
-(34095,0,0,1,0, NULL), -- Trapjaw Rix
-(29527,0,0,257,0, NULL), -- Orton Bennet
-(28956,0,0,257,0, NULL), -- Warcaster Fanoraithe
-(29534,0,0,1,0, NULL), -- "Baroness" Llana
-(31851,0,65536,1,0, NULL), -- Wooly Mammoth
-(29493,0,0,257,0, NULL), -- Jarold Puller
-(28989,0,0,258,0, NULL), -- Aemara
-(29533,0,0,1,0, NULL), -- Schembari "Uncle Sal" Shearbolt
-(32675,0,0,257,0, NULL), -- Babagahnoosh the Grumpy
-(32691,0,0,257,0, NULL), -- Magus Fansy Goodbringer
-(28993,0,0,1,0, NULL), -- Aerith Primrose
-(29476,0,0,258,0, NULL), -- Dagna Flintlock
-(29156,0,0,257,0, NULL), -- Archmage Celindra
-(37858,0,50331648,0,0, NULL), -- Razorscale Image
-(32265,0,50331648,1,0, NULL), -- Northrend Daily Dungeon Image Bunny
-(31517,0,0,1,0, NULL), -- Dalaran Fountain Invis Stalker
-(29499,0,0,257,0, NULL), -- Bartram Haller
-(31228,0,0,1,0, NULL), -- Grove Walker
-(33778,0,1,1,0, NULL), -- Tournament Hippogryph
-(34244,0,0,1,0, NULL), -- Jean Pierre Poulain
-(31236,0,0,1,0, NULL), -- Dappled Stag
-(29631,0,0,1,0, NULL), -- Awilo Lon'gomba
-(32692,0,0,257,0, NULL), -- Arcanist Alec
-(32687,0,0,257,0, NULL), -- Linda Ann Kastinglow
-(30352,0,0,256,0, NULL), -- Skybreaker Marine
-(31085,0,0,1,0, NULL), -- Sky-Reaver Klum
-(30755,0,0,256,0, NULL), -- Kor'kron Reaver
-(31081,0,0,1,0, NULL), -- Officer Van Rossem
-(28160,0,0,257,0, NULL), -- Archmage Pentarus
-(28674,0,0,257,0, NULL), -- Aludane Whitecloud
-(31031,0,0,1,69, NULL), -- Misensi
-(31238,27525,0,257,0, NULL), -- Hira Snowdawn
-(29238,0,0,1,0, NULL), -- Scourge Haunt
-(31229,0,0,1,0, NULL), -- Ancient Watcher
-(32596,0,0,257,0, NULL), -- Dalaran Visitor
-(32602,25833,0,257,0, NULL), -- Dalaran Visitor
-(32601,22471,0,257,0, NULL), -- Dalaran Visitor
-(32415,0,0,1,0, NULL), -- Hamaka
-(32419,0,0,1,0, NULL), -- Umbiwa
-(32418,0,0,1,0, NULL), -- Abohba
-(32253,0,0,2,0, NULL), -- Kyunghee
-(32412,0,0,1,0, NULL), -- Mato
-(32732,0,0,257,0, NULL), -- Dorfus Alphamage
-(31439,0,0,1,0, NULL), -- Archmage Timear
-(35826,0,1,1,0, NULL), -- Kaye Toogie
-(32428,0,0,1,0, NULL), -- Underbelly Rat
-(36670,0,0,1,0, NULL), -- Magister Hathorel
-(32251,0,0,2,0, NULL), -- Shokavis
-(32252,0,0,2,0, NULL), -- Wanathan
-(32420,0,0,1,10, NULL), -- Mimbihi
-(30659,0,0,1,333, NULL), -- Violet Hold Guard
-(32730,0,0,257,0, NULL), -- Goldlilly Gleamingfell
-(28991,0,0,257,0, NULL), -- Valaden Silverblade
-(32470,0,0,1,0, NULL), -- Sewer Frog
-(27047,0,0,1,0, NULL), -- Invisible Stalker (Floating Only)
-(29497,0,0,257,0, NULL), -- Walther Whiteford
-(29325,0,0,1,379, NULL), -- Torgo the Younger
-(31080,0,0,1,0, NULL), -- Warden Alturas
-(20735,0,0,1,0, NULL), -- Archmage Lan'dalock
-(28742,0,0,257,0, NULL), -- Marcia Chase
-(29496,0,0,257,0, NULL); -- Kerta the Bold
-
--- Template updates for gameobject 
-UPDATE `gameobject_template` SET `faction`=0 WHERE `entry`=35591; -- Fishing Bobber
diff --git a/sql/updates/world/2011_03_05_5_world_creatures.sql b/sql/updates/world/2011_03_05_5_world_creatures.sql
deleted file mode 100644
index 6eb520e6f0a..00000000000
--- a/sql/updates/world/2011_03_05_5_world_creatures.sql
+++ /dev/null
@@ -1,58 +0,0 @@
--- Dalaran Violet Citadel/Purple Parlor - npc scripts
-SET @CGuid = 151893; -- Set by TDB team
-
-UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=32739; -- Baroness Zildjia
-UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=32736; -- Scribe Whitman
-UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=32741; -- Conjurer Weinhaus
-UPDATE `creature_template` SET `exp`=0 WHERE `entry`=32631; -- Alfred Copperworth
-UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=32734; -- Arcanist Ginsberg
-UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=32735; -- Alchemist Burroughs
-
-DELETE FROM `creature` WHERE `id`=32741; -- Conjurer Weinhaus
-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
-(@CGuid+0,32741,571,1,1,0,0,5871.94,852.655,846.336,6.21344,300,0,0,1,0,0,0,0,0,0);
-DELETE FROM `creature_template_addon` WHERE `entry` IN (31848,32287,32739,32736,32631,32737,32734,32735);
-INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
-(31848,0,0,1,0, NULL), -- Zidormi
-(32287,0,0,257,0, NULL), -- Archmage Alvareaux
-(32739,0,0,257,0, NULL), -- Baroness Zildjia
-(32736,0,0,257,0, NULL), -- Scribe Whitman
-(32631,0,0,1,0, NULL), -- Alfred Copperworth
-(32737,0,0,257,0, NULL), -- Archmage John Nicholas
-(32734,0,0,257,0, NULL), -- Arcanist Ginsberg
-(32735,0,0,257,0, NULL); -- Alchemist Burroughs
-UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=27756; -- Zidormi
-UPDATE `creature_model_info` SET `bounding_radius`=0.3672,`combat_reach`=1,`gender`=0 WHERE `modelid`=27886; -- Archmage Alvareaux
-UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=1 WHERE `modelid`=28176; -- Baroness Zildjia
-UPDATE `creature_model_info` SET `bounding_radius`=0.3519,`combat_reach`=1,`gender`=0 WHERE `modelid`=28179; -- Scribe Whitman
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=28119; -- Alfred Copperworth
-UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=0 WHERE `modelid`=28174; -- Archmage John Nicholas
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=28173; -- Arcanist Ginsberg
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=28172; -- Alchemist Burroughs
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=19284; -- Archmage Vargoth
-
--- Add teleport to gossip option "Teleport me to Caverns of Time." - Zidormi
-UPDATE `gossip_menu_option` SET `action_script_id`=10131 WHERE `menu_id`=10131 AND `id`=0;
-DELETE FROM `gossip_scripts` WHERE `id`=10131;
-INSERT INTO `gossip_scripts` (`id`,`delay`,`command`,`datalong`,`datalong2`,`dataint`,`x`,`y`,`z`,`o`) VALUES
-(10131,0,6,1,0,0,-8167.24,-4766.05,33.8599,1.74123);
-DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=10131 AND `SourceEntry`=0;
-INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
-(15,10131,0,0,27,65,3,0,0, '', 'Zidormi - Teleport to CoT level restriction'); -- Zidormi
-
--- Talk events for Baroness Zildjia, Scribe Whitman and Conjurer Weinhaus
-DELETE FROM `creature_text` WHERE `entry` IN (32739,32736,32741) AND `groupid`=0;
-INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
-(32739,0,0, 'The view up here is amazing!',0,0,0,5,0,0, 'Baroness Zildjia'), -- Baroness Zildjia
-(32739,0,1, 'Too bad I left my light feathers at home... Slow Fall would work perfect here!',0,0,0,1,0,0, 'Baroness Zildjia'), -- Baroness Zildjia
-(32736,0,0, 'The view up here is amazing!',0,0,0,5,0,0, 'Scribe Whitman'), -- Scribe Whitman
-(32736,0,1, 'Too bad I left my light feathers at home... Slow Fall would work perfect here!',0,0,0,1,0,0, 'Scribe Whitman'), -- Scribe Whitman
-(32741,0,0, 'The view up here is amazing!',0,0,0,5,0,0, 'Conjurer Weinhaus'), -- Conjurer Weinhaus
-(32741,0,1, 'Too bad I left my light feathers at home... Slow Fall would work perfect here!',0,0,0,1,0,0, 'Conjurer Weinhaus'); -- Conjurer Weinhaus
-DELETE FROM `smart_scripts` WHERE `entryorguid` IN (32739,32736,32741,32734,32735) 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
-(32739,0,0,0,1,0,100,0,0,0,420000,1000000,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Baroness Zildjia: Say rand text every 7-14 minutes'), -- Baroness Zildjia
-(32736,0,0,0,1,0,100,0,0,0,300000,840000,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Scribe Whitman: Say rand text every 5-14 minutes'), -- Scribe Whitman
-(32741,0,0,0,1,0,100,0,0,0,400000,520000,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Conjurer Weinhaus: Say rand text every 5-7 minutes'), -- Conjurer Weinhaus
-(32734,0,0,0,1,0,100,0,0,0,5000,30000,10,274,1,11,0,0,0,1,0,0,0,0,0,0,0, 'Arcanist Ginsberg: Random emote every 5-30 seconds'), -- Arcanist Ginsberg
-(32735,0,0,0,1,0,100,0,0,0,5000,30000,10,274,1,11,0,0,0,1,0,0,0,0,0,0,0, 'Alchemist Burroughs: Random emote every 5-30 seconds'); -- Alchemist Burroughs
diff --git a/sql/updates/world/2011_03_06_00_world_creatures.sql b/sql/updates/world/2011_03_06_00_world_creatures.sql
new file mode 100644
index 00000000000..2e5c8ba2aa6
--- /dev/null
+++ b/sql/updates/world/2011_03_06_00_world_creatures.sql
@@ -0,0 +1 @@
+UPDATE `creature` SET `modelid`=0,`equipment_id`=0 WHERE `map`=631;
diff --git a/sql/updates/world/2011_03_06_01_world_loot_template.sql b/sql/updates/world/2011_03_06_01_world_loot_template.sql
new file mode 100644
index 00000000000..4681bd9ca96
--- /dev/null
+++ b/sql/updates/world/2011_03_06_01_world_loot_template.sql
@@ -0,0 +1,392 @@
+-- Trashloot for ICC/FoS/PoS/HoR
+-- Generic
+SET @ICC_TrashGenericGrey := 35063; -- Set by TDB (need x)
+SET @ICC_TrashGenericWhite := @ICC_TrashGenericGrey+1;
+SET @ICC_TrashGenericScroll := @ICC_TrashGenericGrey+2;
+SET @ICC_TrashGenericGreen := @ICC_TrashGenericGrey+3;
+SET @ICC_TrashGenericBlue := @ICC_TrashGenericGrey+4;
+SET @ICC_TrashGenericPurpleICC := @ICC_TrashGenericGrey+5;
+SET @ICC_TrashCitadelFinal := @ICC_TrashGenericGrey+6;
+SET @ICC_TrashGenericPurpleDUNN := @ICC_TrashGenericGrey+7;
+SET @ICC_TrashDungeonNFinal := @ICC_TrashGenericGrey+8;
+SET @ICC_TrashGenericPurpleDUNH := @ICC_TrashGenericGrey+9;
+SET @ICC_TrashDungeonHFinal := @ICC_TrashGenericGrey+10;
+
+DELETE FROM `reference_loot_template` WHERE `entry` BETWEEN @ICC_TrashGenericGrey AND @ICC_TrashGenericGrey+10; 
+DELETE FROM `reference_loot_template` WHERE `entry` BETWEEN 35063 AND 35076; -- cleanup OLD loot
+INSERT INTO reference_loot_template (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES
+-- grey items (45)
+(@ICC_TrashGenericGrey,33430,0,1,1,1,1), -- Abandoned Greatsword
+(@ICC_TrashGenericGrey,33426,0,1,1,1,1), -- Chipped Timber Axe
+(@ICC_TrashGenericGrey,33424,0,1,1,1,1), -- Cracked Iron Staff
+(@ICC_TrashGenericGrey,33428,0,1,1,1,1), -- Dulled SHiv
+(@ICC_TrashGenericGrey,33397,0,1,1,1,1), -- Frigid Mail Armor
+(@ICC_TrashGenericGrey,33398,0,1,1,1,1), -- Frigid Mail Belt
+(@ICC_TrashGenericGrey,33399,0,1,1,1,1), -- Frigid Mail Boots
+(@ICC_TrashGenericGrey,33400,0,1,1,1,1), -- Frigid Mail Bracers
+(@ICC_TrashGenericGrey,33433,0,1,1,1,1), -- Frigid Mail Circlet
+(@ICC_TrashGenericGrey,33401,0,1,1,1,1), -- Frigid Mail Gloves
+(@ICC_TrashGenericGrey,33402,0,1,1,1,1), -- Frigid Mail Pants
+(@ICC_TrashGenericGrey,33403,0,1,1,1,1), -- Frigid Mail Shoulderpads
+(@ICC_TrashGenericGrey,33427,0,1,1,1,1), -- Frost-Encrusted Rifle
+(@ICC_TrashGenericGrey,33365,0,1,1,1,1), -- Frost-Rimed Cloth Belt
+(@ICC_TrashGenericGrey,33366,0,1,1,1,1), -- Frost-Rimed Cloth Boots
+(@ICC_TrashGenericGrey,33367,0,1,1,1,1), -- Frost-Rimed Cloth Bracers
+(@ICC_TrashGenericGrey,33368,0,1,1,1,1), -- Frost-Rimed Cloth Gloves
+(@ICC_TrashGenericGrey,33346,0,1,1,1,1), -- Frost-Rimed Cloth Hat
+(@ICC_TrashGenericGrey,33369,0,1,1,1,1), -- Frost-Rimed Cloth Pants
+(@ICC_TrashGenericGrey,33370,0,1,1,1,1), -- Frost-Rimed Cloth Shoulderpads
+(@ICC_TrashGenericGrey,33371,0,1,1,1,1), -- Frost-Rimed Cloth Vest
+(@ICC_TrashGenericGrey,33412,0,1,1,1,1), -- Frost-Worn Plate Belt
+(@ICC_TrashGenericGrey,33413,0,1,1,1,1), -- Frost-Worn Plate Boots
+(@ICC_TrashGenericGrey,33414,0,1,1,1,1), -- Frost-Worn Plate Bracers
+(@ICC_TrashGenericGrey,33415,0,1,1,1,1), -- Frost-Worn Plate Chestpiece
+(@ICC_TrashGenericGrey,33416,0,1,1,1,1), -- Frost-Worn Plate Gloves
+(@ICC_TrashGenericGrey,33435,0,1,1,1,1), -- Frost-Worn Plate Helmet
+(@ICC_TrashGenericGrey,33417,0,1,1,1,1), -- Frost-Worn Plate Pants
+(@ICC_TrashGenericGrey,33419,0,1,1,1,1), -- Frost-Worn Plate Shoulderpads
+(@ICC_TrashGenericGrey,33379,0,1,1,1,1), -- Frozen Armor
+(@ICC_TrashGenericGrey,33380,0,1,1,1,1), -- Frozen Belt
+(@ICC_TrashGenericGrey,33381,0,1,1,1,1), -- Frozen Boots
+(@ICC_TrashGenericGrey,33382,0,1,1,1,1), -- Frozen Bracers
+(@ICC_TrashGenericGrey,33383,0,1,1,1,1), -- Frozen Gloves
+(@ICC_TrashGenericGrey,33434,0,1,1,1,1), -- Frozen Leather Helmet
+(@ICC_TrashGenericGrey,33384,0,1,1,1,1), -- Frozen Pants
+(@ICC_TrashGenericGrey,33385,0,1,1,1,1), -- Frozen Shoulderpads
+(@ICC_TrashGenericGrey,33429,0,1,1,1,1), -- Ice Cleaver
+(@ICC_TrashGenericGrey,33425,0,1,1,1,1), -- Ice-Pitted Blade
+(@ICC_TrashGenericGrey,33431,0,1,1,1,1), -- Icesmashing Mace
+(@ICC_TrashGenericGrey,33423,0,1,1,1,1), -- Rime-Covered Mace
+(@ICC_TrashGenericGrey,33422,0,1,1,1,1), -- Shattered Bow
+(@ICC_TrashGenericGrey,43852,70,1,1,1,1), -- Thick Fur Clothing Scraps (drops more often)
+-- white items
+(@ICC_TrashGenericWhite,33470,0,1,1,2,7), -- Frostweave Cloth
+(@ICC_TrashGenericWhite,33445,0,1,1,1,1), -- Honeymint Tea
+(@ICC_TrashGenericWhite,33454,0,1,1,1,1), -- Salted Venison
+(@ICC_TrashGenericWhite,35947,0,1,1,1,1), -- Sparkling Frostcap
+(@ICC_TrashGenericWhite,33447,0,1,1,1,1), -- Runic Healing Potion
+(@ICC_TrashGenericWhite,33448,0,1,1,1,1), -- Runic Mana Potion
+-- Scroll items
+(@ICC_TrashGenericScroll,43463,0,1,1,1,1), -- Scroll of Agility VII
+(@ICC_TrashGenericScroll,37091,0,1,1,1,1), -- Scroll of Intellect VII
+(@ICC_TrashGenericScroll,37093,0,1,1,1,1), -- Scroll of Stamina VII
+(@ICC_TrashGenericScroll,43465,0,1,1,1,1), -- Scroll of Strength VII
+(@ICC_TrashGenericScroll,37097,0,1,1,1,1), -- Scroll of Spirit VII
+(@ICC_TrashGenericScroll,43464,0,1,1,1,1), -- Scroll of Agility VIII
+(@ICC_TrashGenericScroll,37092,0,1,1,1,1), -- Scroll of Intellect VIII
+(@ICC_TrashGenericScroll,37094,0,1,1,1,1), -- Scroll of Stamina VIII
+(@ICC_TrashGenericScroll,43466,0,1,1,1,1), -- Scroll of Strength VIII
+(@ICC_TrashGenericScroll,37098,0,1,1,1,1), -- Scroll of Spirit VIII
+-- green items (166)
+(@ICC_TrashGenericGreen,36609,0,1,1,1,1), -- Abandoned Spear
+(@ICC_TrashGenericGreen,36497,0,1,1,1,1), -- Adamant Mallet
+(@ICC_TrashGenericGreen,36511,0,1,1,1,1), -- Artic War Hammer
+(@ICC_TrashGenericGreen,36694,0,1,1,1,1), -- Beatific Mace
+(@ICC_TrashGenericGreen,36527,0,1,1,1,1), -- Blackened Blade
+(@ICC_TrashGenericGreen,36611,0,1,1,1,1), -- Black Scythe
+(@ICC_TrashGenericGreen,36638,0,1,1,1,1), -- Bloody Crossbow
+(@ICC_TrashGenericGreen,36428,0,1,1,1,1), -- Bouquet Ring
+(@ICC_TrashGenericGreen,36639,0,1,1,1,1), -- Brutal Ballista
+(@ICC_TrashGenericGreen,36707,0,1,1,1,1), -- Cascading Water Staff
+(@ICC_TrashGenericGreen,36539,0,1,1,1,1), -- Chilled Warblade
+(@ICC_TrashGenericGreen,36723,0,1,1,1,1), -- Clawed Shuriken
+(@ICC_TrashGenericGreen,36035,0,1,1,1,1), -- Condor Belt
+(@ICC_TrashGenericGreen,36042,0,1,1,1,1), -- Condor Bindings
+(@ICC_TrashGenericGreen,36038,0,1,1,1,1), -- Condor Gloves
+(@ICC_TrashGenericGreen,36039,0,1,1,1,1), -- Condor Headpiece
+(@ICC_TrashGenericGreen,36040,0,1,1,1,1), -- Condor Pants
+(@ICC_TrashGenericGreen,36037,0,1,1,1,1), -- Condor Robe
+(@ICC_TrashGenericGreen,36036,0,1,1,1,1), -- Condor Sandals
+(@ICC_TrashGenericGreen,36041,0,1,1,1,1), -- Condor Shoulderpads
+(@ICC_TrashGenericGreen,36266,0,1,1,1,1), -- Cormorant Bracelets
+(@ICC_TrashGenericGreen,36261,0,1,1,1,1), -- Cormorant Chain Vest
+(@ICC_TrashGenericGreen,36260,0,1,1,1,1), -- Cormorant Footwraps
+(@ICC_TrashGenericGreen,36262,0,1,1,1,1), -- Cormorant Gloves
+(@ICC_TrashGenericGreen,36263,0,1,1,1,1), -- Cormorant Helm
+(@ICC_TrashGenericGreen,36264,0,1,1,1,1), -- Cormorant Leggings
+(@ICC_TrashGenericGreen,36265,0,1,1,1,1), -- Cormorant Mantle
+(@ICC_TrashGenericGreen,36259,0,1,1,1,1), -- Cormorant Waistband
+(@ICC_TrashGenericGreen,36525,0,1,1,1,1), -- Craggy Machete
+(@ICC_TrashGenericGreen,36709,0,1,1,1,1), -- Crystal Woodstaff
+(@ICC_TrashGenericGreen,36050,0,1,1,1,1), -- Crystalsong Bracelets
+(@ICC_TrashGenericGreen,36047,0,1,1,1,1), -- Crystalsong Crown
+(@ICC_TrashGenericGreen,36046,0,1,1,1,1), -- Crystalsong Gloves
+(@ICC_TrashGenericGreen,36048,0,1,1,1,1), -- Crystalsong Leggings
+(@ICC_TrashGenericGreen,36049,0,1,1,1,1), -- Crystalsong Mantle
+(@ICC_TrashGenericGreen,36045,0,1,1,1,1), -- Crystalsong Robe
+(@ICC_TrashGenericGreen,36043,0,1,1,1,1), -- Crystalsong Sash
+(@ICC_TrashGenericGreen,36044,0,1,1,1,1), -- Crystalsong Slippers
+(@ICC_TrashGenericGreen,36554,0,1,1,1,1), -- Cursed Staff
+(@ICC_TrashGenericGreen,43297,0,1,1,1,1), -- Damaged Necklace
+(@ICC_TrashGenericGreen,36553,0,1,1,1,1), -- Desecrated Staff
+(@ICC_TrashGenericGreen,36695,0,1,1,1,1), -- Dogmatic Scepter
+(@ICC_TrashGenericGreen,36721,0,1,1,1,1), -- Dragon's Teeth
+(@ICC_TrashGenericGreen,36413,0,1,1,1,1), -- Dyed Taffeta Cape
+(@ICC_TrashGenericGreen,36427,0,1,1,1,1), -- Engraved Ring
+(@ICC_TrashGenericGreen,36484,0,1,1,1,1), -- Etched Dagger
+(@ICC_TrashGenericGreen,36499,0,1,1,1,1), -- Frigid War-Mace
+(@ICC_TrashGenericGreen,36470,0,1,1,1,1), -- Gilded Scepter
+(@ICC_TrashGenericGreen,36381,0,1,1,1,1), -- Golem Breastplate
+(@ICC_TrashGenericGreen,36382,0,1,1,1,1), -- Golem Gauntlets
+(@ICC_TrashGenericGreen,36379,0,1,1,1,1), -- Golem Girdle
+(@ICC_TrashGenericGreen,36383,0,1,1,1,1), -- Golem Helmet
+(@ICC_TrashGenericGreen,36384,0,1,1,1,1), -- Golem Legplates
+(@ICC_TrashGenericGreen,36385,0,1,1,1,1), -- Golem Pauldrons
+(@ICC_TrashGenericGreen,36380,0,1,1,1,1), -- Golem Sabatons
+(@ICC_TrashGenericGreen,36386,0,1,1,1,1), -- Golem Vambraces
+(@ICC_TrashGenericGreen,36623,0,1,1,1,1), -- Harnessed Longbow
+(@ICC_TrashGenericGreen,36568,0,1,1,1,1), -- Hollowed Bone Knuckles
+(@ICC_TrashGenericGreen,36637,0,1,1,1,1), -- Horrific Crossbow
+(@ICC_TrashGenericGreen,36471,0,1,1,1,1), -- Ice Crystal
+(@ICC_TrashGenericGreen,36582,0,1,1,1,1), -- Ice Pick
+(@ICC_TrashGenericGreen,36597,0,1,1,1,1), -- Ice-Splintering Axe
+(@ICC_TrashGenericGreen,36456,0,1,1,1,1), -- Ice Kite Shield
+(@ICC_TrashGenericGreen,36457,0,1,1,1,1), -- Ivory Shield
+(@ICC_TrashGenericGreen,36373,0,1,1,1,1), -- Kraken Breastplate
+(@ICC_TrashGenericGreen,36377,0,1,1,1,1), -- Kraken Epaulets
+(@ICC_TrashGenericGreen,36374,0,1,1,1,1), -- Kraken Gauntlets
+(@ICC_TrashGenericGreen,36371,0,1,1,1,1), -- Kraken Girdle
+(@ICC_TrashGenericGreen,36372,0,1,1,1,1), -- Kraken Greaves
+(@ICC_TrashGenericGreen,36375,0,1,1,1,1), -- Kraken Helm
+(@ICC_TrashGenericGreen,36376,0,1,1,1,1), -- Kraken Legplates
+(@ICC_TrashGenericGreen,36378,0,1,1,1,1), -- Kraken Vambraces
+(@ICC_TrashGenericGreen,36469,0,1,1,1,1), -- Lidless Orb
+(@ICC_TrashGenericGreen,36513,0,1,1,1,1), -- Lode-Headed Hammer
+(@ICC_TrashGenericGreen,36414,0,1,1,1,1), -- Mammoth Fur Cloack
+(@ICC_TrashGenericGreen,36483,0,1,1,1,1), -- Mandible Edge
+(@ICC_TrashGenericGreen,36625,0,1,1,1,1), -- Massive Recurved Bow
+(@ICC_TrashGenericGreen,36555,0,1,1,1,1), -- Minion Staff
+(@ICC_TrashGenericGreen,36651,0,1,1,1,1), -- Muzzled Musket
+(@ICC_TrashGenericGreen,36680,0,1,1,1,1), -- Mystic Fang
+(@ICC_TrashGenericGreen,36498,0,1,1,1,1), -- Nerubian Mace
+(@ICC_TrashGenericGreen,36512,0,1,1,1,1), -- Onerous Mallet
+(@ICC_TrashGenericGreen,36441,0,1,1,1,1), -- Pearl Woven Choker
+(@ICC_TrashGenericGreen,36540,0,1,1,1,1), -- Petrified Sword
+(@ICC_TrashGenericGreen,36610,0,1,1,1,1), -- Plagued Pike
+(@ICC_TrashGenericGreen,36595,0,1,1,1,1), -- Planate Broadaxe
+(@ICC_TrashGenericGreen,36455,0,1,1,1,1), -- Plated Bulwark
+(@ICC_TrashGenericGreen,36443,0,1,1,1,1), -- Platinum Medallion
+(@ICC_TrashGenericGreen,36666,0,1,1,1,1), -- Polar Wand
+(@ICC_TrashGenericGreen,36653,0,1,1,1,1), -- Precipice Longrifle
+(@ICC_TrashGenericGreen,36147,0,1,1,1,1), -- Pygmy Belt
+(@ICC_TrashGenericGreen,36154,0,1,1,1,1), -- Pygmy Bindings
+(@ICC_TrashGenericGreen,36148,0,1,1,1,1), -- Pygmy Boots
+(@ICC_TrashGenericGreen,36150,0,1,1,1,1), -- Pygmy Gloves
+(@ICC_TrashGenericGreen,36151,0,1,1,1,1), -- Pygmy Helmet
+(@ICC_TrashGenericGreen,36152,0,1,1,1,1), -- Pygmy Pants
+(@ICC_TrashGenericGreen,36153,0,1,1,1,1), -- Pygmy Shoulders
+(@ICC_TrashGenericGreen,36149,0,1,1,1,1), -- Pygmy Tunic
+(@ICC_TrashGenericGreen,36722,0,1,1,1,1), -- Pyramid Throwing Star
+(@ICC_TrashGenericGreen,36389,0,1,1,1,1), -- Revenant Armor
+(@ICC_TrashGenericGreen,36387,0,1,1,1,1), -- Revenant Belt
+(@ICC_TrashGenericGreen,36394,0,1,1,1,1), -- Revenant Bracers
+(@ICC_TrashGenericGreen,36393,0,1,1,1,1), -- Revenant Epaulets
+(@ICC_TrashGenericGreen,36390,0,1,1,1,1), -- Revenant Gauntlets
+(@ICC_TrashGenericGreen,36388,0,1,1,1,1), -- Revenant Greaves
+(@ICC_TrashGenericGreen,36391,0,1,1,1,1), -- Revenant Helmet
+(@ICC_TrashGenericGreen,36392,0,1,1,1,1), -- Revenant Legguards
+(@ICC_TrashGenericGreen,36596,0,1,1,1,1), -- Rupturing Axe
+(@ICC_TrashGenericGreen,36569,0,1,1,1,1), -- Savage Talons
+(@ICC_TrashGenericGreen,36693,0,1,1,1,1), -- Serene Hammer
+(@ICC_TrashGenericGreen,36624,0,1,1,1,1), -- Shrieking Bow
+(@ICC_TrashGenericGreen,36442,0,1,1,1,1), -- Silken Cord Amulet
+(@ICC_TrashGenericGreen,36679,0,1,1,1,1), -- Singing Dagger
+(@ICC_TrashGenericGreen,36485,0,1,1,1,1), -- Sinuous Keris
+(@ICC_TrashGenericGreen,36567,0,1,1,1,1), -- Six-Fingered Claws
+(@ICC_TrashGenericGreen,36583,0,1,1,1,1), -- Skeletal Hacker
+(@ICC_TrashGenericGreen,36526,0,1,1,1,1), -- SLeeted Longsword
+(@ICC_TrashGenericGreen,36708,0,1,1,1,1), -- Snow Blossom Staff
+(@ICC_TrashGenericGreen,36667,0,1,1,1,1), -- Solid Ice Wand
+(@ICC_TrashGenericGreen,36275,0,1,1,1,1), -- Spiderlord Belt
+(@ICC_TrashGenericGreen,36276,0,1,1,1,1), -- Spiderlord Boots
+(@ICC_TrashGenericGreen,36282,0,1,1,1,1), -- Spiderlord Bracers
+(@ICC_TrashGenericGreen,36277,0,1,1,1,1), -- Spiderlord Chestpiece
+(@ICC_TrashGenericGreen,36278,0,1,1,1,1), -- Spiderlord Gauntlets
+(@ICC_TrashGenericGreen,36279,0,1,1,1,1), -- Spiderlord Helm
+(@ICC_TrashGenericGreen,36280,0,1,1,1,1), -- Spiderlord Legguards
+(@ICC_TrashGenericGreen,36281,0,1,1,1,1), -- Spiderlord Spaulders
+(@ICC_TrashGenericGreen,36429,0,1,1,1,1), -- Spur Ring
+(@ICC_TrashGenericGreen,36652,0,1,1,1,1), -- Stocky Shotgun
+(@ICC_TrashGenericGreen,36274,0,1,1,1,1), -- Ulduar Bracers
+(@ICC_TrashGenericGreen,36269,0,1,1,1,1), -- Ulduar Breastplate
+(@ICC_TrashGenericGreen,36270,0,1,1,1,1), -- Ulduar Gauntlets
+(@ICC_TrashGenericGreen,36267,0,1,1,1,1), -- Ulduar Girdle
+(@ICC_TrashGenericGreen,36268,0,1,1,1,1), -- Ulduar Greaves
+(@ICC_TrashGenericGreen,36271,0,1,1,1,1), -- Ulduar Helm
+(@ICC_TrashGenericGreen,36272,0,1,1,1,1), -- Ulduar Legguards
+(@ICC_TrashGenericGreen,36273,0,1,1,1,1), -- Ulduar Shoulderguards
+(@ICC_TrashGenericGreen,36415,0,1,1,1,1), -- Vintage Satin Cloak
+(@ICC_TrashGenericGreen,36058,0,1,1,1,1), -- Vizier Bracelets
+(@ICC_TrashGenericGreen,36054,0,1,1,1,1), -- Vizier Gloves
+(@ICC_TrashGenericGreen,36055,0,1,1,1,1), -- Vizier Hood
+(@ICC_TrashGenericGreen,36056,0,1,1,1,1), -- Vizier Leggings
+(@ICC_TrashGenericGreen,36057,0,1,1,1,1), -- Vizier Mantle
+(@ICC_TrashGenericGreen,36053,0,1,1,1,1), -- Vizier Robe
+(@ICC_TrashGenericGreen,36051,0,1,1,1,1), -- Vizier Sash
+(@ICC_TrashGenericGreen,36052,0,1,1,1,1), -- Vizier SLippers
+(@ICC_TrashGenericGreen,36665,0,1,1,1,1), -- Wasteland Wand
+(@ICC_TrashGenericGreen,36170,0,1,1,1,1), -- Webspinner Bindings
+(@ICC_TrashGenericGreen,36164,0,1,1,1,1), -- Webspinner Boots
+(@ICC_TrashGenericGreen,36163,0,1,1,1,1), -- Webspinner Cord
+(@ICC_TrashGenericGreen,36166,0,1,1,1,1), -- Webspinner Gloves
+(@ICC_TrashGenericGreen,36167,0,1,1,1,1), -- Webspinner Hood
+(@ICC_TrashGenericGreen,36168,0,1,1,1,1), -- Webspinner Leggings
+(@ICC_TrashGenericGreen,36169,0,1,1,1,1), -- Webspinner Shoulderguards
+(@ICC_TrashGenericGreen,36165,0,1,1,1,1), -- Webspinner Vest
+(@ICC_TrashGenericGreen,36162,0,1,1,1,1), -- Wendigo Bands
+(@ICC_TrashGenericGreen,36156,0,1,1,1,1), -- Wendigo Boots
+(@ICC_TrashGenericGreen,36157,0,1,1,1,1), -- Wendigo Chestpiece
+(@ICC_TrashGenericGreen,36155,0,1,1,1,1), -- Wendigo Girdle
+(@ICC_TrashGenericGreen,36158,0,1,1,1,1), -- Wendigo Gloves
+(@ICC_TrashGenericGreen,36159,0,1,1,1,1), -- Wendigo Hood
+(@ICC_TrashGenericGreen,36160,0,1,1,1,1), -- Wendigo Legguards
+(@ICC_TrashGenericGreen,36161,0,1,1,1,1), -- Wendigo Pauldrons
+(@ICC_TrashGenericGreen,36541,0,1,1,1,1), -- Wintry Claymore
+(@ICC_TrashGenericGreen,36681,0,1,1,1,1), -- Wisdom Carver
+(@ICC_TrashGenericGreen,36581,0,1,1,1,1), -- Wolvar Handaxe
+-- blue items
+(@ICC_TrashGenericBlue,37792,0,1,1,1,1), -- Agin's Crushing Carapace
+(@ICC_TrashGenericBlue,37770,0,1,1,1,1), -- Bulge-Concealing Breastplate
+(@ICC_TrashGenericBlue,37780,0,1,1,1,1), -- Condor-Bone Chestguard
+(@ICC_TrashGenericBlue,37760,0,1,1,1,1), -- Cracklefire Wristguards
+(@ICC_TrashGenericBlue,37781,0,1,1,1,1), -- Grips of the Warming Heart
+(@ICC_TrashGenericBlue,37824,0,1,1,1,1), -- Gwyneth's Runed Dragonwand
+(@ICC_TrashGenericBlue,37761,0,1,1,1,1), -- Shimmerthread Girdle
+(@ICC_TrashGenericBlue,37793,0,1,1,1,1), -- Skullcage of Eternal Terror
+(@ICC_TrashGenericBlue,37794,0,1,1,1,1), -- Torta's Oversized Choker
+(@ICC_TrashGenericBlue,37822,0,1,1,1,1), -- Twisted Puzzle-Ring
+(@ICC_TrashGenericBlue,37771,0,1,1,1,1), -- Wristguard of Verdant Recovery
+-- Designs
+(@ICC_TrashGenericBlue,41788,0,1,1,1,1), -- Design: Beaming Earthsiege Diamond
+(@ICC_TrashGenericBlue,41780,0,1,1,1,1), -- Design: Champion's Monarch Topaz
+(@ICC_TrashGenericBlue,41786,0,1,1,1,1), -- Design: Destructive Skyflare Diamond
+(@ICC_TrashGenericBlue,41777,0,1,1,1,1), -- Design: Etched Monarch Topaz
+(@ICC_TrashGenericBlue,41789,0,1,1,1,1), -- Design: Inscribed Monarch Topaz
+(@ICC_TrashGenericBlue,41781,0,1,1,1,1), -- Design: Misty Forest Emerald
+(@ICC_TrashGenericBlue,41783,0,1,1,1,1), -- Design: Purified Twilight Opal
+(@ICC_TrashGenericBlue,41778,0,1,1,1,1), -- Design: Resolute MOnarch Topaz
+(@ICC_TrashGenericBlue,41782,0,1,1,1,1), -- Design: Shining Forest Emerald
+(@ICC_TrashGenericBlue,41784,0,1,1,1,1), -- Design: Sovereign Twilight Opal
+(@ICC_TrashGenericBlue,41779,0,1,1,1,1), -- Design: Stalwart Monarch Topaz
+(@ICC_TrashGenericBlue,41785,0,1,1,1,1), -- Design: Tenuous Twilight Opal
+(@ICC_TrashGenericBlue,41787,0,1,1,1,1), -- Design: Thundering Skyflare Diamond
+-- tailoring
+(@ICC_TrashGenericBlue,43876,0,1,1,1,1), -- A Guide to Northern Cloth Scavenging
+-- purple items icc (8)
+(@ICC_TrashGenericPurpleICC,44311,0,1,1,1,1), -- Avool's Sword of Jin
+(@ICC_TrashGenericPurpleICC,37835,0,1,1,1,1), -- Je'Tze's Bell
+(@ICC_TrashGenericPurpleICC,44310,0,1,1,1,1), -- Namlak's Supernumerary Sticker
+(@ICC_TrashGenericPurpleICC,44309,0,1,1,1,1), -- Sash of Jordan
+(@ICC_TrashGenericPurpleICC,44308,0,1,1,1,1), -- Signet of Edward the Odd
+(@ICC_TrashGenericPurpleICC,37254,0,1,1,1,1), -- Super Simian Sphere
+(@ICC_TrashGenericPurpleICC,44312,0,1,1,1,1), -- Wapach's Spaulders of Solidarity
+(@ICC_TrashGenericPurpleICC,44313,0,1,1,1,1), -- Zom's Crackling Bulwark
+(@ICC_TrashGenericPurpleICC,50444,0,1,1,1,1), -- Rowan's Rifle of Silver Bullets
+(@ICC_TrashGenericPurpleICC,50451,0,1,1,1,1), -- Belt of the Lonely Noble
+(@ICC_TrashGenericPurpleICC,50775,0,1,1,1,1), -- Leggings of Dubious Charms
+(@ICC_TrashGenericPurpleICC,50449,0,1,1,1,1), -- Stiffened Corpse Shoulderpads
+(@ICC_TrashGenericPurpleICC,50453,0,1,1,1,1), -- Ring of Rotting Sinew
+(@ICC_TrashGenericPurpleICC,50447,0,1,1,1,1), -- Harbinger's Bone Band
+(@ICC_TrashGenericPurpleICC,50452,0,1,1,1,1), -- Wodin's Lucky Necklace
+-- purple items dungeon_N (8)
+(@ICC_TrashGenericPurpleDUNN,44311,0,1,1,1,1), -- Avool's Sword of Jin
+(@ICC_TrashGenericPurpleDUNN,37835,0,1,1,1,1), -- Je'Tze's Bell
+(@ICC_TrashGenericPurpleDUNN,44310,0,1,1,1,1), -- Namlak's Supernumerary Sticker
+(@ICC_TrashGenericPurpleDUNN,44309,0,1,1,1,1), -- Sash of Jordan
+(@ICC_TrashGenericPurpleDUNN,44308,0,1,1,1,1), -- Signet of Edward the Odd
+(@ICC_TrashGenericPurpleDUNN,37254,0,1,1,1,1), -- Super Simian Sphere
+(@ICC_TrashGenericPurpleDUNN,44312,0,1,1,1,1), -- Wapach's Spaulders of Solidarity
+(@ICC_TrashGenericPurpleDUNN,44313,0,1,1,1,1), -- Zom's Crackling Bulwark
+(@ICC_TrashGenericPurpleDUNN,49852,0,1,1,1,1), -- Coffin Nail
+(@ICC_TrashGenericPurpleDUNN,49855,0,1,1,1,1), -- Plated Grips of Korth'azz
+(@ICC_TrashGenericPurpleDUNN,49853,0,1,1,1,1), -- Titanium Links of Lore
+(@ICC_TrashGenericPurpleDUNN,49854,0,1,1,1,1), -- Mantle of Tattered Feathers
+-- purple items dungeon_H (8)
+(@ICC_TrashGenericPurpleDUNH,44311,0,1,1,1,1), -- Avool's Sword of Jin
+(@ICC_TrashGenericPurpleDUNH,37835,0,1,1,1,1), -- Je'Tze's Bell
+(@ICC_TrashGenericPurpleDUNH,44310,0,1,1,1,1), -- Namlak's Supernumerary Sticker
+(@ICC_TrashGenericPurpleDUNH,44309,0,1,1,1,1), -- Sash of Jordan
+(@ICC_TrashGenericPurpleDUNH,44308,0,1,1,1,1), -- Signet of Edward the Odd
+(@ICC_TrashGenericPurpleDUNH,37254,0,1,1,1,1), -- Super Simian Sphere
+(@ICC_TrashGenericPurpleDUNH,44312,0,1,1,1,1), -- Wapach's Spaulders of Solidarity
+(@ICC_TrashGenericPurpleDUNH,44313,0,1,1,1,1), -- Zom's Crackling Bulwark
+(@ICC_TrashGenericPurpleDUNH,50319,0,1,1,1,1), -- Unsharpened Ice Razor
+(@ICC_TrashGenericPurpleDUNH,50315,0,1,1,1,1), -- Seven-Fingered Claws
+(@ICC_TrashGenericPurpleDUNH,50318,0,1,1,1,1), -- Ghostly Wristwraps
+-- final output icc
+(@ICC_TrashCitadelFinal,1,40,1,0,-@ICC_TrashGenericGrey,1), -- 1 grey loot (40%)
+(@ICC_TrashCitadelFinal,2,40,1,0,-@ICC_TrashGenericGrey,1), -- 1 grey loot (40%)
+(@ICC_TrashCitadelFinal,3,20,1,0,-@ICC_TrashGenericWhite,1), -- 1 white loot (20%)
+(@ICC_TrashCitadelFinal,4,7,1,0,-@ICC_TrashGenericScroll,1), -- 1 scroll loot (7%)
+(@ICC_TrashCitadelFinal,5,10,1,0,-@ICC_TrashGenericGreen,1), -- 1 green loot (10%)
+(@ICC_TrashCitadelFinal,6,3,1,0,-@ICC_TrashGenericBlue,1), -- 1 blue loot (3%)
+(@ICC_TrashCitadelFinal,7,1,1,0,-@ICC_TrashGenericPurpleICC,1), -- 1 purple loot (1%)
+-- final output dungeon_n
+(@ICC_TrashDungeonNFinal,1,40,1,0,-@ICC_TrashGenericGrey,1), -- 1 grey loot (40%)
+(@ICC_TrashDungeonNFinal,2,40,1,0,-@ICC_TrashGenericGrey,1), -- 1 grey loot (40%)
+(@ICC_TrashDungeonNFinal,3,20,1,0,-@ICC_TrashGenericWhite,1), -- 1 white loot (20%)
+(@ICC_TrashDungeonNFinal,4,7,1,0,-@ICC_TrashGenericScroll,1), -- 1 scroll loot (7%)
+(@ICC_TrashDungeonNFinal,5,10,1,0,-@ICC_TrashGenericGreen,1), -- 1 green loot (10%)
+(@ICC_TrashDungeonNFinal,6,3,1,0,-@ICC_TrashGenericBlue,1), -- 1 blue loot (3%)
+(@ICC_TrashDungeonNFinal,7,1,1,0,-@ICC_TrashGenericPurpleDUNN,1), -- 1 purple loot (1%)
+-- final output dungeon_h
+(@ICC_TrashDungeonHFinal,1,40,1,0,-@ICC_TrashGenericGrey,1), -- 1 grey loot (40%)
+(@ICC_TrashDungeonHFinal,2,40,1,0,-@ICC_TrashGenericGrey,1), -- 1 grey loot (40%)
+(@ICC_TrashDungeonHFinal,3,20,1,0,-@ICC_TrashGenericWhite,1), -- 1 white loot (20%)
+(@ICC_TrashDungeonHFinal,4,7,1,0,-@ICC_TrashGenericScroll,1), -- 1 scroll loot (7%)
+(@ICC_TrashDungeonHFinal,5,10,1,0,-@ICC_TrashGenericGreen,1), -- 1 green loot (10%)
+(@ICC_TrashDungeonHFinal,6,3,1,0,-@ICC_TrashGenericBlue,1), -- 1 blue loot (3%)
+(@ICC_TrashDungeonHFinal,7,1,1,0,-@ICC_TrashGenericPurpleDUNH,1); -- 1 purple loot (1%)
+
+-- --------------------------------
+-- -- Apply Trash Loot Dungeon_N --
+-- --------------------------------
+SET @LootDUNGEON_N := 100000; -- needs official entry designated
+UPDATE `creature_template` SET `lootid`=@LootDUNGEON_N WHERE `entry` IN (36522,36620,36516,36564,36499,36478,36666); -- FoS
+UPDATE `creature_template` SET `lootid`=@LootDUNGEON_N WHERE `entry` IN (36896,36842,36830,36879,37711,36788,37712,37713); -- PoS
+UPDATE `creature_template` SET `lootid`=@LootDUNGEON_N WHERE `entry` IN (38176,38177,38173,38172,38175,36723); -- HoR
+DELETE FROM `creature_loot_template` WHERE `entry` IN (36522,36620,36516,36564,36499,36478,36666,36896,36842,36830,36879,37711,36788,37712,37713,38176,38177,38173,38172,38175,36723,@LootDUNGEON_N);
+INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES
+(@LootDUNGEON_N,1,100,1,0,-@ICC_TrashDungeonNFinal,2); -- 2 selection from reference
+
+-- --------------------------------
+-- -- Apply Trash Loot Dungeon_H --
+-- -------------------------------- 
+SET @LootDUNGEON_H := 100001; -- needs official entry designated
+UPDATE `creature_template` SET `lootid`=@LootDUNGEON_H WHERE `entry` IN (37569,37568,37567,37565,38193,37566,37563); -- FoS
+UPDATE `creature_template` SET `lootid`=@LootDUNGEON_H WHERE `entry` IN (37609,37638,37637,37635,37636,38249,38025,38026); -- PoS
+UPDATE `creature_template` SET `lootid`=@LootDUNGEON_H WHERE `entry` IN (37720,38524,38525,38563,38544,38564); -- HoR
+DELETE FROM `creature_loot_template` WHERE `entry` IN (37569,37568,37567,37565,38193,37566,37563,37609,37638,37637,37635,37636,38249,38025,38026,37720,38524,38525,38563,38544,38564,@LootDUNGEON_H);
+INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES
+(@LootDUNGEON_H,1,100,1,0,-@ICC_TrashDungeonHFinal,2); -- 2 selection from reference
+
+-- --------------------------
+-- -- Apply Trash Loot ICC --
+-- --------------------------
+SET @LootRAID := 100002; -- needs official entry designated
+UPDATE `creature_template` SET `lootid`=@LootRAID WHERE `entry` IN(37012,37022,37571,37664,37595,37662,37665,37663,37666,37007,36811,36807,36829,36805,36808,36880,37546,37531,37229,37228,36725,37501,37502,37023,10404,38494,38490,36724,37126,37544,37545,37098,37038);
+DELETE FROM `creature_loot_template` WHERE `entry` IN(37012,37022,37571,37664,37595,37662,37665,37663,37666,37007,36811,36807,36829,36805,36808,36880,37546,37531,37229,37228,36725,37501,37502,37023,10404,38494,38490,36724,37126,37544,37545,37098,37038,@LootRAID);
+INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES
+(@LootRAID,1,100,1,0,-@ICC_TrashCitadelFinal,2); -- 2 selection from reference
+
+-- --------------------
+-- -- Special Cases: --
+-- --------------------
+-- Specialids
+CALL `sp_set_npc_lootid_bylist` ('37217,37025,37230,37532,36891',NULL);
+-- Loot
+DELETE FROM `creature_loot_template` WHERE `entry` IN (37217,37025,37230,37532,36891);
+INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES
+-- Precious
+(37217,1,100,1,0,-@ICC_TrashCitadelFinal,2), -- 2 selection from reference
+(37217,52019,30,1,0,1,1), -- Precious Ribbon
+-- Stinky
+(37025,1,100,1,0,-@ICC_TrashCitadelFinal,2), -- 2 selection from reference
+-- Dragons (Spire Frostwyrm)
+(37230,1,100,1,0,-@ICC_TrashCitadelFinal,2), -- 2 selection from reference
+(37230,33631,65,1,1,2,3), -- Frosted Claw
+(37230,33632,35,1,1,2,3), -- Icicle Fang
+(37532,33631,65,1,1,2,3), -- Frosted Claw
+(37532,33632,35,1,1,2,3), -- Icicle Fang
+(36891,33631,65,1,1,2,3), -- Frosted Claw
+(36891,33632,35,1,1,2,3); -- Icicle Fang
diff --git a/sql/updates/world/2011_03_06_02_world_creatures.sql b/sql/updates/world/2011_03_06_02_world_creatures.sql
new file mode 100644
index 00000000000..5058a3d0921
--- /dev/null
+++ b/sql/updates/world/2011_03_06_02_world_creatures.sql
@@ -0,0 +1,64 @@
+-- Template updates
+UPDATE `creature_template` SET `speed_walk`=1,`speed_run`=2 WHERE `entry`=28782; -- Acherus Deathcharger
+UPDATE `creature_template` SET `speed_walk`=1.2,`speed_run`=0.71429 WHERE `entry`=33113; -- Flame Leviathan
+UPDATE `creature_template` SET `baseattacktime`=1500,`unit_flags`=`unit_flags`|33554688 WHERE `entry`=36678; -- Professor Putricide
+UPDATE `creature_template` SET `faction_A`=14,`faction_H`=14,`baseattacktime`=2000,`unit_flags`=`unit_flags`|33587456,`speed_run`=1.38571 WHERE `entry`=35637; -- Marshal Jacob Alerius' Mount
+UPDATE `creature_template` SET `faction_A`=14,`faction_H`=14,`baseattacktime`=2000,`unit_flags`=`unit_flags`|33587456,`speed_run`=1.38571 WHERE `entry`=35633; -- Ambrose Boltspark's Mount
+UPDATE `creature_template` SET `faction_A`=14,`faction_H`=14,`baseattacktime`=2000,`unit_flags`=`unit_flags`|33587456,`speed_run`=1.38571 WHERE `entry`=35768; -- Colosos' Mount
+UPDATE `creature_template` SET `faction_A`=14,`faction_H`=14,`baseattacktime`=2000,`unit_flags`=`unit_flags`|33587456,`speed_run`=1.38571 WHERE `entry`=34658; -- Jaelyne Evensong's Mount
+UPDATE `creature_template` SET `faction_A`=14,`faction_H`=14,`baseattacktime`=2000,`unit_flags`=`unit_flags`|33587456,`speed_run`=1.38571 WHERE `entry`=35636; -- Lana Stouthammer's Mount
+UPDATE `creature_template` SET `faction_A`=14,`faction_H`=14,`baseattacktime`=2000,`unit_flags`=`unit_flags`|33587456,`speed_run`=1.38571 WHERE `entry`=35638; -- Mokra the Skullcrusher's Mount
+UPDATE `creature_template` SET `faction_A`=14,`faction_H`=14,`baseattacktime`=2000,`unit_flags`=`unit_flags`|33587456,`speed_run`=1.38571,`VehicleId`=480 WHERE `entry`=35635; -- Eressea Dawnsinger's Mount
+UPDATE `creature_template` SET `faction_A`=14,`faction_H`=14,`baseattacktime`=2000,`unit_flags`=`unit_flags`|33587456,`speed_run`=1.38571 WHERE `entry`=35640; -- Runok Wildmane's Mount
+UPDATE `creature_template` SET `faction_A`=126,`faction_H`=126,`baseattacktime`=2000,`unit_flags`=`unit_flags`|33587456,`speed_run`=1.38571,`VehicleId`=485 WHERE `entry`=35641; -- Zul'tore's Mount
+UPDATE `creature_template` SET `faction_A`=14,`faction_H`=14,`baseattacktime`=2000,`unit_flags`=`unit_flags`|33587456,`speed_run`=1.28968 WHERE `entry`=35634; -- Deathstalker Visceri's Mount
+
+-- Addon data
+UPDATE `creature_template_addon` SET `bytes1`=0,`bytes2`=1,`mount`=0,`emote`=69,`auras`=NULL WHERE `entry`=36678; -- Professor Putricide
+DELETE FROM `creature_template_addon` WHERE `entry` IN (28782,33113,35637,35633,35768,34658,35636,35638,35635,35640,35641,35634,36661);
+INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
+(28782,0,0,1,0, NULL), -- Acherus Deathcharger
+(33113,0,0,1,0, NULL), -- Flame Leviathan
+(35637,0,0,1,0, '67870 0'), -- Marshal Jacob Alerius' Mount, Auras: Trample
+(35633,0,0,1,0, '67870 0'), -- Ambrose Boltspark's Mount
+(35768,0,0,1,0, '67870 0'), -- Colosos' Mount
+(34658,0,0,1,0, '67870 0'), -- Jaelyne Evensong's Mount
+(35636,0,0,1,0, '67870 0'), -- Lana Stouthammer's Mount
+(35638,0,0,1,0, '67870 0'), -- Mokra the Skullcrusher's Mount
+(35635,0,0,1,0, '67870 0'), -- Eressea Dawnsinger's Mount
+(35640,0,0,1,0, '67870 0'), -- Runok Wildmane's Mount
+(35641,0,0,1,0, '67870 0'), -- Zul'tore's Mount
+(35634,0,0,1,0, '67870 0'), -- Deathstalker Visceri's Mount
+(36661,0,0,1,0, NULL); -- Rimefang
+
+-- Spellclick
+DELETE FROM `npc_spellclick_spells` WHERE `npc_entry` IN (24418,33113,36678,33214,35637,35633,35768,34658,35636,35638,35635,35640,35641,35634,33669,36476,36661) AND `spell_id`=46598;
+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
+(24418,46598,0,0,0,1,0,0,0),  -- Acherus Deathcharger - Ride Vehicle Hardcoded
+(33113,46598,0,0,0,1,0,0,0),  -- Flame Leviathan - Ride Vehicle Hardcoded
+(36678,46598,0,0,0,1,0,0,0), -- Professor Putricide - Ride Vehicle Hardcoded
+(33214,46598,0,0,0,1,0,0,0), -- Mechanolift 304-A - Ride Vehicle Hardcoded
+(35637,46598,0,0,0,1,0,0,0), -- Marshal Jacob Alerius' Mount - Ride Vehicle Hardcoded
+(35633,46598,0,0,0,1,0,0,0), -- Ambrose Boltspark's Mount - Ride Vehicle Hardcoded
+(35768,46598,0,0,0,1,0,0,0), -- Colosos' Mount - Ride Vehicle Hardcoded
+(34658,46598,0,0,0,1,0,0,0), -- Jaelyne Evensong's Mount - Ride Vehicle Hardcoded
+(35636,46598,0,0,0,1,0,0,0), -- Lana Stouthammer's Evensong's Mount - Ride Vehicle Hardcoded
+(35638,46598,0,0,0,1,0,0,0), --  Mokra the Skullcrusher's Mount - Ride Vehicle Hardcoded
+(35635,46598,0,0,0,1,0,0,0), -- Eressea Dawnsinger's Mount - Ride Vehicle Hardcoded
+(35640,46598,0,0,0,1,0,0,0), -- Runok Wildmane's Mount - Ride Vehicle Hardcoded
+(35641,46598,0,0,0,1,0,0,0), -- Zul'tore's Mount - Ride Vehicle Hardcoded
+(35634,46598,0,0,0,1,0,0,0), -- Deathstalker Visceri's Mount - Ride Vehicle Hardcoded
+(33669,46598,0,0,0,1,0,0,0), -- Demolisher Engineer Blastwrench - Ride Vehicle Hardcoded
+(36476,46598,0,0,0,1,0,0,0), -- Ick - Ride Vehicle Hardcoded
+(36661,46598,0,0,0,1,0,0,0); -- Rimefang - Ride Vehicle Hardcoded
+
+-- Model data
+UPDATE `creature_model_info` SET `bounding_radius`=0.93,`combat_reach`=2,`gender`=2 WHERE `modelid`=28875; -- Flame Leviathan
+UPDATE `creature_model_info` SET `bounding_radius`=1.209,`combat_reach`=7.8,`gender`=0 WHERE `modelid`=30881; -- Professor Putricide
+UPDATE `creature_model_info` SET `bounding_radius`=0,`combat_reach`=1,`gender`=0 WHERE `modelid`=29255; -- Colosos' Mount
+UPDATE `creature_model_info` SET `bounding_radius`=0.525,`combat_reach`=2.25,`gender`=0 WHERE `modelid`=9991; -- Jaelyne Evensong's Mount
+UPDATE `creature_model_info` SET `bounding_radius`=0.35,`combat_reach`=2,`gender`=0 WHERE `modelid`=2787; -- Lana Stouthammer's Mount
+UPDATE `creature_model_info` SET `bounding_radius`=0.35,`combat_reach`=1.5,`gender`=2 WHERE `modelid`=29879; -- Mokra the Skullcrusher's Mount
+UPDATE `creature_model_info` SET `bounding_radius`=1,`combat_reach`=1,`gender`=2 WHERE `modelid`=28607; -- Eressea Dawnsinger's Mount
+UPDATE `creature_model_info` SET `bounding_radius`=0.34,`combat_reach`=1.5,`gender`=2 WHERE `modelid`=29880; -- Runok Wildmane's Mount
+UPDATE `creature_model_info` SET `bounding_radius`=0.35,`combat_reach`=1.5,`gender`=2 WHERE `modelid`=10718; -- Deathstalker Visceri's Mount
diff --git a/sql/updates/world/2011_03_06_03_world_creatures.sql b/sql/updates/world/2011_03_06_03_world_creatures.sql
new file mode 100644
index 00000000000..4b4ac5d53fd
--- /dev/null
+++ b/sql/updates/world/2011_03_06_03_world_creatures.sql
@@ -0,0 +1,24 @@
+-- Spellclick
+DELETE FROM `npc_spellclick_spells` WHERE `npc_entry` IN (30021,31748,32795,32796,34045,33782,33318,33323,33322,33317,33319,33316,33321,33324,33320,33845,33844,33217);
+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
+(30021,46598,0,0,0,1,0,0,0), -- Enormos - Ride Vehicle Hardcoded
+(30021,55785,0,0,0,3,0,0,0), -- Enormos - Mammoth Jack
+(31748,56378,0,0,0,1,0,0,0), -- Hover Disk (1)- Summon Disk
+(32795,56378,0,0,0,1,0,0,0), -- Antipersonnel Cannon (1) - Ride Vehicle
+(32796,60683,0,0,0,1,0,0,0), -- Battleground Demolisher (1) - Ride Vehicle
+(34045,65030,0,0,0,1,0,0,0), -- Salvaged Chopper (1) - Ride Vehicle
+(33782,63151,0,0,0,1,0,0,0), -- Argent Warhorse
+(33318,63151,0,0,0,1,0,0,0), -- Exodar Elekk
+(33323,63151,0,0,0,1,0,0,0), -- Silvermoon Hawkstrider
+(33322,63151,0,0,0,1,0,0,0), -- Thunder Bluff Kodo
+(33317,63151,0,0,0,1,0,0,0), -- Gnomeregan Mechanostrider
+(33319,63151,0,0,0,1,0,0,0), -- Darnassian Nightsaber
+(33316,63151,0,0,0,1,0,0,0), -- Ironforge Ram
+(33321,63151,0,0,0,1,0,0,0), -- Darkspear Raptor
+(33324,63151,0,0,0,1,0,0,0), -- Forsaken Warhorse
+(33320,63151,0,0,0,1,0,0,0), -- Orgrimmar Wolf
+(33845,63151,0,0,0,1,0,0,0), -- Quel''dorei Steed
+(33844,63151,0,0,0,1,0,0,0), -- Sunreaver Hawkstrider
+(33217,63151,0,0,0,1,0,0,0); -- Stormwind Steed
+-- Template update
+UPDATE `creature_template` SET `faction_A`=16,`faction_H`=16,`speed_walk`=0.666668,`speed_run`=2 WHERE `entry`=30021; -- Enormos
diff --git a/sql/updates/world/2011_03_06_04_world_creatures.sql b/sql/updates/world/2011_03_06_04_world_creatures.sql
new file mode 100644
index 00000000000..4144ae712f3
--- /dev/null
+++ b/sql/updates/world/2011_03_06_04_world_creatures.sql
@@ -0,0 +1,53 @@
+-- Spellclick
+UPDATE `npc_spellclick_spells` SET `spell_id`=60682 WHERE `npc_entry`=32795 AND `spell_id`=56378; -- typo
+DELETE FROM `npc_spellclick_spells` WHERE `npc_entry` IN (33778,33687,32189,30330,29625,29433,29555,28614,35644,36558,27692,27756,27755);
+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
+(33778,43671,0,0,0,1,0,0,0), -- Tournament Hippogryph - Ride Vehicle
+(33687,46598,0,0,0,1,0,0,0), -- Chillmaw - Ride Vehicle Hardcoded
+(32189,46598,0,0,0,1,0,0,0), -- Skybreaker Recon Fighter - Ride Vehicle Hardcoded
+(30330,46598,0,0,0,1,0,0,0), -- Jotunheim Proto-Drake - Ride Vehicle Hardcoded
+(29625,46598,0,0,0,1,0,0,0), -- Hyldsmeet Proto-Drake - Ride Vehicle Hardcoded
+(29433,47020,0,0,0,1,0,0,0), -- Goblin Sapper - Ride Vehicle
+(29555,47020,0,0,0,1,0,0,0), -- Goblin Sapper - Ride Vehicle
+(28614,46598,0,0,0,1,0,0,0), -- Scarlet Gryphon - Ride Vehicle Hardcoded
+(35644,67830,0,0,0,1,0,0,0), -- Argent Warhorse - Ride Vehicle (guessed)
+(36558,67830,0,0,0,1,0,0,0), -- Argent Battleworg - Ride Vehicle
+(27692,49427,0,0,0,2,0,0,0), -- Emerald Drake
+(27756,49463,0,0,0,2,0,0,0), -- Ruby Drake
+(27755,49459,0,0,0,2,0,0,0); -- Amber Drake
+
+-- Template updates
+UPDATE `creature_template` SET `speed_walk`=2,`speed_run`=1.5873 WHERE `entry`=33687; -- Chillmaw
+UPDATE `creature_template` SET `speed_walk`=8 WHERE `entry`=32189; -- Skybreaker Recon Fighter
+UPDATE `creature_template` SET `speed_walk`=6 WHERE `entry`=30330; -- Jotunheim Proto-Drake
+UPDATE `creature_template` SET `speed_walk`=6,`speed_run`=3.14286 WHERE `entry`=29625; -- Hyldsmeet Proto-Drake
+UPDATE `creature_template` SET `equipment_id`=57 WHERE `entry`=29555; -- Goblin Sapper
+UPDATE `creature_template` SET `speed_walk`=1,`speed_run`=3.14286 WHERE `entry`=28614; -- Scarlet Gryphon
+UPDATE `creature_template` SET `faction_A`=14,`faction_H`=14,`baseattacktime`=2000,`npcflag`=`npcflag`|16777216,`unit_flags`=`unit_flags`|256,`speed_run`=1.57143 WHERE `entry`=35644; -- Argent Warhorse
+UPDATE `creature_template` SET `baseattacktime`=2000,`npcflag`=`npcflag`|16777216,`speed_run`=1.57143 WHERE `entry`=36558; -- Argent Battleworg
+
+-- Model info
+UPDATE `creature_model_info` SET `bounding_radius`=0.2448,`combat_reach`=1.2,`gender`=1 WHERE `modelid`=28096; -- Goblin Sapper
+
+-- Addon data
+DELETE FROM `creature_template_addon` WHERE `entry` IN (33687,32189,30330,29625,29433,29555,28614,35644,36558,27692,27756,27755);
+INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
+(33687,0,50331648,1,0, NULL), -- Chillmaw
+(32189,0,50397184,1,0, '60464 0 60464 1'), -- Skybreaker Recon Fighter, auras: Cloaked Alliance Peeps
+(30330,0,0,1,0, NULL), -- Jotunheim Proto-Drake
+(29625,0,50331648,1,0, NULL), -- Hyldsmeet Proto-Drake
+(29433,0,0,1,0, NULL), -- Goblin Sapper
+(29555,0,0,1,0, NULL), -- Goblin Sapper
+(28614,0,0,1,0, '48356 0 48356 1'), -- Scarlet Gryphon, auras: See Wintergarde Invisibility
+(35644,0,0,1,0, '67870 0'), -- Argent Warhorse, auras: Trample
+(36558,0,0,257,0, '67865 0'), -- Argent Battleworg, auras: Trample
+(27692,0,50331648,257,0, NULL), -- Emerald Drake
+(27756,0,50331648,257,0, NULL), -- Ruby Drake
+(27755,0,50331648,257,0, NULL); -- Amber Drake
+
+-- Conditions for spell_aura_control_vehicle
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry` IN (49346,49464,49460);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`Comment`) VALUES
+(13,0,49346,0,18,1,27692,0, 'Emeral Drake'),
+(13,0,49464,0,18,1,27756,0, 'Ruby Drake'),
+(13,0,49460,0,18,1,27755,0, 'Amber Drake');
diff --git a/sql/updates/world/2011_03_06_05_world_vehicle_accessory.sql b/sql/updates/world/2011_03_06_05_world_vehicle_accessory.sql
new file mode 100644
index 00000000000..5e896d98412
--- /dev/null
+++ b/sql/updates/world/2011_03_06_05_world_vehicle_accessory.sql
@@ -0,0 +1,12 @@
+RENAME TABLE `vehicle_accessory` TO `vehicle_template_accessory`;
+ 
+CREATE TABLE IF NOT EXISTS `vehicle_accessory` (
+  `guid` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT 0,
+  `accessory_entry` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT 0,
+  `seat_id` TINYINT(1) NOT NULL DEFAULT 0,
+  `minion` TINYINT(1) UNSIGNED NOT NULL DEFAULT 0,
+  `description` TEXT NOT NULL,
+  `summontype` TINYINT(3) UNSIGNED NOT NULL DEFAULT 6 COMMENT 'see enum TempSummonType',
+  `summontimer` INT(10) UNSIGNED NOT NULL DEFAULT 30000 COMMENT 'timer, only relevant for certain summontypes',
+  PRIMARY KEY (`guid`,`seat_id`)
+) ENGINE=MYISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED;
diff --git a/sql/updates/world/2011_03_06_0_world_creatures.sql b/sql/updates/world/2011_03_06_0_world_creatures.sql
deleted file mode 100644
index 2e5c8ba2aa6..00000000000
--- a/sql/updates/world/2011_03_06_0_world_creatures.sql
+++ /dev/null
@@ -1 +0,0 @@
-UPDATE `creature` SET `modelid`=0,`equipment_id`=0 WHERE `map`=631;
diff --git a/sql/updates/world/2011_03_06_1_world_loot_template.sql b/sql/updates/world/2011_03_06_1_world_loot_template.sql
deleted file mode 100644
index 4681bd9ca96..00000000000
--- a/sql/updates/world/2011_03_06_1_world_loot_template.sql
+++ /dev/null
@@ -1,392 +0,0 @@
--- Trashloot for ICC/FoS/PoS/HoR
--- Generic
-SET @ICC_TrashGenericGrey := 35063; -- Set by TDB (need x)
-SET @ICC_TrashGenericWhite := @ICC_TrashGenericGrey+1;
-SET @ICC_TrashGenericScroll := @ICC_TrashGenericGrey+2;
-SET @ICC_TrashGenericGreen := @ICC_TrashGenericGrey+3;
-SET @ICC_TrashGenericBlue := @ICC_TrashGenericGrey+4;
-SET @ICC_TrashGenericPurpleICC := @ICC_TrashGenericGrey+5;
-SET @ICC_TrashCitadelFinal := @ICC_TrashGenericGrey+6;
-SET @ICC_TrashGenericPurpleDUNN := @ICC_TrashGenericGrey+7;
-SET @ICC_TrashDungeonNFinal := @ICC_TrashGenericGrey+8;
-SET @ICC_TrashGenericPurpleDUNH := @ICC_TrashGenericGrey+9;
-SET @ICC_TrashDungeonHFinal := @ICC_TrashGenericGrey+10;
-
-DELETE FROM `reference_loot_template` WHERE `entry` BETWEEN @ICC_TrashGenericGrey AND @ICC_TrashGenericGrey+10; 
-DELETE FROM `reference_loot_template` WHERE `entry` BETWEEN 35063 AND 35076; -- cleanup OLD loot
-INSERT INTO reference_loot_template (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES
--- grey items (45)
-(@ICC_TrashGenericGrey,33430,0,1,1,1,1), -- Abandoned Greatsword
-(@ICC_TrashGenericGrey,33426,0,1,1,1,1), -- Chipped Timber Axe
-(@ICC_TrashGenericGrey,33424,0,1,1,1,1), -- Cracked Iron Staff
-(@ICC_TrashGenericGrey,33428,0,1,1,1,1), -- Dulled SHiv
-(@ICC_TrashGenericGrey,33397,0,1,1,1,1), -- Frigid Mail Armor
-(@ICC_TrashGenericGrey,33398,0,1,1,1,1), -- Frigid Mail Belt
-(@ICC_TrashGenericGrey,33399,0,1,1,1,1), -- Frigid Mail Boots
-(@ICC_TrashGenericGrey,33400,0,1,1,1,1), -- Frigid Mail Bracers
-(@ICC_TrashGenericGrey,33433,0,1,1,1,1), -- Frigid Mail Circlet
-(@ICC_TrashGenericGrey,33401,0,1,1,1,1), -- Frigid Mail Gloves
-(@ICC_TrashGenericGrey,33402,0,1,1,1,1), -- Frigid Mail Pants
-(@ICC_TrashGenericGrey,33403,0,1,1,1,1), -- Frigid Mail Shoulderpads
-(@ICC_TrashGenericGrey,33427,0,1,1,1,1), -- Frost-Encrusted Rifle
-(@ICC_TrashGenericGrey,33365,0,1,1,1,1), -- Frost-Rimed Cloth Belt
-(@ICC_TrashGenericGrey,33366,0,1,1,1,1), -- Frost-Rimed Cloth Boots
-(@ICC_TrashGenericGrey,33367,0,1,1,1,1), -- Frost-Rimed Cloth Bracers
-(@ICC_TrashGenericGrey,33368,0,1,1,1,1), -- Frost-Rimed Cloth Gloves
-(@ICC_TrashGenericGrey,33346,0,1,1,1,1), -- Frost-Rimed Cloth Hat
-(@ICC_TrashGenericGrey,33369,0,1,1,1,1), -- Frost-Rimed Cloth Pants
-(@ICC_TrashGenericGrey,33370,0,1,1,1,1), -- Frost-Rimed Cloth Shoulderpads
-(@ICC_TrashGenericGrey,33371,0,1,1,1,1), -- Frost-Rimed Cloth Vest
-(@ICC_TrashGenericGrey,33412,0,1,1,1,1), -- Frost-Worn Plate Belt
-(@ICC_TrashGenericGrey,33413,0,1,1,1,1), -- Frost-Worn Plate Boots
-(@ICC_TrashGenericGrey,33414,0,1,1,1,1), -- Frost-Worn Plate Bracers
-(@ICC_TrashGenericGrey,33415,0,1,1,1,1), -- Frost-Worn Plate Chestpiece
-(@ICC_TrashGenericGrey,33416,0,1,1,1,1), -- Frost-Worn Plate Gloves
-(@ICC_TrashGenericGrey,33435,0,1,1,1,1), -- Frost-Worn Plate Helmet
-(@ICC_TrashGenericGrey,33417,0,1,1,1,1), -- Frost-Worn Plate Pants
-(@ICC_TrashGenericGrey,33419,0,1,1,1,1), -- Frost-Worn Plate Shoulderpads
-(@ICC_TrashGenericGrey,33379,0,1,1,1,1), -- Frozen Armor
-(@ICC_TrashGenericGrey,33380,0,1,1,1,1), -- Frozen Belt
-(@ICC_TrashGenericGrey,33381,0,1,1,1,1), -- Frozen Boots
-(@ICC_TrashGenericGrey,33382,0,1,1,1,1), -- Frozen Bracers
-(@ICC_TrashGenericGrey,33383,0,1,1,1,1), -- Frozen Gloves
-(@ICC_TrashGenericGrey,33434,0,1,1,1,1), -- Frozen Leather Helmet
-(@ICC_TrashGenericGrey,33384,0,1,1,1,1), -- Frozen Pants
-(@ICC_TrashGenericGrey,33385,0,1,1,1,1), -- Frozen Shoulderpads
-(@ICC_TrashGenericGrey,33429,0,1,1,1,1), -- Ice Cleaver
-(@ICC_TrashGenericGrey,33425,0,1,1,1,1), -- Ice-Pitted Blade
-(@ICC_TrashGenericGrey,33431,0,1,1,1,1), -- Icesmashing Mace
-(@ICC_TrashGenericGrey,33423,0,1,1,1,1), -- Rime-Covered Mace
-(@ICC_TrashGenericGrey,33422,0,1,1,1,1), -- Shattered Bow
-(@ICC_TrashGenericGrey,43852,70,1,1,1,1), -- Thick Fur Clothing Scraps (drops more often)
--- white items
-(@ICC_TrashGenericWhite,33470,0,1,1,2,7), -- Frostweave Cloth
-(@ICC_TrashGenericWhite,33445,0,1,1,1,1), -- Honeymint Tea
-(@ICC_TrashGenericWhite,33454,0,1,1,1,1), -- Salted Venison
-(@ICC_TrashGenericWhite,35947,0,1,1,1,1), -- Sparkling Frostcap
-(@ICC_TrashGenericWhite,33447,0,1,1,1,1), -- Runic Healing Potion
-(@ICC_TrashGenericWhite,33448,0,1,1,1,1), -- Runic Mana Potion
--- Scroll items
-(@ICC_TrashGenericScroll,43463,0,1,1,1,1), -- Scroll of Agility VII
-(@ICC_TrashGenericScroll,37091,0,1,1,1,1), -- Scroll of Intellect VII
-(@ICC_TrashGenericScroll,37093,0,1,1,1,1), -- Scroll of Stamina VII
-(@ICC_TrashGenericScroll,43465,0,1,1,1,1), -- Scroll of Strength VII
-(@ICC_TrashGenericScroll,37097,0,1,1,1,1), -- Scroll of Spirit VII
-(@ICC_TrashGenericScroll,43464,0,1,1,1,1), -- Scroll of Agility VIII
-(@ICC_TrashGenericScroll,37092,0,1,1,1,1), -- Scroll of Intellect VIII
-(@ICC_TrashGenericScroll,37094,0,1,1,1,1), -- Scroll of Stamina VIII
-(@ICC_TrashGenericScroll,43466,0,1,1,1,1), -- Scroll of Strength VIII
-(@ICC_TrashGenericScroll,37098,0,1,1,1,1), -- Scroll of Spirit VIII
--- green items (166)
-(@ICC_TrashGenericGreen,36609,0,1,1,1,1), -- Abandoned Spear
-(@ICC_TrashGenericGreen,36497,0,1,1,1,1), -- Adamant Mallet
-(@ICC_TrashGenericGreen,36511,0,1,1,1,1), -- Artic War Hammer
-(@ICC_TrashGenericGreen,36694,0,1,1,1,1), -- Beatific Mace
-(@ICC_TrashGenericGreen,36527,0,1,1,1,1), -- Blackened Blade
-(@ICC_TrashGenericGreen,36611,0,1,1,1,1), -- Black Scythe
-(@ICC_TrashGenericGreen,36638,0,1,1,1,1), -- Bloody Crossbow
-(@ICC_TrashGenericGreen,36428,0,1,1,1,1), -- Bouquet Ring
-(@ICC_TrashGenericGreen,36639,0,1,1,1,1), -- Brutal Ballista
-(@ICC_TrashGenericGreen,36707,0,1,1,1,1), -- Cascading Water Staff
-(@ICC_TrashGenericGreen,36539,0,1,1,1,1), -- Chilled Warblade
-(@ICC_TrashGenericGreen,36723,0,1,1,1,1), -- Clawed Shuriken
-(@ICC_TrashGenericGreen,36035,0,1,1,1,1), -- Condor Belt
-(@ICC_TrashGenericGreen,36042,0,1,1,1,1), -- Condor Bindings
-(@ICC_TrashGenericGreen,36038,0,1,1,1,1), -- Condor Gloves
-(@ICC_TrashGenericGreen,36039,0,1,1,1,1), -- Condor Headpiece
-(@ICC_TrashGenericGreen,36040,0,1,1,1,1), -- Condor Pants
-(@ICC_TrashGenericGreen,36037,0,1,1,1,1), -- Condor Robe
-(@ICC_TrashGenericGreen,36036,0,1,1,1,1), -- Condor Sandals
-(@ICC_TrashGenericGreen,36041,0,1,1,1,1), -- Condor Shoulderpads
-(@ICC_TrashGenericGreen,36266,0,1,1,1,1), -- Cormorant Bracelets
-(@ICC_TrashGenericGreen,36261,0,1,1,1,1), -- Cormorant Chain Vest
-(@ICC_TrashGenericGreen,36260,0,1,1,1,1), -- Cormorant Footwraps
-(@ICC_TrashGenericGreen,36262,0,1,1,1,1), -- Cormorant Gloves
-(@ICC_TrashGenericGreen,36263,0,1,1,1,1), -- Cormorant Helm
-(@ICC_TrashGenericGreen,36264,0,1,1,1,1), -- Cormorant Leggings
-(@ICC_TrashGenericGreen,36265,0,1,1,1,1), -- Cormorant Mantle
-(@ICC_TrashGenericGreen,36259,0,1,1,1,1), -- Cormorant Waistband
-(@ICC_TrashGenericGreen,36525,0,1,1,1,1), -- Craggy Machete
-(@ICC_TrashGenericGreen,36709,0,1,1,1,1), -- Crystal Woodstaff
-(@ICC_TrashGenericGreen,36050,0,1,1,1,1), -- Crystalsong Bracelets
-(@ICC_TrashGenericGreen,36047,0,1,1,1,1), -- Crystalsong Crown
-(@ICC_TrashGenericGreen,36046,0,1,1,1,1), -- Crystalsong Gloves
-(@ICC_TrashGenericGreen,36048,0,1,1,1,1), -- Crystalsong Leggings
-(@ICC_TrashGenericGreen,36049,0,1,1,1,1), -- Crystalsong Mantle
-(@ICC_TrashGenericGreen,36045,0,1,1,1,1), -- Crystalsong Robe
-(@ICC_TrashGenericGreen,36043,0,1,1,1,1), -- Crystalsong Sash
-(@ICC_TrashGenericGreen,36044,0,1,1,1,1), -- Crystalsong Slippers
-(@ICC_TrashGenericGreen,36554,0,1,1,1,1), -- Cursed Staff
-(@ICC_TrashGenericGreen,43297,0,1,1,1,1), -- Damaged Necklace
-(@ICC_TrashGenericGreen,36553,0,1,1,1,1), -- Desecrated Staff
-(@ICC_TrashGenericGreen,36695,0,1,1,1,1), -- Dogmatic Scepter
-(@ICC_TrashGenericGreen,36721,0,1,1,1,1), -- Dragon's Teeth
-(@ICC_TrashGenericGreen,36413,0,1,1,1,1), -- Dyed Taffeta Cape
-(@ICC_TrashGenericGreen,36427,0,1,1,1,1), -- Engraved Ring
-(@ICC_TrashGenericGreen,36484,0,1,1,1,1), -- Etched Dagger
-(@ICC_TrashGenericGreen,36499,0,1,1,1,1), -- Frigid War-Mace
-(@ICC_TrashGenericGreen,36470,0,1,1,1,1), -- Gilded Scepter
-(@ICC_TrashGenericGreen,36381,0,1,1,1,1), -- Golem Breastplate
-(@ICC_TrashGenericGreen,36382,0,1,1,1,1), -- Golem Gauntlets
-(@ICC_TrashGenericGreen,36379,0,1,1,1,1), -- Golem Girdle
-(@ICC_TrashGenericGreen,36383,0,1,1,1,1), -- Golem Helmet
-(@ICC_TrashGenericGreen,36384,0,1,1,1,1), -- Golem Legplates
-(@ICC_TrashGenericGreen,36385,0,1,1,1,1), -- Golem Pauldrons
-(@ICC_TrashGenericGreen,36380,0,1,1,1,1), -- Golem Sabatons
-(@ICC_TrashGenericGreen,36386,0,1,1,1,1), -- Golem Vambraces
-(@ICC_TrashGenericGreen,36623,0,1,1,1,1), -- Harnessed Longbow
-(@ICC_TrashGenericGreen,36568,0,1,1,1,1), -- Hollowed Bone Knuckles
-(@ICC_TrashGenericGreen,36637,0,1,1,1,1), -- Horrific Crossbow
-(@ICC_TrashGenericGreen,36471,0,1,1,1,1), -- Ice Crystal
-(@ICC_TrashGenericGreen,36582,0,1,1,1,1), -- Ice Pick
-(@ICC_TrashGenericGreen,36597,0,1,1,1,1), -- Ice-Splintering Axe
-(@ICC_TrashGenericGreen,36456,0,1,1,1,1), -- Ice Kite Shield
-(@ICC_TrashGenericGreen,36457,0,1,1,1,1), -- Ivory Shield
-(@ICC_TrashGenericGreen,36373,0,1,1,1,1), -- Kraken Breastplate
-(@ICC_TrashGenericGreen,36377,0,1,1,1,1), -- Kraken Epaulets
-(@ICC_TrashGenericGreen,36374,0,1,1,1,1), -- Kraken Gauntlets
-(@ICC_TrashGenericGreen,36371,0,1,1,1,1), -- Kraken Girdle
-(@ICC_TrashGenericGreen,36372,0,1,1,1,1), -- Kraken Greaves
-(@ICC_TrashGenericGreen,36375,0,1,1,1,1), -- Kraken Helm
-(@ICC_TrashGenericGreen,36376,0,1,1,1,1), -- Kraken Legplates
-(@ICC_TrashGenericGreen,36378,0,1,1,1,1), -- Kraken Vambraces
-(@ICC_TrashGenericGreen,36469,0,1,1,1,1), -- Lidless Orb
-(@ICC_TrashGenericGreen,36513,0,1,1,1,1), -- Lode-Headed Hammer
-(@ICC_TrashGenericGreen,36414,0,1,1,1,1), -- Mammoth Fur Cloack
-(@ICC_TrashGenericGreen,36483,0,1,1,1,1), -- Mandible Edge
-(@ICC_TrashGenericGreen,36625,0,1,1,1,1), -- Massive Recurved Bow
-(@ICC_TrashGenericGreen,36555,0,1,1,1,1), -- Minion Staff
-(@ICC_TrashGenericGreen,36651,0,1,1,1,1), -- Muzzled Musket
-(@ICC_TrashGenericGreen,36680,0,1,1,1,1), -- Mystic Fang
-(@ICC_TrashGenericGreen,36498,0,1,1,1,1), -- Nerubian Mace
-(@ICC_TrashGenericGreen,36512,0,1,1,1,1), -- Onerous Mallet
-(@ICC_TrashGenericGreen,36441,0,1,1,1,1), -- Pearl Woven Choker
-(@ICC_TrashGenericGreen,36540,0,1,1,1,1), -- Petrified Sword
-(@ICC_TrashGenericGreen,36610,0,1,1,1,1), -- Plagued Pike
-(@ICC_TrashGenericGreen,36595,0,1,1,1,1), -- Planate Broadaxe
-(@ICC_TrashGenericGreen,36455,0,1,1,1,1), -- Plated Bulwark
-(@ICC_TrashGenericGreen,36443,0,1,1,1,1), -- Platinum Medallion
-(@ICC_TrashGenericGreen,36666,0,1,1,1,1), -- Polar Wand
-(@ICC_TrashGenericGreen,36653,0,1,1,1,1), -- Precipice Longrifle
-(@ICC_TrashGenericGreen,36147,0,1,1,1,1), -- Pygmy Belt
-(@ICC_TrashGenericGreen,36154,0,1,1,1,1), -- Pygmy Bindings
-(@ICC_TrashGenericGreen,36148,0,1,1,1,1), -- Pygmy Boots
-(@ICC_TrashGenericGreen,36150,0,1,1,1,1), -- Pygmy Gloves
-(@ICC_TrashGenericGreen,36151,0,1,1,1,1), -- Pygmy Helmet
-(@ICC_TrashGenericGreen,36152,0,1,1,1,1), -- Pygmy Pants
-(@ICC_TrashGenericGreen,36153,0,1,1,1,1), -- Pygmy Shoulders
-(@ICC_TrashGenericGreen,36149,0,1,1,1,1), -- Pygmy Tunic
-(@ICC_TrashGenericGreen,36722,0,1,1,1,1), -- Pyramid Throwing Star
-(@ICC_TrashGenericGreen,36389,0,1,1,1,1), -- Revenant Armor
-(@ICC_TrashGenericGreen,36387,0,1,1,1,1), -- Revenant Belt
-(@ICC_TrashGenericGreen,36394,0,1,1,1,1), -- Revenant Bracers
-(@ICC_TrashGenericGreen,36393,0,1,1,1,1), -- Revenant Epaulets
-(@ICC_TrashGenericGreen,36390,0,1,1,1,1), -- Revenant Gauntlets
-(@ICC_TrashGenericGreen,36388,0,1,1,1,1), -- Revenant Greaves
-(@ICC_TrashGenericGreen,36391,0,1,1,1,1), -- Revenant Helmet
-(@ICC_TrashGenericGreen,36392,0,1,1,1,1), -- Revenant Legguards
-(@ICC_TrashGenericGreen,36596,0,1,1,1,1), -- Rupturing Axe
-(@ICC_TrashGenericGreen,36569,0,1,1,1,1), -- Savage Talons
-(@ICC_TrashGenericGreen,36693,0,1,1,1,1), -- Serene Hammer
-(@ICC_TrashGenericGreen,36624,0,1,1,1,1), -- Shrieking Bow
-(@ICC_TrashGenericGreen,36442,0,1,1,1,1), -- Silken Cord Amulet
-(@ICC_TrashGenericGreen,36679,0,1,1,1,1), -- Singing Dagger
-(@ICC_TrashGenericGreen,36485,0,1,1,1,1), -- Sinuous Keris
-(@ICC_TrashGenericGreen,36567,0,1,1,1,1), -- Six-Fingered Claws
-(@ICC_TrashGenericGreen,36583,0,1,1,1,1), -- Skeletal Hacker
-(@ICC_TrashGenericGreen,36526,0,1,1,1,1), -- SLeeted Longsword
-(@ICC_TrashGenericGreen,36708,0,1,1,1,1), -- Snow Blossom Staff
-(@ICC_TrashGenericGreen,36667,0,1,1,1,1), -- Solid Ice Wand
-(@ICC_TrashGenericGreen,36275,0,1,1,1,1), -- Spiderlord Belt
-(@ICC_TrashGenericGreen,36276,0,1,1,1,1), -- Spiderlord Boots
-(@ICC_TrashGenericGreen,36282,0,1,1,1,1), -- Spiderlord Bracers
-(@ICC_TrashGenericGreen,36277,0,1,1,1,1), -- Spiderlord Chestpiece
-(@ICC_TrashGenericGreen,36278,0,1,1,1,1), -- Spiderlord Gauntlets
-(@ICC_TrashGenericGreen,36279,0,1,1,1,1), -- Spiderlord Helm
-(@ICC_TrashGenericGreen,36280,0,1,1,1,1), -- Spiderlord Legguards
-(@ICC_TrashGenericGreen,36281,0,1,1,1,1), -- Spiderlord Spaulders
-(@ICC_TrashGenericGreen,36429,0,1,1,1,1), -- Spur Ring
-(@ICC_TrashGenericGreen,36652,0,1,1,1,1), -- Stocky Shotgun
-(@ICC_TrashGenericGreen,36274,0,1,1,1,1), -- Ulduar Bracers
-(@ICC_TrashGenericGreen,36269,0,1,1,1,1), -- Ulduar Breastplate
-(@ICC_TrashGenericGreen,36270,0,1,1,1,1), -- Ulduar Gauntlets
-(@ICC_TrashGenericGreen,36267,0,1,1,1,1), -- Ulduar Girdle
-(@ICC_TrashGenericGreen,36268,0,1,1,1,1), -- Ulduar Greaves
-(@ICC_TrashGenericGreen,36271,0,1,1,1,1), -- Ulduar Helm
-(@ICC_TrashGenericGreen,36272,0,1,1,1,1), -- Ulduar Legguards
-(@ICC_TrashGenericGreen,36273,0,1,1,1,1), -- Ulduar Shoulderguards
-(@ICC_TrashGenericGreen,36415,0,1,1,1,1), -- Vintage Satin Cloak
-(@ICC_TrashGenericGreen,36058,0,1,1,1,1), -- Vizier Bracelets
-(@ICC_TrashGenericGreen,36054,0,1,1,1,1), -- Vizier Gloves
-(@ICC_TrashGenericGreen,36055,0,1,1,1,1), -- Vizier Hood
-(@ICC_TrashGenericGreen,36056,0,1,1,1,1), -- Vizier Leggings
-(@ICC_TrashGenericGreen,36057,0,1,1,1,1), -- Vizier Mantle
-(@ICC_TrashGenericGreen,36053,0,1,1,1,1), -- Vizier Robe
-(@ICC_TrashGenericGreen,36051,0,1,1,1,1), -- Vizier Sash
-(@ICC_TrashGenericGreen,36052,0,1,1,1,1), -- Vizier SLippers
-(@ICC_TrashGenericGreen,36665,0,1,1,1,1), -- Wasteland Wand
-(@ICC_TrashGenericGreen,36170,0,1,1,1,1), -- Webspinner Bindings
-(@ICC_TrashGenericGreen,36164,0,1,1,1,1), -- Webspinner Boots
-(@ICC_TrashGenericGreen,36163,0,1,1,1,1), -- Webspinner Cord
-(@ICC_TrashGenericGreen,36166,0,1,1,1,1), -- Webspinner Gloves
-(@ICC_TrashGenericGreen,36167,0,1,1,1,1), -- Webspinner Hood
-(@ICC_TrashGenericGreen,36168,0,1,1,1,1), -- Webspinner Leggings
-(@ICC_TrashGenericGreen,36169,0,1,1,1,1), -- Webspinner Shoulderguards
-(@ICC_TrashGenericGreen,36165,0,1,1,1,1), -- Webspinner Vest
-(@ICC_TrashGenericGreen,36162,0,1,1,1,1), -- Wendigo Bands
-(@ICC_TrashGenericGreen,36156,0,1,1,1,1), -- Wendigo Boots
-(@ICC_TrashGenericGreen,36157,0,1,1,1,1), -- Wendigo Chestpiece
-(@ICC_TrashGenericGreen,36155,0,1,1,1,1), -- Wendigo Girdle
-(@ICC_TrashGenericGreen,36158,0,1,1,1,1), -- Wendigo Gloves
-(@ICC_TrashGenericGreen,36159,0,1,1,1,1), -- Wendigo Hood
-(@ICC_TrashGenericGreen,36160,0,1,1,1,1), -- Wendigo Legguards
-(@ICC_TrashGenericGreen,36161,0,1,1,1,1), -- Wendigo Pauldrons
-(@ICC_TrashGenericGreen,36541,0,1,1,1,1), -- Wintry Claymore
-(@ICC_TrashGenericGreen,36681,0,1,1,1,1), -- Wisdom Carver
-(@ICC_TrashGenericGreen,36581,0,1,1,1,1), -- Wolvar Handaxe
--- blue items
-(@ICC_TrashGenericBlue,37792,0,1,1,1,1), -- Agin's Crushing Carapace
-(@ICC_TrashGenericBlue,37770,0,1,1,1,1), -- Bulge-Concealing Breastplate
-(@ICC_TrashGenericBlue,37780,0,1,1,1,1), -- Condor-Bone Chestguard
-(@ICC_TrashGenericBlue,37760,0,1,1,1,1), -- Cracklefire Wristguards
-(@ICC_TrashGenericBlue,37781,0,1,1,1,1), -- Grips of the Warming Heart
-(@ICC_TrashGenericBlue,37824,0,1,1,1,1), -- Gwyneth's Runed Dragonwand
-(@ICC_TrashGenericBlue,37761,0,1,1,1,1), -- Shimmerthread Girdle
-(@ICC_TrashGenericBlue,37793,0,1,1,1,1), -- Skullcage of Eternal Terror
-(@ICC_TrashGenericBlue,37794,0,1,1,1,1), -- Torta's Oversized Choker
-(@ICC_TrashGenericBlue,37822,0,1,1,1,1), -- Twisted Puzzle-Ring
-(@ICC_TrashGenericBlue,37771,0,1,1,1,1), -- Wristguard of Verdant Recovery
--- Designs
-(@ICC_TrashGenericBlue,41788,0,1,1,1,1), -- Design: Beaming Earthsiege Diamond
-(@ICC_TrashGenericBlue,41780,0,1,1,1,1), -- Design: Champion's Monarch Topaz
-(@ICC_TrashGenericBlue,41786,0,1,1,1,1), -- Design: Destructive Skyflare Diamond
-(@ICC_TrashGenericBlue,41777,0,1,1,1,1), -- Design: Etched Monarch Topaz
-(@ICC_TrashGenericBlue,41789,0,1,1,1,1), -- Design: Inscribed Monarch Topaz
-(@ICC_TrashGenericBlue,41781,0,1,1,1,1), -- Design: Misty Forest Emerald
-(@ICC_TrashGenericBlue,41783,0,1,1,1,1), -- Design: Purified Twilight Opal
-(@ICC_TrashGenericBlue,41778,0,1,1,1,1), -- Design: Resolute MOnarch Topaz
-(@ICC_TrashGenericBlue,41782,0,1,1,1,1), -- Design: Shining Forest Emerald
-(@ICC_TrashGenericBlue,41784,0,1,1,1,1), -- Design: Sovereign Twilight Opal
-(@ICC_TrashGenericBlue,41779,0,1,1,1,1), -- Design: Stalwart Monarch Topaz
-(@ICC_TrashGenericBlue,41785,0,1,1,1,1), -- Design: Tenuous Twilight Opal
-(@ICC_TrashGenericBlue,41787,0,1,1,1,1), -- Design: Thundering Skyflare Diamond
--- tailoring
-(@ICC_TrashGenericBlue,43876,0,1,1,1,1), -- A Guide to Northern Cloth Scavenging
--- purple items icc (8)
-(@ICC_TrashGenericPurpleICC,44311,0,1,1,1,1), -- Avool's Sword of Jin
-(@ICC_TrashGenericPurpleICC,37835,0,1,1,1,1), -- Je'Tze's Bell
-(@ICC_TrashGenericPurpleICC,44310,0,1,1,1,1), -- Namlak's Supernumerary Sticker
-(@ICC_TrashGenericPurpleICC,44309,0,1,1,1,1), -- Sash of Jordan
-(@ICC_TrashGenericPurpleICC,44308,0,1,1,1,1), -- Signet of Edward the Odd
-(@ICC_TrashGenericPurpleICC,37254,0,1,1,1,1), -- Super Simian Sphere
-(@ICC_TrashGenericPurpleICC,44312,0,1,1,1,1), -- Wapach's Spaulders of Solidarity
-(@ICC_TrashGenericPurpleICC,44313,0,1,1,1,1), -- Zom's Crackling Bulwark
-(@ICC_TrashGenericPurpleICC,50444,0,1,1,1,1), -- Rowan's Rifle of Silver Bullets
-(@ICC_TrashGenericPurpleICC,50451,0,1,1,1,1), -- Belt of the Lonely Noble
-(@ICC_TrashGenericPurpleICC,50775,0,1,1,1,1), -- Leggings of Dubious Charms
-(@ICC_TrashGenericPurpleICC,50449,0,1,1,1,1), -- Stiffened Corpse Shoulderpads
-(@ICC_TrashGenericPurpleICC,50453,0,1,1,1,1), -- Ring of Rotting Sinew
-(@ICC_TrashGenericPurpleICC,50447,0,1,1,1,1), -- Harbinger's Bone Band
-(@ICC_TrashGenericPurpleICC,50452,0,1,1,1,1), -- Wodin's Lucky Necklace
--- purple items dungeon_N (8)
-(@ICC_TrashGenericPurpleDUNN,44311,0,1,1,1,1), -- Avool's Sword of Jin
-(@ICC_TrashGenericPurpleDUNN,37835,0,1,1,1,1), -- Je'Tze's Bell
-(@ICC_TrashGenericPurpleDUNN,44310,0,1,1,1,1), -- Namlak's Supernumerary Sticker
-(@ICC_TrashGenericPurpleDUNN,44309,0,1,1,1,1), -- Sash of Jordan
-(@ICC_TrashGenericPurpleDUNN,44308,0,1,1,1,1), -- Signet of Edward the Odd
-(@ICC_TrashGenericPurpleDUNN,37254,0,1,1,1,1), -- Super Simian Sphere
-(@ICC_TrashGenericPurpleDUNN,44312,0,1,1,1,1), -- Wapach's Spaulders of Solidarity
-(@ICC_TrashGenericPurpleDUNN,44313,0,1,1,1,1), -- Zom's Crackling Bulwark
-(@ICC_TrashGenericPurpleDUNN,49852,0,1,1,1,1), -- Coffin Nail
-(@ICC_TrashGenericPurpleDUNN,49855,0,1,1,1,1), -- Plated Grips of Korth'azz
-(@ICC_TrashGenericPurpleDUNN,49853,0,1,1,1,1), -- Titanium Links of Lore
-(@ICC_TrashGenericPurpleDUNN,49854,0,1,1,1,1), -- Mantle of Tattered Feathers
--- purple items dungeon_H (8)
-(@ICC_TrashGenericPurpleDUNH,44311,0,1,1,1,1), -- Avool's Sword of Jin
-(@ICC_TrashGenericPurpleDUNH,37835,0,1,1,1,1), -- Je'Tze's Bell
-(@ICC_TrashGenericPurpleDUNH,44310,0,1,1,1,1), -- Namlak's Supernumerary Sticker
-(@ICC_TrashGenericPurpleDUNH,44309,0,1,1,1,1), -- Sash of Jordan
-(@ICC_TrashGenericPurpleDUNH,44308,0,1,1,1,1), -- Signet of Edward the Odd
-(@ICC_TrashGenericPurpleDUNH,37254,0,1,1,1,1), -- Super Simian Sphere
-(@ICC_TrashGenericPurpleDUNH,44312,0,1,1,1,1), -- Wapach's Spaulders of Solidarity
-(@ICC_TrashGenericPurpleDUNH,44313,0,1,1,1,1), -- Zom's Crackling Bulwark
-(@ICC_TrashGenericPurpleDUNH,50319,0,1,1,1,1), -- Unsharpened Ice Razor
-(@ICC_TrashGenericPurpleDUNH,50315,0,1,1,1,1), -- Seven-Fingered Claws
-(@ICC_TrashGenericPurpleDUNH,50318,0,1,1,1,1), -- Ghostly Wristwraps
--- final output icc
-(@ICC_TrashCitadelFinal,1,40,1,0,-@ICC_TrashGenericGrey,1), -- 1 grey loot (40%)
-(@ICC_TrashCitadelFinal,2,40,1,0,-@ICC_TrashGenericGrey,1), -- 1 grey loot (40%)
-(@ICC_TrashCitadelFinal,3,20,1,0,-@ICC_TrashGenericWhite,1), -- 1 white loot (20%)
-(@ICC_TrashCitadelFinal,4,7,1,0,-@ICC_TrashGenericScroll,1), -- 1 scroll loot (7%)
-(@ICC_TrashCitadelFinal,5,10,1,0,-@ICC_TrashGenericGreen,1), -- 1 green loot (10%)
-(@ICC_TrashCitadelFinal,6,3,1,0,-@ICC_TrashGenericBlue,1), -- 1 blue loot (3%)
-(@ICC_TrashCitadelFinal,7,1,1,0,-@ICC_TrashGenericPurpleICC,1), -- 1 purple loot (1%)
--- final output dungeon_n
-(@ICC_TrashDungeonNFinal,1,40,1,0,-@ICC_TrashGenericGrey,1), -- 1 grey loot (40%)
-(@ICC_TrashDungeonNFinal,2,40,1,0,-@ICC_TrashGenericGrey,1), -- 1 grey loot (40%)
-(@ICC_TrashDungeonNFinal,3,20,1,0,-@ICC_TrashGenericWhite,1), -- 1 white loot (20%)
-(@ICC_TrashDungeonNFinal,4,7,1,0,-@ICC_TrashGenericScroll,1), -- 1 scroll loot (7%)
-(@ICC_TrashDungeonNFinal,5,10,1,0,-@ICC_TrashGenericGreen,1), -- 1 green loot (10%)
-(@ICC_TrashDungeonNFinal,6,3,1,0,-@ICC_TrashGenericBlue,1), -- 1 blue loot (3%)
-(@ICC_TrashDungeonNFinal,7,1,1,0,-@ICC_TrashGenericPurpleDUNN,1), -- 1 purple loot (1%)
--- final output dungeon_h
-(@ICC_TrashDungeonHFinal,1,40,1,0,-@ICC_TrashGenericGrey,1), -- 1 grey loot (40%)
-(@ICC_TrashDungeonHFinal,2,40,1,0,-@ICC_TrashGenericGrey,1), -- 1 grey loot (40%)
-(@ICC_TrashDungeonHFinal,3,20,1,0,-@ICC_TrashGenericWhite,1), -- 1 white loot (20%)
-(@ICC_TrashDungeonHFinal,4,7,1,0,-@ICC_TrashGenericScroll,1), -- 1 scroll loot (7%)
-(@ICC_TrashDungeonHFinal,5,10,1,0,-@ICC_TrashGenericGreen,1), -- 1 green loot (10%)
-(@ICC_TrashDungeonHFinal,6,3,1,0,-@ICC_TrashGenericBlue,1), -- 1 blue loot (3%)
-(@ICC_TrashDungeonHFinal,7,1,1,0,-@ICC_TrashGenericPurpleDUNH,1); -- 1 purple loot (1%)
-
--- --------------------------------
--- -- Apply Trash Loot Dungeon_N --
--- --------------------------------
-SET @LootDUNGEON_N := 100000; -- needs official entry designated
-UPDATE `creature_template` SET `lootid`=@LootDUNGEON_N WHERE `entry` IN (36522,36620,36516,36564,36499,36478,36666); -- FoS
-UPDATE `creature_template` SET `lootid`=@LootDUNGEON_N WHERE `entry` IN (36896,36842,36830,36879,37711,36788,37712,37713); -- PoS
-UPDATE `creature_template` SET `lootid`=@LootDUNGEON_N WHERE `entry` IN (38176,38177,38173,38172,38175,36723); -- HoR
-DELETE FROM `creature_loot_template` WHERE `entry` IN (36522,36620,36516,36564,36499,36478,36666,36896,36842,36830,36879,37711,36788,37712,37713,38176,38177,38173,38172,38175,36723,@LootDUNGEON_N);
-INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES
-(@LootDUNGEON_N,1,100,1,0,-@ICC_TrashDungeonNFinal,2); -- 2 selection from reference
-
--- --------------------------------
--- -- Apply Trash Loot Dungeon_H --
--- -------------------------------- 
-SET @LootDUNGEON_H := 100001; -- needs official entry designated
-UPDATE `creature_template` SET `lootid`=@LootDUNGEON_H WHERE `entry` IN (37569,37568,37567,37565,38193,37566,37563); -- FoS
-UPDATE `creature_template` SET `lootid`=@LootDUNGEON_H WHERE `entry` IN (37609,37638,37637,37635,37636,38249,38025,38026); -- PoS
-UPDATE `creature_template` SET `lootid`=@LootDUNGEON_H WHERE `entry` IN (37720,38524,38525,38563,38544,38564); -- HoR
-DELETE FROM `creature_loot_template` WHERE `entry` IN (37569,37568,37567,37565,38193,37566,37563,37609,37638,37637,37635,37636,38249,38025,38026,37720,38524,38525,38563,38544,38564,@LootDUNGEON_H);
-INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES
-(@LootDUNGEON_H,1,100,1,0,-@ICC_TrashDungeonHFinal,2); -- 2 selection from reference
-
--- --------------------------
--- -- Apply Trash Loot ICC --
--- --------------------------
-SET @LootRAID := 100002; -- needs official entry designated
-UPDATE `creature_template` SET `lootid`=@LootRAID WHERE `entry` IN(37012,37022,37571,37664,37595,37662,37665,37663,37666,37007,36811,36807,36829,36805,36808,36880,37546,37531,37229,37228,36725,37501,37502,37023,10404,38494,38490,36724,37126,37544,37545,37098,37038);
-DELETE FROM `creature_loot_template` WHERE `entry` IN(37012,37022,37571,37664,37595,37662,37665,37663,37666,37007,36811,36807,36829,36805,36808,36880,37546,37531,37229,37228,36725,37501,37502,37023,10404,38494,38490,36724,37126,37544,37545,37098,37038,@LootRAID);
-INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES
-(@LootRAID,1,100,1,0,-@ICC_TrashCitadelFinal,2); -- 2 selection from reference
-
--- --------------------
--- -- Special Cases: --
--- --------------------
--- Specialids
-CALL `sp_set_npc_lootid_bylist` ('37217,37025,37230,37532,36891',NULL);
--- Loot
-DELETE FROM `creature_loot_template` WHERE `entry` IN (37217,37025,37230,37532,36891);
-INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES
--- Precious
-(37217,1,100,1,0,-@ICC_TrashCitadelFinal,2), -- 2 selection from reference
-(37217,52019,30,1,0,1,1), -- Precious Ribbon
--- Stinky
-(37025,1,100,1,0,-@ICC_TrashCitadelFinal,2), -- 2 selection from reference
--- Dragons (Spire Frostwyrm)
-(37230,1,100,1,0,-@ICC_TrashCitadelFinal,2), -- 2 selection from reference
-(37230,33631,65,1,1,2,3), -- Frosted Claw
-(37230,33632,35,1,1,2,3), -- Icicle Fang
-(37532,33631,65,1,1,2,3), -- Frosted Claw
-(37532,33632,35,1,1,2,3), -- Icicle Fang
-(36891,33631,65,1,1,2,3), -- Frosted Claw
-(36891,33632,35,1,1,2,3); -- Icicle Fang
diff --git a/sql/updates/world/2011_03_06_2_world_creatures.sql b/sql/updates/world/2011_03_06_2_world_creatures.sql
deleted file mode 100644
index 5058a3d0921..00000000000
--- a/sql/updates/world/2011_03_06_2_world_creatures.sql
+++ /dev/null
@@ -1,64 +0,0 @@
--- Template updates
-UPDATE `creature_template` SET `speed_walk`=1,`speed_run`=2 WHERE `entry`=28782; -- Acherus Deathcharger
-UPDATE `creature_template` SET `speed_walk`=1.2,`speed_run`=0.71429 WHERE `entry`=33113; -- Flame Leviathan
-UPDATE `creature_template` SET `baseattacktime`=1500,`unit_flags`=`unit_flags`|33554688 WHERE `entry`=36678; -- Professor Putricide
-UPDATE `creature_template` SET `faction_A`=14,`faction_H`=14,`baseattacktime`=2000,`unit_flags`=`unit_flags`|33587456,`speed_run`=1.38571 WHERE `entry`=35637; -- Marshal Jacob Alerius' Mount
-UPDATE `creature_template` SET `faction_A`=14,`faction_H`=14,`baseattacktime`=2000,`unit_flags`=`unit_flags`|33587456,`speed_run`=1.38571 WHERE `entry`=35633; -- Ambrose Boltspark's Mount
-UPDATE `creature_template` SET `faction_A`=14,`faction_H`=14,`baseattacktime`=2000,`unit_flags`=`unit_flags`|33587456,`speed_run`=1.38571 WHERE `entry`=35768; -- Colosos' Mount
-UPDATE `creature_template` SET `faction_A`=14,`faction_H`=14,`baseattacktime`=2000,`unit_flags`=`unit_flags`|33587456,`speed_run`=1.38571 WHERE `entry`=34658; -- Jaelyne Evensong's Mount
-UPDATE `creature_template` SET `faction_A`=14,`faction_H`=14,`baseattacktime`=2000,`unit_flags`=`unit_flags`|33587456,`speed_run`=1.38571 WHERE `entry`=35636; -- Lana Stouthammer's Mount
-UPDATE `creature_template` SET `faction_A`=14,`faction_H`=14,`baseattacktime`=2000,`unit_flags`=`unit_flags`|33587456,`speed_run`=1.38571 WHERE `entry`=35638; -- Mokra the Skullcrusher's Mount
-UPDATE `creature_template` SET `faction_A`=14,`faction_H`=14,`baseattacktime`=2000,`unit_flags`=`unit_flags`|33587456,`speed_run`=1.38571,`VehicleId`=480 WHERE `entry`=35635; -- Eressea Dawnsinger's Mount
-UPDATE `creature_template` SET `faction_A`=14,`faction_H`=14,`baseattacktime`=2000,`unit_flags`=`unit_flags`|33587456,`speed_run`=1.38571 WHERE `entry`=35640; -- Runok Wildmane's Mount
-UPDATE `creature_template` SET `faction_A`=126,`faction_H`=126,`baseattacktime`=2000,`unit_flags`=`unit_flags`|33587456,`speed_run`=1.38571,`VehicleId`=485 WHERE `entry`=35641; -- Zul'tore's Mount
-UPDATE `creature_template` SET `faction_A`=14,`faction_H`=14,`baseattacktime`=2000,`unit_flags`=`unit_flags`|33587456,`speed_run`=1.28968 WHERE `entry`=35634; -- Deathstalker Visceri's Mount
-
--- Addon data
-UPDATE `creature_template_addon` SET `bytes1`=0,`bytes2`=1,`mount`=0,`emote`=69,`auras`=NULL WHERE `entry`=36678; -- Professor Putricide
-DELETE FROM `creature_template_addon` WHERE `entry` IN (28782,33113,35637,35633,35768,34658,35636,35638,35635,35640,35641,35634,36661);
-INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
-(28782,0,0,1,0, NULL), -- Acherus Deathcharger
-(33113,0,0,1,0, NULL), -- Flame Leviathan
-(35637,0,0,1,0, '67870 0'), -- Marshal Jacob Alerius' Mount, Auras: Trample
-(35633,0,0,1,0, '67870 0'), -- Ambrose Boltspark's Mount
-(35768,0,0,1,0, '67870 0'), -- Colosos' Mount
-(34658,0,0,1,0, '67870 0'), -- Jaelyne Evensong's Mount
-(35636,0,0,1,0, '67870 0'), -- Lana Stouthammer's Mount
-(35638,0,0,1,0, '67870 0'), -- Mokra the Skullcrusher's Mount
-(35635,0,0,1,0, '67870 0'), -- Eressea Dawnsinger's Mount
-(35640,0,0,1,0, '67870 0'), -- Runok Wildmane's Mount
-(35641,0,0,1,0, '67870 0'), -- Zul'tore's Mount
-(35634,0,0,1,0, '67870 0'), -- Deathstalker Visceri's Mount
-(36661,0,0,1,0, NULL); -- Rimefang
-
--- Spellclick
-DELETE FROM `npc_spellclick_spells` WHERE `npc_entry` IN (24418,33113,36678,33214,35637,35633,35768,34658,35636,35638,35635,35640,35641,35634,33669,36476,36661) AND `spell_id`=46598;
-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
-(24418,46598,0,0,0,1,0,0,0),  -- Acherus Deathcharger - Ride Vehicle Hardcoded
-(33113,46598,0,0,0,1,0,0,0),  -- Flame Leviathan - Ride Vehicle Hardcoded
-(36678,46598,0,0,0,1,0,0,0), -- Professor Putricide - Ride Vehicle Hardcoded
-(33214,46598,0,0,0,1,0,0,0), -- Mechanolift 304-A - Ride Vehicle Hardcoded
-(35637,46598,0,0,0,1,0,0,0), -- Marshal Jacob Alerius' Mount - Ride Vehicle Hardcoded
-(35633,46598,0,0,0,1,0,0,0), -- Ambrose Boltspark's Mount - Ride Vehicle Hardcoded
-(35768,46598,0,0,0,1,0,0,0), -- Colosos' Mount - Ride Vehicle Hardcoded
-(34658,46598,0,0,0,1,0,0,0), -- Jaelyne Evensong's Mount - Ride Vehicle Hardcoded
-(35636,46598,0,0,0,1,0,0,0), -- Lana Stouthammer's Evensong's Mount - Ride Vehicle Hardcoded
-(35638,46598,0,0,0,1,0,0,0), --  Mokra the Skullcrusher's Mount - Ride Vehicle Hardcoded
-(35635,46598,0,0,0,1,0,0,0), -- Eressea Dawnsinger's Mount - Ride Vehicle Hardcoded
-(35640,46598,0,0,0,1,0,0,0), -- Runok Wildmane's Mount - Ride Vehicle Hardcoded
-(35641,46598,0,0,0,1,0,0,0), -- Zul'tore's Mount - Ride Vehicle Hardcoded
-(35634,46598,0,0,0,1,0,0,0), -- Deathstalker Visceri's Mount - Ride Vehicle Hardcoded
-(33669,46598,0,0,0,1,0,0,0), -- Demolisher Engineer Blastwrench - Ride Vehicle Hardcoded
-(36476,46598,0,0,0,1,0,0,0), -- Ick - Ride Vehicle Hardcoded
-(36661,46598,0,0,0,1,0,0,0); -- Rimefang - Ride Vehicle Hardcoded
-
--- Model data
-UPDATE `creature_model_info` SET `bounding_radius`=0.93,`combat_reach`=2,`gender`=2 WHERE `modelid`=28875; -- Flame Leviathan
-UPDATE `creature_model_info` SET `bounding_radius`=1.209,`combat_reach`=7.8,`gender`=0 WHERE `modelid`=30881; -- Professor Putricide
-UPDATE `creature_model_info` SET `bounding_radius`=0,`combat_reach`=1,`gender`=0 WHERE `modelid`=29255; -- Colosos' Mount
-UPDATE `creature_model_info` SET `bounding_radius`=0.525,`combat_reach`=2.25,`gender`=0 WHERE `modelid`=9991; -- Jaelyne Evensong's Mount
-UPDATE `creature_model_info` SET `bounding_radius`=0.35,`combat_reach`=2,`gender`=0 WHERE `modelid`=2787; -- Lana Stouthammer's Mount
-UPDATE `creature_model_info` SET `bounding_radius`=0.35,`combat_reach`=1.5,`gender`=2 WHERE `modelid`=29879; -- Mokra the Skullcrusher's Mount
-UPDATE `creature_model_info` SET `bounding_radius`=1,`combat_reach`=1,`gender`=2 WHERE `modelid`=28607; -- Eressea Dawnsinger's Mount
-UPDATE `creature_model_info` SET `bounding_radius`=0.34,`combat_reach`=1.5,`gender`=2 WHERE `modelid`=29880; -- Runok Wildmane's Mount
-UPDATE `creature_model_info` SET `bounding_radius`=0.35,`combat_reach`=1.5,`gender`=2 WHERE `modelid`=10718; -- Deathstalker Visceri's Mount
diff --git a/sql/updates/world/2011_03_06_3_world_creatures.sql b/sql/updates/world/2011_03_06_3_world_creatures.sql
deleted file mode 100644
index 4b4ac5d53fd..00000000000
--- a/sql/updates/world/2011_03_06_3_world_creatures.sql
+++ /dev/null
@@ -1,24 +0,0 @@
--- Spellclick
-DELETE FROM `npc_spellclick_spells` WHERE `npc_entry` IN (30021,31748,32795,32796,34045,33782,33318,33323,33322,33317,33319,33316,33321,33324,33320,33845,33844,33217);
-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
-(30021,46598,0,0,0,1,0,0,0), -- Enormos - Ride Vehicle Hardcoded
-(30021,55785,0,0,0,3,0,0,0), -- Enormos - Mammoth Jack
-(31748,56378,0,0,0,1,0,0,0), -- Hover Disk (1)- Summon Disk
-(32795,56378,0,0,0,1,0,0,0), -- Antipersonnel Cannon (1) - Ride Vehicle
-(32796,60683,0,0,0,1,0,0,0), -- Battleground Demolisher (1) - Ride Vehicle
-(34045,65030,0,0,0,1,0,0,0), -- Salvaged Chopper (1) - Ride Vehicle
-(33782,63151,0,0,0,1,0,0,0), -- Argent Warhorse
-(33318,63151,0,0,0,1,0,0,0), -- Exodar Elekk
-(33323,63151,0,0,0,1,0,0,0), -- Silvermoon Hawkstrider
-(33322,63151,0,0,0,1,0,0,0), -- Thunder Bluff Kodo
-(33317,63151,0,0,0,1,0,0,0), -- Gnomeregan Mechanostrider
-(33319,63151,0,0,0,1,0,0,0), -- Darnassian Nightsaber
-(33316,63151,0,0,0,1,0,0,0), -- Ironforge Ram
-(33321,63151,0,0,0,1,0,0,0), -- Darkspear Raptor
-(33324,63151,0,0,0,1,0,0,0), -- Forsaken Warhorse
-(33320,63151,0,0,0,1,0,0,0), -- Orgrimmar Wolf
-(33845,63151,0,0,0,1,0,0,0), -- Quel''dorei Steed
-(33844,63151,0,0,0,1,0,0,0), -- Sunreaver Hawkstrider
-(33217,63151,0,0,0,1,0,0,0); -- Stormwind Steed
--- Template update
-UPDATE `creature_template` SET `faction_A`=16,`faction_H`=16,`speed_walk`=0.666668,`speed_run`=2 WHERE `entry`=30021; -- Enormos
diff --git a/sql/updates/world/2011_03_06_4_world_creatures.sql b/sql/updates/world/2011_03_06_4_world_creatures.sql
deleted file mode 100644
index 4144ae712f3..00000000000
--- a/sql/updates/world/2011_03_06_4_world_creatures.sql
+++ /dev/null
@@ -1,53 +0,0 @@
--- Spellclick
-UPDATE `npc_spellclick_spells` SET `spell_id`=60682 WHERE `npc_entry`=32795 AND `spell_id`=56378; -- typo
-DELETE FROM `npc_spellclick_spells` WHERE `npc_entry` IN (33778,33687,32189,30330,29625,29433,29555,28614,35644,36558,27692,27756,27755);
-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
-(33778,43671,0,0,0,1,0,0,0), -- Tournament Hippogryph - Ride Vehicle
-(33687,46598,0,0,0,1,0,0,0), -- Chillmaw - Ride Vehicle Hardcoded
-(32189,46598,0,0,0,1,0,0,0), -- Skybreaker Recon Fighter - Ride Vehicle Hardcoded
-(30330,46598,0,0,0,1,0,0,0), -- Jotunheim Proto-Drake - Ride Vehicle Hardcoded
-(29625,46598,0,0,0,1,0,0,0), -- Hyldsmeet Proto-Drake - Ride Vehicle Hardcoded
-(29433,47020,0,0,0,1,0,0,0), -- Goblin Sapper - Ride Vehicle
-(29555,47020,0,0,0,1,0,0,0), -- Goblin Sapper - Ride Vehicle
-(28614,46598,0,0,0,1,0,0,0), -- Scarlet Gryphon - Ride Vehicle Hardcoded
-(35644,67830,0,0,0,1,0,0,0), -- Argent Warhorse - Ride Vehicle (guessed)
-(36558,67830,0,0,0,1,0,0,0), -- Argent Battleworg - Ride Vehicle
-(27692,49427,0,0,0,2,0,0,0), -- Emerald Drake
-(27756,49463,0,0,0,2,0,0,0), -- Ruby Drake
-(27755,49459,0,0,0,2,0,0,0); -- Amber Drake
-
--- Template updates
-UPDATE `creature_template` SET `speed_walk`=2,`speed_run`=1.5873 WHERE `entry`=33687; -- Chillmaw
-UPDATE `creature_template` SET `speed_walk`=8 WHERE `entry`=32189; -- Skybreaker Recon Fighter
-UPDATE `creature_template` SET `speed_walk`=6 WHERE `entry`=30330; -- Jotunheim Proto-Drake
-UPDATE `creature_template` SET `speed_walk`=6,`speed_run`=3.14286 WHERE `entry`=29625; -- Hyldsmeet Proto-Drake
-UPDATE `creature_template` SET `equipment_id`=57 WHERE `entry`=29555; -- Goblin Sapper
-UPDATE `creature_template` SET `speed_walk`=1,`speed_run`=3.14286 WHERE `entry`=28614; -- Scarlet Gryphon
-UPDATE `creature_template` SET `faction_A`=14,`faction_H`=14,`baseattacktime`=2000,`npcflag`=`npcflag`|16777216,`unit_flags`=`unit_flags`|256,`speed_run`=1.57143 WHERE `entry`=35644; -- Argent Warhorse
-UPDATE `creature_template` SET `baseattacktime`=2000,`npcflag`=`npcflag`|16777216,`speed_run`=1.57143 WHERE `entry`=36558; -- Argent Battleworg
-
--- Model info
-UPDATE `creature_model_info` SET `bounding_radius`=0.2448,`combat_reach`=1.2,`gender`=1 WHERE `modelid`=28096; -- Goblin Sapper
-
--- Addon data
-DELETE FROM `creature_template_addon` WHERE `entry` IN (33687,32189,30330,29625,29433,29555,28614,35644,36558,27692,27756,27755);
-INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
-(33687,0,50331648,1,0, NULL), -- Chillmaw
-(32189,0,50397184,1,0, '60464 0 60464 1'), -- Skybreaker Recon Fighter, auras: Cloaked Alliance Peeps
-(30330,0,0,1,0, NULL), -- Jotunheim Proto-Drake
-(29625,0,50331648,1,0, NULL), -- Hyldsmeet Proto-Drake
-(29433,0,0,1,0, NULL), -- Goblin Sapper
-(29555,0,0,1,0, NULL), -- Goblin Sapper
-(28614,0,0,1,0, '48356 0 48356 1'), -- Scarlet Gryphon, auras: See Wintergarde Invisibility
-(35644,0,0,1,0, '67870 0'), -- Argent Warhorse, auras: Trample
-(36558,0,0,257,0, '67865 0'), -- Argent Battleworg, auras: Trample
-(27692,0,50331648,257,0, NULL), -- Emerald Drake
-(27756,0,50331648,257,0, NULL), -- Ruby Drake
-(27755,0,50331648,257,0, NULL); -- Amber Drake
-
--- Conditions for spell_aura_control_vehicle
-DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry` IN (49346,49464,49460);
-INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`Comment`) VALUES
-(13,0,49346,0,18,1,27692,0, 'Emeral Drake'),
-(13,0,49464,0,18,1,27756,0, 'Ruby Drake'),
-(13,0,49460,0,18,1,27755,0, 'Amber Drake');
diff --git a/sql/updates/world/2011_03_06_5_world_vehicle_accessory.sql b/sql/updates/world/2011_03_06_5_world_vehicle_accessory.sql
deleted file mode 100644
index 5e896d98412..00000000000
--- a/sql/updates/world/2011_03_06_5_world_vehicle_accessory.sql
+++ /dev/null
@@ -1,12 +0,0 @@
-RENAME TABLE `vehicle_accessory` TO `vehicle_template_accessory`;
- 
-CREATE TABLE IF NOT EXISTS `vehicle_accessory` (
-  `guid` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT 0,
-  `accessory_entry` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT 0,
-  `seat_id` TINYINT(1) NOT NULL DEFAULT 0,
-  `minion` TINYINT(1) UNSIGNED NOT NULL DEFAULT 0,
-  `description` TEXT NOT NULL,
-  `summontype` TINYINT(3) UNSIGNED NOT NULL DEFAULT 6 COMMENT 'see enum TempSummonType',
-  `summontimer` INT(10) UNSIGNED NOT NULL DEFAULT 30000 COMMENT 'timer, only relevant for certain summontypes',
-  PRIMARY KEY (`guid`,`seat_id`)
-) ENGINE=MYISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED;
diff --git a/sql/updates/world/2011_03_07_00_world_misc.sql b/sql/updates/world/2011_03_07_00_world_misc.sql
new file mode 100644
index 00000000000..6e7b679a277
--- /dev/null
+++ b/sql/updates/world/2011_03_07_00_world_misc.sql
@@ -0,0 +1,4 @@
+UPDATE `creature_template_addon` SET `auras`=NULL WHERE `entry` IN (36558,35644); -- Argent mounts inside ToC5 shouldn't have any aura (for now)
+DELETE FROM `npc_spellclick_spells` WHERE `npc_entry`=36477; -- Krick isn't a vehicle
+DELETE FROM `achievement_reward` WHERE `entry` IN (4784,4785); -- Revert Emblematic achiev rewards
+UPDATE `creature_template` SET `faction_A`=35,`faction_H`=35 WHERE `entry`=35644; -- Argent Warhorse (faction depends on the players faction that starts ToC5 fight)
diff --git a/sql/updates/world/2011_03_07_01_world_spell_proc_event.sql b/sql/updates/world/2011_03_07_01_world_spell_proc_event.sql
new file mode 100644
index 00000000000..7b49e63d4e8
--- /dev/null
+++ b/sql/updates/world/2011_03_07_01_world_spell_proc_event.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_proc_event` WHERE `entry`=55681;
+INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES
+(55681,0x00,6,0x00008000,0x00000000,0x00000000,0x00000000,0x00000000,0,0,0); -- Glyph of Shadow Word: Pain
diff --git a/sql/updates/world/2011_03_07_02_world_achievement.sql b/sql/updates/world/2011_03_07_02_world_achievement.sql
new file mode 100644
index 00000000000..3c3f1eb0f2b
--- /dev/null
+++ b/sql/updates/world/2011_03_07_02_world_achievement.sql
@@ -0,0 +1,4 @@
+DELETE FROM `disables` WHERE `entry`=7622 AND `sourceType`=4;
+DELETE FROM `achievement_criteria_data` WHERE `criteria_id`=7622;
+INSERT INTO `achievement_criteria_data` (`criteria_id`,`type`,`value1`,`value2`,`ScriptName`) VALUES
+(7622,0,0,0, '');
diff --git a/sql/updates/world/2011_03_07_03_world_creature_template.sql b/sql/updates/world/2011_03_07_03_world_creature_template.sql
new file mode 100644
index 00000000000..ecdb7fbb614
--- /dev/null
+++ b/sql/updates/world/2011_03_07_03_world_creature_template.sql
@@ -0,0 +1,4 @@
+UPDATE `creature_template_addon` SET `auras`=NULL WHERE `entry` IN (35637,35633,35768,34658,35636,35638,35635,35640,35641,35634); -- Vehicles inside ToC
+UPDATE `creature_template` SET `ScriptName`='' WHERE `entry` IN (
+33870,33790,33791,33792,33793,33794,33795,33796,33798,33799,33800,33842,33843, -- AT stabled npcs
+33782,33318,33323,33322,33317,33319,33316,33321,33324,33320,33845,33844,33217); -- AT vehicles (mounts)
diff --git a/sql/updates/world/2011_03_07_04_world_command.sql b/sql/updates/world/2011_03_07_04_world_command.sql
new file mode 100644
index 00000000000..4e4ed529107
--- /dev/null
+++ b/sql/updates/world/2011_03_07_04_world_command.sql
@@ -0,0 +1,4 @@
+DELETE FROM `command` WHERE `name` IN('reload vehicle_accessory','reload vehicle_template_accessory');
+INSERT INTO `command` (`name`,`security`,`help`) VALUES
+('reload vehicle_accessory', 3, 'Syntax: .reload vehicle_accessory\n\nReloads GUID-based vehicle accessory definitions from the database.'),
+('reload vehicle_template_accessory', 3, 'Syntax: .reload vehicle_template_accessory\n\nReloads entry-based vehicle accessory definitions from the database.');
diff --git a/sql/updates/world/2011_03_07_05_world_creatures.sql b/sql/updates/world/2011_03_07_05_world_creatures.sql
new file mode 100644
index 00000000000..4497f45e1fc
--- /dev/null
+++ b/sql/updates/world/2011_03_07_05_world_creatures.sql
@@ -0,0 +1,40 @@
+SET @ENTRY := 28297;
+SET @NPC := 151894;
+SET @PATH := @NPC * 10;
+-- Template update
+UPDATE `creature_template` SET `unit_flags`=`unit_flags`|32768,`speed_run`=1.38571 WHERE `entry`=@ENTRY; -- Shango
+-- Spawn
+DELETE FROM `creature` WHERE `id`=@ENTRY;
+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
+(@NPC,@ENTRY,571,1,1,0,0,6203.80664,5528.569,-51.8230972,2.62550282,120,0,0,1,0,0,2);
+-- Addon data
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES
+(@NPC,@PATH,1,0, NULL); -- Shango
+DELETE FROM `creature_template_addon` WHERE `entry`=@ENTRY;
+INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
+(@ENTRY,0,0,1,0, NULL); -- Shango
+-- Pathing for Shango
+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,6213.67,5522.98,-51.8231,0,0,0,100,0),
+(@PATH,2,6221.91,5519.84,-50.9481,0,0,0,100,0),
+(@PATH,3,6228.36,5517.6,-49.2341,0,0,0,100,0),
+(@PATH,4,6237.21,5503.82,-44.4988,0,0,0,100,0),
+(@PATH,5,6247.96,5494.78,-44.9726,0,0,0,100,0),
+(@PATH,6,6260.08,5484.58,-45.4597,0,0,0,100,0),
+(@PATH,7,6274.67,5480.42,-45.1359,0,0,0,100,0),
+(@PATH,8,6288.82,5476,-46.3803,0,0,0,100,0),
+(@PATH,9,6305.17,5470.43,-44.6878,0,0,0,100,0),
+(@PATH,10,6311.82,5459.03,-48.2749,0,0,0,100,0),
+(@PATH,11,6310.37,5444.21,-52.0538,0,0,0,100,0),
+(@PATH,12,6294.56,5445.27,-54.3711,0,0,0,100,0),
+(@PATH,13,6277.3,5459.18,-51.4723,0,0,0,100,0),
+(@PATH,14,6260.51,5469.62,-51.1171,0,0,0,100,0),
+(@PATH,15,6248.49,5480.35,-50.1687,0,0,0,100,0),
+(@PATH,16,6235.66,5488.57,-51.2285,0,0,0,100,0),
+(@PATH,17,6220.07,5498.48,-58.4601,0,0,0,100,0),
+(@PATH,18,6211.14,5508.38,-58.7072,0,0,0,100,0),
+(@PATH,19,6203.5,5519.82,-56.4056,0,0,0,100,0),
+(@PATH,20,6204.61,5524.55,-53.8457,0,0,0,100,0),
+(@PATH,21,6207.23,5525.67,-52.505,0,0,0,100,0);
diff --git a/sql/updates/world/2011_03_07_06_world_spell_script_names.sql b/sql/updates/world/2011_03_07_06_world_spell_script_names.sql
new file mode 100644
index 00000000000..fa9ffbbfc9a
--- /dev/null
+++ b/sql/updates/world/2011_03_07_06_world_spell_script_names.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_item_map_of_the_geyser_fields';
+INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
+(45853, 'spell_item_map_of_the_geyser_fields');
diff --git a/sql/updates/world/2011_03_07_0_world_misc.sql b/sql/updates/world/2011_03_07_0_world_misc.sql
deleted file mode 100644
index 6e7b679a277..00000000000
--- a/sql/updates/world/2011_03_07_0_world_misc.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-UPDATE `creature_template_addon` SET `auras`=NULL WHERE `entry` IN (36558,35644); -- Argent mounts inside ToC5 shouldn't have any aura (for now)
-DELETE FROM `npc_spellclick_spells` WHERE `npc_entry`=36477; -- Krick isn't a vehicle
-DELETE FROM `achievement_reward` WHERE `entry` IN (4784,4785); -- Revert Emblematic achiev rewards
-UPDATE `creature_template` SET `faction_A`=35,`faction_H`=35 WHERE `entry`=35644; -- Argent Warhorse (faction depends on the players faction that starts ToC5 fight)
diff --git a/sql/updates/world/2011_03_07_1_world_spell_proc_event.sql b/sql/updates/world/2011_03_07_1_world_spell_proc_event.sql
deleted file mode 100644
index 7b49e63d4e8..00000000000
--- a/sql/updates/world/2011_03_07_1_world_spell_proc_event.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-DELETE FROM `spell_proc_event` WHERE `entry`=55681;
-INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES
-(55681,0x00,6,0x00008000,0x00000000,0x00000000,0x00000000,0x00000000,0,0,0); -- Glyph of Shadow Word: Pain
diff --git a/sql/updates/world/2011_03_07_2_world_achievement.sql b/sql/updates/world/2011_03_07_2_world_achievement.sql
deleted file mode 100644
index 3c3f1eb0f2b..00000000000
--- a/sql/updates/world/2011_03_07_2_world_achievement.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-DELETE FROM `disables` WHERE `entry`=7622 AND `sourceType`=4;
-DELETE FROM `achievement_criteria_data` WHERE `criteria_id`=7622;
-INSERT INTO `achievement_criteria_data` (`criteria_id`,`type`,`value1`,`value2`,`ScriptName`) VALUES
-(7622,0,0,0, '');
diff --git a/sql/updates/world/2011_03_07_3_world_creature_template.sql b/sql/updates/world/2011_03_07_3_world_creature_template.sql
deleted file mode 100644
index ecdb7fbb614..00000000000
--- a/sql/updates/world/2011_03_07_3_world_creature_template.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-UPDATE `creature_template_addon` SET `auras`=NULL WHERE `entry` IN (35637,35633,35768,34658,35636,35638,35635,35640,35641,35634); -- Vehicles inside ToC
-UPDATE `creature_template` SET `ScriptName`='' WHERE `entry` IN (
-33870,33790,33791,33792,33793,33794,33795,33796,33798,33799,33800,33842,33843, -- AT stabled npcs
-33782,33318,33323,33322,33317,33319,33316,33321,33324,33320,33845,33844,33217); -- AT vehicles (mounts)
diff --git a/sql/updates/world/2011_03_07_4_world_command.sql b/sql/updates/world/2011_03_07_4_world_command.sql
deleted file mode 100644
index 4e4ed529107..00000000000
--- a/sql/updates/world/2011_03_07_4_world_command.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-DELETE FROM `command` WHERE `name` IN('reload vehicle_accessory','reload vehicle_template_accessory');
-INSERT INTO `command` (`name`,`security`,`help`) VALUES
-('reload vehicle_accessory', 3, 'Syntax: .reload vehicle_accessory\n\nReloads GUID-based vehicle accessory definitions from the database.'),
-('reload vehicle_template_accessory', 3, 'Syntax: .reload vehicle_template_accessory\n\nReloads entry-based vehicle accessory definitions from the database.');
diff --git a/sql/updates/world/2011_03_07_5_world_creatures.sql b/sql/updates/world/2011_03_07_5_world_creatures.sql
deleted file mode 100644
index 4497f45e1fc..00000000000
--- a/sql/updates/world/2011_03_07_5_world_creatures.sql
+++ /dev/null
@@ -1,40 +0,0 @@
-SET @ENTRY := 28297;
-SET @NPC := 151894;
-SET @PATH := @NPC * 10;
--- Template update
-UPDATE `creature_template` SET `unit_flags`=`unit_flags`|32768,`speed_run`=1.38571 WHERE `entry`=@ENTRY; -- Shango
--- Spawn
-DELETE FROM `creature` WHERE `id`=@ENTRY;
-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
-(@NPC,@ENTRY,571,1,1,0,0,6203.80664,5528.569,-51.8230972,2.62550282,120,0,0,1,0,0,2);
--- Addon data
-DELETE FROM `creature_addon` WHERE `guid`=@NPC;
-INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES
-(@NPC,@PATH,1,0, NULL); -- Shango
-DELETE FROM `creature_template_addon` WHERE `entry`=@ENTRY;
-INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
-(@ENTRY,0,0,1,0, NULL); -- Shango
--- Pathing for Shango
-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,6213.67,5522.98,-51.8231,0,0,0,100,0),
-(@PATH,2,6221.91,5519.84,-50.9481,0,0,0,100,0),
-(@PATH,3,6228.36,5517.6,-49.2341,0,0,0,100,0),
-(@PATH,4,6237.21,5503.82,-44.4988,0,0,0,100,0),
-(@PATH,5,6247.96,5494.78,-44.9726,0,0,0,100,0),
-(@PATH,6,6260.08,5484.58,-45.4597,0,0,0,100,0),
-(@PATH,7,6274.67,5480.42,-45.1359,0,0,0,100,0),
-(@PATH,8,6288.82,5476,-46.3803,0,0,0,100,0),
-(@PATH,9,6305.17,5470.43,-44.6878,0,0,0,100,0),
-(@PATH,10,6311.82,5459.03,-48.2749,0,0,0,100,0),
-(@PATH,11,6310.37,5444.21,-52.0538,0,0,0,100,0),
-(@PATH,12,6294.56,5445.27,-54.3711,0,0,0,100,0),
-(@PATH,13,6277.3,5459.18,-51.4723,0,0,0,100,0),
-(@PATH,14,6260.51,5469.62,-51.1171,0,0,0,100,0),
-(@PATH,15,6248.49,5480.35,-50.1687,0,0,0,100,0),
-(@PATH,16,6235.66,5488.57,-51.2285,0,0,0,100,0),
-(@PATH,17,6220.07,5498.48,-58.4601,0,0,0,100,0),
-(@PATH,18,6211.14,5508.38,-58.7072,0,0,0,100,0),
-(@PATH,19,6203.5,5519.82,-56.4056,0,0,0,100,0),
-(@PATH,20,6204.61,5524.55,-53.8457,0,0,0,100,0),
-(@PATH,21,6207.23,5525.67,-52.505,0,0,0,100,0);
diff --git a/sql/updates/world/2011_03_07_6_world_spell_script_names.sql b/sql/updates/world/2011_03_07_6_world_spell_script_names.sql
deleted file mode 100644
index fa9ffbbfc9a..00000000000
--- a/sql/updates/world/2011_03_07_6_world_spell_script_names.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_item_map_of_the_geyser_fields';
-INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
-(45853, 'spell_item_map_of_the_geyser_fields');
diff --git a/sql/updates/world/2011_03_08_00_world_sai.sql b/sql/updates/world/2011_03_08_00_world_sai.sql
new file mode 100644
index 00000000000..0bb809d42b2
--- /dev/null
+++ b/sql/updates/world/2011_03_08_00_world_sai.sql
@@ -0,0 +1,20 @@
+-- Fix for quests: 
+-- From Sniff:
+SET @guid := 78; -- Set by TDB
+DELETE FROM `creature` WHERE `id` IN (25664,25665,25666);
+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  ,25664,571,1,1,0,0,3487.67456,4516.643,11.441596,2.18166161,120,0,0,1,0,0,0), -- South Killcredit
+(@guid+1,25665,571,1,1,0,0,3645.95483,4551.105,12.4051342,0.715585,120,0,0,1,0,0,0), -- Northeast Killcredit
+(@guid+2,25666,571,1,1,0,0,3649.16748,4744.338,12.3212109,0.8901179,120,0,0,1,0,0,0); -- Northwest Killcredit
+-- template updates (if needed)
+UPDATE `creature_template` SET `baseattacktime`=2000,`faction_A`=35,`faction_H`=35,`minlevel`=70,`maxlevel`=70,`scale`=1,`speed_run`=1.142857,`speed_walk`=1,`unit_flags`=`unit_flags`|512|33554432 WHERE `entry`=25664;
+UPDATE `creature_template` SET `baseattacktime`=2000,`faction_A`=35,`faction_H`=35,`minlevel`=70,`maxlevel`=70,`scale`=1,`speed_run`=1.142857,`speed_walk`=1,`unit_flags`=`unit_flags`|512|33554432 WHERE `entry`=25665;
+UPDATE `creature_template` SET `baseattacktime`=2000,`faction_A`=35,`faction_H`=35,`minlevel`=70,`maxlevel`=70,`scale`=1,`speed_run`=1.142857,`speed_walk`=1,`unit_flags`=`unit_flags`|512|33554432 WHERE `entry`=25666;
+
+-- SAI for the Killcredits:
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry` IN (25664,25665,25666);
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (25664,25665,25666);
+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 
+(25664,0,0,0,8,0,100,0,45853,1,0,0,33,25664,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Mark Sinkhole Killcredit: South'),
+(25665,0,0,0,8,0,100,0,45853,1,0,0,33,25665,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Mark Sinkhole Killcredit: NorthEast'),
+(25666,0,0,0,8,0,100,0,45853,1,0,0,33,25666,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Mark Sinkhole Killcredit: NorthWest');
diff --git a/sql/updates/world/2011_03_08_0_world_sai.sql b/sql/updates/world/2011_03_08_0_world_sai.sql
deleted file mode 100644
index 0bb809d42b2..00000000000
--- a/sql/updates/world/2011_03_08_0_world_sai.sql
+++ /dev/null
@@ -1,20 +0,0 @@
--- Fix for quests: 
--- From Sniff:
-SET @guid := 78; -- Set by TDB
-DELETE FROM `creature` WHERE `id` IN (25664,25665,25666);
-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  ,25664,571,1,1,0,0,3487.67456,4516.643,11.441596,2.18166161,120,0,0,1,0,0,0), -- South Killcredit
-(@guid+1,25665,571,1,1,0,0,3645.95483,4551.105,12.4051342,0.715585,120,0,0,1,0,0,0), -- Northeast Killcredit
-(@guid+2,25666,571,1,1,0,0,3649.16748,4744.338,12.3212109,0.8901179,120,0,0,1,0,0,0); -- Northwest Killcredit
--- template updates (if needed)
-UPDATE `creature_template` SET `baseattacktime`=2000,`faction_A`=35,`faction_H`=35,`minlevel`=70,`maxlevel`=70,`scale`=1,`speed_run`=1.142857,`speed_walk`=1,`unit_flags`=`unit_flags`|512|33554432 WHERE `entry`=25664;
-UPDATE `creature_template` SET `baseattacktime`=2000,`faction_A`=35,`faction_H`=35,`minlevel`=70,`maxlevel`=70,`scale`=1,`speed_run`=1.142857,`speed_walk`=1,`unit_flags`=`unit_flags`|512|33554432 WHERE `entry`=25665;
-UPDATE `creature_template` SET `baseattacktime`=2000,`faction_A`=35,`faction_H`=35,`minlevel`=70,`maxlevel`=70,`scale`=1,`speed_run`=1.142857,`speed_walk`=1,`unit_flags`=`unit_flags`|512|33554432 WHERE `entry`=25666;
-
--- SAI for the Killcredits:
-UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry` IN (25664,25665,25666);
-DELETE FROM `smart_scripts` WHERE `entryorguid` IN (25664,25665,25666);
-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 
-(25664,0,0,0,8,0,100,0,45853,1,0,0,33,25664,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Mark Sinkhole Killcredit: South'),
-(25665,0,0,0,8,0,100,0,45853,1,0,0,33,25665,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Mark Sinkhole Killcredit: NorthEast'),
-(25666,0,0,0,8,0,100,0,45853,1,0,0,33,25666,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Mark Sinkhole Killcredit: NorthWest');
diff --git a/sql/updates/world/2011_03_09_00_world_creature_addon.sql b/sql/updates/world/2011_03_09_00_world_creature_addon.sql
new file mode 100644
index 00000000000..e3ca476d684
--- /dev/null
+++ b/sql/updates/world/2011_03_09_00_world_creature_addon.sql
@@ -0,0 +1 @@
+DELETE FROM `creature_addon` WHERE `guid` IN (101966,102039);
diff --git a/sql/updates/world/2011_03_09_01_world_misc.sql b/sql/updates/world/2011_03_09_01_world_misc.sql
new file mode 100644
index 00000000000..5570aa97a32
--- /dev/null
+++ b/sql/updates/world/2011_03_09_01_world_misc.sql
@@ -0,0 +1,74 @@
+-- SrcItemCount is not a WDB field (0/1).
+UPDATE `quest_template` SET `SrcItemCount` = 1 WHERE `SrcItemId` != 0 AND `SrcItemCount` = 0;
+
+-- Missing items
+DELETE FROM `item_template` WHERE `entry` IN (52274,52275,52276,52344,52562,52563,52565,52706,52707,52729,52835,53048,54516) AND `WDBVerified` < 0;
+INSERT INTO `item_template` (`entry`,`class`,`subclass`,`unk0`,`name`,`displayid`,`Quality`,`Flags`,`FlagsExtra`,`BuyCount`,`BuyPrice`,`SellPrice`,`InventoryType`,`AllowableClass`,`AllowableRace`,`ItemLevel`,`RequiredLevel`,`RequiredSkill`,`RequiredSkillRank`,`requiredspell`,`requiredhonorrank`,`RequiredCityRank`,`RequiredReputationFaction`,`RequiredReputationRank`,`maxcount`,`stackable`,`ContainerSlots`,`StatsCount`,`stat_type1`,`stat_value1`,`stat_type2`,`stat_value2`,`stat_type3`,`stat_value3`,`stat_type4`,`stat_value4`,`stat_type5`,`stat_value5`,`stat_type6`,`stat_value6`,`stat_type7`,`stat_value7`,`stat_type8`,`stat_value8`,`stat_type9`,`stat_value9`,`stat_type10`,`stat_value10`,`ScalingStatDistribution`,`ScalingStatValue`,`dmg_min1`,`dmg_max1`,`dmg_type1`,`dmg_min2`,`dmg_max2`,`dmg_type2`,`armor`,`holy_res`,`fire_res`,`nature_res`,`frost_res`,`shadow_res`,`arcane_res`,`delay`,`ammo_type`,`RangedModRange`,`spellid_1`,`spelltrigger_1`,`spellcharges_1`,`spellppmRate_1`,`spellcooldown_1`,`spellcategory_1`,`spellcategorycooldown_1`,`spellid_2`,`spelltrigger_2`,`spellcharges_2`,`spellppmRate_2`,`spellcooldown_2`,`spellcategory_2`,`spellcategorycooldown_2`,`spellid_3`,`spelltrigger_3`,`spellcharges_3`,`spellppmRate_3`,`spellcooldown_3`,`spellcategory_3`,`spellcategorycooldown_3`,`spellid_4`,`spelltrigger_4`,`spellcharges_4`,`spellppmRate_4`,`spellcooldown_4`,`spellcategory_4`,`spellcategorycooldown_4`,`spellid_5`,`spelltrigger_5`,`spellcharges_5`,`spellppmRate_5`,`spellcooldown_5`,`spellcategory_5`,`spellcategorycooldown_5`,`bonding`,`description`,`PageText`,`LanguageID`,`PageMaterial`,`startquest`,`lockid`,`Material`,`sheath`,`RandomProperty`,`RandomSuffix`,`block`,`itemset`,`MaxDurability`,`area`,`Map`,`BagFamily`,`TotemCategory`,`socketColor_1`,`socketContent_1`,`socketColor_2`,`socketContent_2`,`socketColor_3`,`socketContent_3`,`socketBonus`,`GemProperties`,`RequiredDisenchantSkill`,`ArmorDamageModifier`,`Duration`,`ItemLimitCategory`,`HolidayId`,`ScriptName`,`DisenchantID`,`FoodType`,`minMoneyLoot`,`maxMoneyLoot`,`WDBVerified`) VALUES
+(52274,15,0,-1,'Earthen Ring Supplies',21202,1,4,0,1,0,0,0,-1,-1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,1,'',0,0,0,0,0,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-1,0,0,0,0,'',0,0,0,0,-12340),
+(52275,12,0,-1,'Tablets of the Earth',11185,1,198656,0,1,0,0,0,-1,-1,1,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,4,'',0,0,0,0,0,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-1,0,0,0,0,'',0,0,0,0,-12340),
+(52276,12,0,-1,'Tablets of Fire',11185,1,133120,0,1,0,0,0,-1,-1,1,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,4,'',0,0,0,0,0,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-1,0,0,0,0,'',0,0,0,0,-12340),
+(52344,15,0,-1,'Earthen Ring Supplies',21202,1,4,0,1,0,0,0,-1,-1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,1,'',0,0,0,0,0,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-1,0,0,0,0,'',0,0,0,0,-12340),
+(52562,12,0,-1,'Elemental Fire for the Soul',34752,1,131072,0,1,0,0,0,-1,-1,1,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,4,'',3611,0,0,0,0,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-1,0,0,0,0,'',0,0,0,0,-12340),
+(52563,12,0,-1,'What Does ''The End of All Things'' Mean for Me?',34751,1,196608,0,1,0,0,0,-1,-1,1,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,4,'',3612,0,0,0,0,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-1,0,0,0,0,'',0,0,0,0,-12340),
+(52565,12,0,-1,'Finding Security and Comfort in a Doomed World',45202,1,131072,0,1,0,0,0,-1,-1,1,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,4,'',3613,0,0,0,0,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-1,0,0,0,0,'',0,0,0,0,-12340),
+(52706,12,0,-1,'Warning Poster',65893,1,64,0,1,0,0,0,-1,-1,1,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,74033,0,0,0,1500,0,-1,0,5,0,0,-1,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,4,'',0,0,0,0,0,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-1,0,0,0,0,'',0,0,0,0,-12340),
+(52707,12,0,-1,'Warning Poster',65893,1,64,0,1,0,0,0,-1,-1,1,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,74098,0,0,0,1500,0,-1,0,5,0,0,-1,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,4,'',0,0,0,0,0,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-1,0,0,0,0,'',0,0,0,0,-12340),
+(52729,4,1,-1,'Recruit''s Robe',65920,1,0,0,1,0,0,20,-1,-1,1,1,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,74267,1,0,0,-1,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,1,'',0,0,0,0,0,4,0,0,0,0,0,55,0,0,0,0,0,0,0,0,0,0,0,0,-1,0,0,0,0,'',0,0,0,0,-12340),
+(52835,12,0,-1,'Elemental Devices',23712,1,0,0,1,0,0,0,-1,-1,1,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,4,'Small, portable devices housing powerful elementals.',0,0,0,0,0,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-1,0,0,0,0,'',0,0,0,0,-12340),
+(53048,4,0,-1,'Doomsday Message',34752,1,0,0,1,0,0,16,-1,-1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,74491,0,0,0,1500,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,4,'',0,0,0,0,0,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-1,0,0,0,0,'',0,0,0,0,-12340),
+(54516,15,0,-1,'Loot-Filled Pumpkin',67153,3,4,0,1,0,0,0,-1,-1,80,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,1,'',0,0,0,0,0,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-1,0,0,0,0,'',0,0,0,0,-12340);
+
+-- Spells placeholders
+DELETE FROM `spell_dbc` WHERE `Id` IN (38758,38788,46251,45140,45144,45148);
+INSERT INTO `spell_dbc` (`Id`,`Comment`) VALUES
+(38758, '[PH] Quest reward: Exorcising the Trees'),
+(38788, '[PH] Quest reward: Spirit Calling'),
+(46251, '[PH] Quest reward: Blood for Blood'),
+(45140, '[PH] Quest reward: Making Ready / Don''t Stop Now....'),
+(45144, '[PH] Quest reward: Disrupt the Greengill Coast'),
+(45148, '[PH] Quest reward: Ata''mal Armaments');
+
+DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=10850; -- Exorcising the Trees
+DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=10853; -- Spirit Calling
+DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=11466; -- Jack Likes His Drink
+DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=11515; -- Blood for Blood
+DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=11535; -- Making Ready (available before phase 3b in Isle of Quel'danas)
+DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=11536; -- Don't Stop Now.... (available after phase 3b in Isle of Quel'danas)
+DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=11541; -- Disrupt the Greengill Coast (available after phase 4 in Isle of Quel'danas)
+DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=11544; -- Ata'mal Armaments (available after phase 3b in Isle of Quel'danas)
+DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=12616; -- Chamber of Secrets (world event: Scourge Invasion)
+DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=12734; -- Rejek: First Blood
+DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=24869; -- Deprogramming (ICC)
+DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=24879; -- Blood Quickening (ICC)
+DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=24916; -- Jaina's Locket (ICC)
+DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=24918; -- Sylvanas' Vengeance (ICC)
+DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=24919; -- The Lightbringer's Redemption (ICC)
+DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=25055; -- Subduing the Elements (world event: Elemental Unrest)
+DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=25092; -- Subduing the Elements (world event: Elemental Unrest)
+DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=25180; -- Tablets of the Earth (world event: Elemental Unrest)
+DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=25181; -- Tablets of Fire (world event: Elemental Unrest)
+DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=25228; -- Prophecies Of Doom (world event: Elemental Unrest)
+DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=25253; -- Prophecies Of Doom (world event: Elemental Unrest)
+DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=25254; -- Signs Of The Times (world event: Elemental Unrest)
+DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=25282; -- Signs Of The Times (world event: Elemental Unrest)
+DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=25347; -- The Doomsday Plan (world event: Elemental Unrest)
+DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=25351; -- Alert Our Leaders (world event: Elemental Unrest)
+DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=25380; -- Spreading The Word (world event: Elemental Unrest)
+DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=25415; -- Spreading The Word (world event: Elemental Unrest)
+DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=25417; -- The Doomsday Plan (world event: Elemental Unrest)
+DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=25425; -- Warn King Wrynn (world event: Elemental Unrest)
+DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=25212; -- Vent Horizon (world event: Operation: Gnomeregan)
+DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=25229; -- A Few Good Gnomes (world event: Operation: Gnomeregan)
+DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=25283; -- Prepping the Speech (world event: Operation: Gnomeregan)
+DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=25286; -- Words for Delivery (world event: Operation: Gnomeregan)
+DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=25287; -- Words for Delivery (world event: Operation: Gnomeregan)
+DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=25393; -- Operation: Gnomeregan (world event: Operation: Gnomeregan)
+DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=25500; -- Words for Delivery (world event: Operation: Gnomeregan)
+DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=25444; -- Da Perfect Spies (world event: Zalazane's Fall)
+DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=25445; -- Zalazane's Fall (world event: Zalazane's Fall)
+DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=25446; -- Frogs Away! (world event: Zalazane's Fall)
+DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=25461; -- Trollin' For Volunteers (world event: Zalazane's Fall)
+DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=25480; -- Dance Of De Spirits (world event: Zalazane's Fall)
+DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=25482; -- World Event Dungeon - Headless Horseman
+DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=25483; -- World Event Dungeon - Coren Direbrew
+-- DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=25485; -- World Event Dungeon - Hummel (missing item)
diff --git a/sql/updates/world/2011_03_09_02_world_page_text.sql b/sql/updates/world/2011_03_09_02_world_page_text.sql
new file mode 100644
index 00000000000..00c9e0dab1c
--- /dev/null
+++ b/sql/updates/world/2011_03_09_02_world_page_text.sql
@@ -0,0 +1,11 @@
+DELETE FROM `page_text` WHERE `entry` IN (3611,3612,3613,3280,3281,3282) AND `WDBVerified`=1;
+DELETE FROM `page_text` WHERE `entry`=9999;
+INSERT INTO `page_text` (`entry`, `text`, `next_page`,`WDBVerified`) VALUES
+(3611, 'When the flames consume Azeroth, where will you be?\r\n\r\nWe know that no one wants to dwell on their impending doom, but it''s worth thinking about where you''ll be spending the hereafter.\r\n\r\nOur sages have predicted that the end of the world is nigh, and only the prepared will survive. We can help you survive the raging inferno that will cleanse this world of the wicked. Isn''t it time you found some peace of mind?', 0,1),
+(3612, 'You''ve no doubt heard the phrase "all good things must come to an end" and so it is with your life on Azeroth. It won''t be long before the world erupts into chaos as the elements reclaim their birthright.\r\n\r\nBut you don''t have to be afraid during these harrowing times. You don''t have to die. We can help you ascend to a new way of life, beyond death, beyond fear, and beyond the powerlessness of mortality. Join us today.', 0,1),
+(3613, 'We live in tumultuous times. War, invasion, and famine have swept the world, but the real trial is yet to come: the end of Azeroth itself.\r\n\r\nHow will you cope with the loss and destruction of everything you hold dear? The answer is that you don''t have to. Bring your friends and family to one of our gatherings and learn how you can survive the apocalypse together, with us.', 0,1),
+(3280, 'Long ago, when the North Wind ruled these peaks alone, a powerful Taunka Chieftain''s brother coveted these lands for himself.', 0,1),
+(3281, 'The Chieftain''s brother, Stormhoof gathered all his strength and set out to conquer the Storm Peaks from its rightful ruler, the North Wind.', 0,1),
+(3282, 'Stormhoof ambushed the North Wind in the heart of it''s domain, and nearly succeeded in his plot. But the North Wind survived Stormhoof''s treachery and executed the Taunka as punishment for his invasion.', 0,1);
+
+UPDATE `page_text` SET `text`='Missing WDB data.',`WDBVerified`=1 WHERE `entry` IN (3487,3469,3454,3403,3346,3079,3562,2822);
diff --git a/sql/updates/world/2011_03_09_03_world_misc.sql b/sql/updates/world/2011_03_09_03_world_misc.sql
new file mode 100644
index 00000000000..0ce9593d779
--- /dev/null
+++ b/sql/updates/world/2011_03_09_03_world_misc.sql
@@ -0,0 +1,8 @@
+DELETE FROM `spell_dbc` WHERE `Id` IN (38758,38665);
+INSERT INTO `spell_dbc` (`Id`,`Comment`) VALUES
+(38758, '[PH] Quest reward: Nether Gas In a Fel Fire Engine'),
+(38665, '[PH] Quest reward: Exorcising the Trees');
+
+DELETE FROM `disables` WHERE `sourceType`=1 AND `entry` IN (
+10830, -- Exorcising the Trees
+10850); -- Nether Gas In a Fel Fire Engine
diff --git a/sql/updates/world/2011_03_09_0_world_creature_addon.sql b/sql/updates/world/2011_03_09_0_world_creature_addon.sql
deleted file mode 100644
index e3ca476d684..00000000000
--- a/sql/updates/world/2011_03_09_0_world_creature_addon.sql
+++ /dev/null
@@ -1 +0,0 @@
-DELETE FROM `creature_addon` WHERE `guid` IN (101966,102039);
diff --git a/sql/updates/world/2011_03_09_1_world_misc.sql b/sql/updates/world/2011_03_09_1_world_misc.sql
deleted file mode 100644
index 5570aa97a32..00000000000
--- a/sql/updates/world/2011_03_09_1_world_misc.sql
+++ /dev/null
@@ -1,74 +0,0 @@
--- SrcItemCount is not a WDB field (0/1).
-UPDATE `quest_template` SET `SrcItemCount` = 1 WHERE `SrcItemId` != 0 AND `SrcItemCount` = 0;
-
--- Missing items
-DELETE FROM `item_template` WHERE `entry` IN (52274,52275,52276,52344,52562,52563,52565,52706,52707,52729,52835,53048,54516) AND `WDBVerified` < 0;
-INSERT INTO `item_template` (`entry`,`class`,`subclass`,`unk0`,`name`,`displayid`,`Quality`,`Flags`,`FlagsExtra`,`BuyCount`,`BuyPrice`,`SellPrice`,`InventoryType`,`AllowableClass`,`AllowableRace`,`ItemLevel`,`RequiredLevel`,`RequiredSkill`,`RequiredSkillRank`,`requiredspell`,`requiredhonorrank`,`RequiredCityRank`,`RequiredReputationFaction`,`RequiredReputationRank`,`maxcount`,`stackable`,`ContainerSlots`,`StatsCount`,`stat_type1`,`stat_value1`,`stat_type2`,`stat_value2`,`stat_type3`,`stat_value3`,`stat_type4`,`stat_value4`,`stat_type5`,`stat_value5`,`stat_type6`,`stat_value6`,`stat_type7`,`stat_value7`,`stat_type8`,`stat_value8`,`stat_type9`,`stat_value9`,`stat_type10`,`stat_value10`,`ScalingStatDistribution`,`ScalingStatValue`,`dmg_min1`,`dmg_max1`,`dmg_type1`,`dmg_min2`,`dmg_max2`,`dmg_type2`,`armor`,`holy_res`,`fire_res`,`nature_res`,`frost_res`,`shadow_res`,`arcane_res`,`delay`,`ammo_type`,`RangedModRange`,`spellid_1`,`spelltrigger_1`,`spellcharges_1`,`spellppmRate_1`,`spellcooldown_1`,`spellcategory_1`,`spellcategorycooldown_1`,`spellid_2`,`spelltrigger_2`,`spellcharges_2`,`spellppmRate_2`,`spellcooldown_2`,`spellcategory_2`,`spellcategorycooldown_2`,`spellid_3`,`spelltrigger_3`,`spellcharges_3`,`spellppmRate_3`,`spellcooldown_3`,`spellcategory_3`,`spellcategorycooldown_3`,`spellid_4`,`spelltrigger_4`,`spellcharges_4`,`spellppmRate_4`,`spellcooldown_4`,`spellcategory_4`,`spellcategorycooldown_4`,`spellid_5`,`spelltrigger_5`,`spellcharges_5`,`spellppmRate_5`,`spellcooldown_5`,`spellcategory_5`,`spellcategorycooldown_5`,`bonding`,`description`,`PageText`,`LanguageID`,`PageMaterial`,`startquest`,`lockid`,`Material`,`sheath`,`RandomProperty`,`RandomSuffix`,`block`,`itemset`,`MaxDurability`,`area`,`Map`,`BagFamily`,`TotemCategory`,`socketColor_1`,`socketContent_1`,`socketColor_2`,`socketContent_2`,`socketColor_3`,`socketContent_3`,`socketBonus`,`GemProperties`,`RequiredDisenchantSkill`,`ArmorDamageModifier`,`Duration`,`ItemLimitCategory`,`HolidayId`,`ScriptName`,`DisenchantID`,`FoodType`,`minMoneyLoot`,`maxMoneyLoot`,`WDBVerified`) VALUES
-(52274,15,0,-1,'Earthen Ring Supplies',21202,1,4,0,1,0,0,0,-1,-1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,1,'',0,0,0,0,0,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-1,0,0,0,0,'',0,0,0,0,-12340),
-(52275,12,0,-1,'Tablets of the Earth',11185,1,198656,0,1,0,0,0,-1,-1,1,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,4,'',0,0,0,0,0,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-1,0,0,0,0,'',0,0,0,0,-12340),
-(52276,12,0,-1,'Tablets of Fire',11185,1,133120,0,1,0,0,0,-1,-1,1,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,4,'',0,0,0,0,0,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-1,0,0,0,0,'',0,0,0,0,-12340),
-(52344,15,0,-1,'Earthen Ring Supplies',21202,1,4,0,1,0,0,0,-1,-1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,1,'',0,0,0,0,0,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-1,0,0,0,0,'',0,0,0,0,-12340),
-(52562,12,0,-1,'Elemental Fire for the Soul',34752,1,131072,0,1,0,0,0,-1,-1,1,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,4,'',3611,0,0,0,0,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-1,0,0,0,0,'',0,0,0,0,-12340),
-(52563,12,0,-1,'What Does ''The End of All Things'' Mean for Me?',34751,1,196608,0,1,0,0,0,-1,-1,1,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,4,'',3612,0,0,0,0,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-1,0,0,0,0,'',0,0,0,0,-12340),
-(52565,12,0,-1,'Finding Security and Comfort in a Doomed World',45202,1,131072,0,1,0,0,0,-1,-1,1,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,4,'',3613,0,0,0,0,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-1,0,0,0,0,'',0,0,0,0,-12340),
-(52706,12,0,-1,'Warning Poster',65893,1,64,0,1,0,0,0,-1,-1,1,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,74033,0,0,0,1500,0,-1,0,5,0,0,-1,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,4,'',0,0,0,0,0,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-1,0,0,0,0,'',0,0,0,0,-12340),
-(52707,12,0,-1,'Warning Poster',65893,1,64,0,1,0,0,0,-1,-1,1,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,74098,0,0,0,1500,0,-1,0,5,0,0,-1,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,4,'',0,0,0,0,0,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-1,0,0,0,0,'',0,0,0,0,-12340),
-(52729,4,1,-1,'Recruit''s Robe',65920,1,0,0,1,0,0,20,-1,-1,1,1,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,74267,1,0,0,-1,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,1,'',0,0,0,0,0,4,0,0,0,0,0,55,0,0,0,0,0,0,0,0,0,0,0,0,-1,0,0,0,0,'',0,0,0,0,-12340),
-(52835,12,0,-1,'Elemental Devices',23712,1,0,0,1,0,0,0,-1,-1,1,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,4,'Small, portable devices housing powerful elementals.',0,0,0,0,0,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-1,0,0,0,0,'',0,0,0,0,-12340),
-(53048,4,0,-1,'Doomsday Message',34752,1,0,0,1,0,0,16,-1,-1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,74491,0,0,0,1500,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,4,'',0,0,0,0,0,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-1,0,0,0,0,'',0,0,0,0,-12340),
-(54516,15,0,-1,'Loot-Filled Pumpkin',67153,3,4,0,1,0,0,0,-1,-1,80,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,0,0,0,0,-1,0,-1,1,'',0,0,0,0,0,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-1,0,0,0,0,'',0,0,0,0,-12340);
-
--- Spells placeholders
-DELETE FROM `spell_dbc` WHERE `Id` IN (38758,38788,46251,45140,45144,45148);
-INSERT INTO `spell_dbc` (`Id`,`Comment`) VALUES
-(38758, '[PH] Quest reward: Exorcising the Trees'),
-(38788, '[PH] Quest reward: Spirit Calling'),
-(46251, '[PH] Quest reward: Blood for Blood'),
-(45140, '[PH] Quest reward: Making Ready / Don''t Stop Now....'),
-(45144, '[PH] Quest reward: Disrupt the Greengill Coast'),
-(45148, '[PH] Quest reward: Ata''mal Armaments');
-
-DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=10850; -- Exorcising the Trees
-DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=10853; -- Spirit Calling
-DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=11466; -- Jack Likes His Drink
-DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=11515; -- Blood for Blood
-DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=11535; -- Making Ready (available before phase 3b in Isle of Quel'danas)
-DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=11536; -- Don't Stop Now.... (available after phase 3b in Isle of Quel'danas)
-DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=11541; -- Disrupt the Greengill Coast (available after phase 4 in Isle of Quel'danas)
-DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=11544; -- Ata'mal Armaments (available after phase 3b in Isle of Quel'danas)
-DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=12616; -- Chamber of Secrets (world event: Scourge Invasion)
-DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=12734; -- Rejek: First Blood
-DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=24869; -- Deprogramming (ICC)
-DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=24879; -- Blood Quickening (ICC)
-DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=24916; -- Jaina's Locket (ICC)
-DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=24918; -- Sylvanas' Vengeance (ICC)
-DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=24919; -- The Lightbringer's Redemption (ICC)
-DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=25055; -- Subduing the Elements (world event: Elemental Unrest)
-DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=25092; -- Subduing the Elements (world event: Elemental Unrest)
-DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=25180; -- Tablets of the Earth (world event: Elemental Unrest)
-DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=25181; -- Tablets of Fire (world event: Elemental Unrest)
-DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=25228; -- Prophecies Of Doom (world event: Elemental Unrest)
-DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=25253; -- Prophecies Of Doom (world event: Elemental Unrest)
-DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=25254; -- Signs Of The Times (world event: Elemental Unrest)
-DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=25282; -- Signs Of The Times (world event: Elemental Unrest)
-DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=25347; -- The Doomsday Plan (world event: Elemental Unrest)
-DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=25351; -- Alert Our Leaders (world event: Elemental Unrest)
-DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=25380; -- Spreading The Word (world event: Elemental Unrest)
-DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=25415; -- Spreading The Word (world event: Elemental Unrest)
-DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=25417; -- The Doomsday Plan (world event: Elemental Unrest)
-DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=25425; -- Warn King Wrynn (world event: Elemental Unrest)
-DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=25212; -- Vent Horizon (world event: Operation: Gnomeregan)
-DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=25229; -- A Few Good Gnomes (world event: Operation: Gnomeregan)
-DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=25283; -- Prepping the Speech (world event: Operation: Gnomeregan)
-DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=25286; -- Words for Delivery (world event: Operation: Gnomeregan)
-DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=25287; -- Words for Delivery (world event: Operation: Gnomeregan)
-DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=25393; -- Operation: Gnomeregan (world event: Operation: Gnomeregan)
-DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=25500; -- Words for Delivery (world event: Operation: Gnomeregan)
-DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=25444; -- Da Perfect Spies (world event: Zalazane's Fall)
-DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=25445; -- Zalazane's Fall (world event: Zalazane's Fall)
-DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=25446; -- Frogs Away! (world event: Zalazane's Fall)
-DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=25461; -- Trollin' For Volunteers (world event: Zalazane's Fall)
-DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=25480; -- Dance Of De Spirits (world event: Zalazane's Fall)
-DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=25482; -- World Event Dungeon - Headless Horseman
-DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=25483; -- World Event Dungeon - Coren Direbrew
--- DELETE FROM `disables` WHERE `sourceType`=1 AND `entry`=25485; -- World Event Dungeon - Hummel (missing item)
diff --git a/sql/updates/world/2011_03_09_2_world_page_text.sql b/sql/updates/world/2011_03_09_2_world_page_text.sql
deleted file mode 100644
index 00c9e0dab1c..00000000000
--- a/sql/updates/world/2011_03_09_2_world_page_text.sql
+++ /dev/null
@@ -1,11 +0,0 @@
-DELETE FROM `page_text` WHERE `entry` IN (3611,3612,3613,3280,3281,3282) AND `WDBVerified`=1;
-DELETE FROM `page_text` WHERE `entry`=9999;
-INSERT INTO `page_text` (`entry`, `text`, `next_page`,`WDBVerified`) VALUES
-(3611, 'When the flames consume Azeroth, where will you be?\r\n\r\nWe know that no one wants to dwell on their impending doom, but it''s worth thinking about where you''ll be spending the hereafter.\r\n\r\nOur sages have predicted that the end of the world is nigh, and only the prepared will survive. We can help you survive the raging inferno that will cleanse this world of the wicked. Isn''t it time you found some peace of mind?', 0,1),
-(3612, 'You''ve no doubt heard the phrase "all good things must come to an end" and so it is with your life on Azeroth. It won''t be long before the world erupts into chaos as the elements reclaim their birthright.\r\n\r\nBut you don''t have to be afraid during these harrowing times. You don''t have to die. We can help you ascend to a new way of life, beyond death, beyond fear, and beyond the powerlessness of mortality. Join us today.', 0,1),
-(3613, 'We live in tumultuous times. War, invasion, and famine have swept the world, but the real trial is yet to come: the end of Azeroth itself.\r\n\r\nHow will you cope with the loss and destruction of everything you hold dear? The answer is that you don''t have to. Bring your friends and family to one of our gatherings and learn how you can survive the apocalypse together, with us.', 0,1),
-(3280, 'Long ago, when the North Wind ruled these peaks alone, a powerful Taunka Chieftain''s brother coveted these lands for himself.', 0,1),
-(3281, 'The Chieftain''s brother, Stormhoof gathered all his strength and set out to conquer the Storm Peaks from its rightful ruler, the North Wind.', 0,1),
-(3282, 'Stormhoof ambushed the North Wind in the heart of it''s domain, and nearly succeeded in his plot. But the North Wind survived Stormhoof''s treachery and executed the Taunka as punishment for his invasion.', 0,1);
-
-UPDATE `page_text` SET `text`='Missing WDB data.',`WDBVerified`=1 WHERE `entry` IN (3487,3469,3454,3403,3346,3079,3562,2822);
diff --git a/sql/updates/world/2011_03_09_3_world_misc.sql b/sql/updates/world/2011_03_09_3_world_misc.sql
deleted file mode 100644
index 0ce9593d779..00000000000
--- a/sql/updates/world/2011_03_09_3_world_misc.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-DELETE FROM `spell_dbc` WHERE `Id` IN (38758,38665);
-INSERT INTO `spell_dbc` (`Id`,`Comment`) VALUES
-(38758, '[PH] Quest reward: Nether Gas In a Fel Fire Engine'),
-(38665, '[PH] Quest reward: Exorcising the Trees');
-
-DELETE FROM `disables` WHERE `sourceType`=1 AND `entry` IN (
-10830, -- Exorcising the Trees
-10850); -- Nether Gas In a Fel Fire Engine
diff --git a/sql/updates/world/2011_03_10_00_world_creatures.sql b/sql/updates/world/2011_03_10_00_world_creatures.sql
new file mode 100644
index 00000000000..d68a13999bf
--- /dev/null
+++ b/sql/updates/world/2011_03_10_00_world_creatures.sql
@@ -0,0 +1,10 @@
+UPDATE `creature_template` SET `flags_extra`=((`flags_extra`|128)&~2) WHERE `entry` IN (38153,26043,37181,37702,37183,36848,37547,37519,37215,38463,38319,38879); -- Various triggers in ICC
+
+-- Delete gunship spawns
+DELETE FROM `creature` WHERE `id` IN (37547,37519,37215,36971,37227,36961,36969,36950,37116,36978,37540,37488);
+
+DELETE FROM `creature_template_addon` WHERE `entry`=38463;
+INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
+(38463,0,0,1,0, '72100 0'); -- Empowering Orb Visual Stalker
+
+UPDATE `gameobject_template` SET `faction`=35, `flags`=16 WHERE `entry`=201741; -- Empowering Blood Orb
diff --git a/sql/updates/world/2011_03_10_01_world_pool_quest.sql b/sql/updates/world/2011_03_10_01_world_pool_quest.sql
new file mode 100644
index 00000000000..34ebc7a9eab
--- /dev/null
+++ b/sql/updates/world/2011_03_10_01_world_pool_quest.sql
@@ -0,0 +1,45 @@
+-- ICC Quest pools
+SET @pool := 5679;
+DELETE FROM `pool_quest` WHERE `pool_entry` BETWEEN @pool AND @pool+11;
+DELETE FROM `pool_template` WHERE `entry` BETWEEN @pool AND @pool+11;
+DELETE FROM `pool_pool` WHERE `mother_pool` IN (@pool,@pool+1);
+
+INSERT INTO `pool_quest` (`entry`,`pool_entry`,`description`) VALUES
+(24874,@pool+02, 'Blood Quickening (10)'),
+(24869,@pool+03, 'Deprogramming (10)'),
+(24873,@pool+04, 'Residue Rendezvous (10)'),
+(24872,@pool+05, 'Respite for a Tormented Soul (10)'),
+(24870,@pool+06, 'Securing the Ramparts HORDE (10)'),
+(24871,@pool+06, 'Securing the Ramparts ALLY (10)'),
+(24879,@pool+07, 'Blood Quickening (25)'),
+(24875,@pool+08, 'Deprogramming (25)'),
+(24878,@pool+09, 'Residue Rendezvous (25)'),
+(24880,@pool+10, 'Respite for a Tormented Soul (25)'),
+(24876,@pool+11, 'Securing the Ramparts ALLY (25)'),
+(24877,@pool+11, 'Securing the Ramparts HORDE (25)');
+
+INSERT INTO `pool_template` (`entry`,`max_limit`,`description`) VALUES
+(@pool+00,1, 'General ICC 10man pool'),
+(@pool+01,1, 'General ICC 25man pool'),
+(@pool+02,1, 'Blood Quickening (10)'),
+(@pool+03,1, 'Deprogramming (10)'),
+(@pool+04,1, 'Residue Rendezvous (10)'),
+(@pool+05,1, 'Respite for a Tormented Soul (10)'),
+(@pool+06,2, 'Securing the Ramparts (10)'),
+(@pool+07,1, 'Blood Quickening (25)'),
+(@pool+08,1, 'Deprogramming (25)'),
+(@pool+09,1, 'Residue Rendezvous (25)'),
+(@pool+10,1, 'Respite for a Tormented Soul (25)'),
+(@pool+11,2, 'Securing the Ramparts (25)');
+
+INSERT INTO `pool_pool` (`pool_id`,`mother_pool`,`chance`,`description`) VALUES
+(@pool+02,@pool+00,0, 'Blood Quickening (10)'),
+(@pool+03,@pool+00,0, 'Deprogramming (10)'),
+(@pool+04,@pool+00,0, 'Residue Rendezvous (10)'),
+(@pool+05,@pool+00,0, 'Respite for a Tormented Soul (10)'),
+(@pool+06,@pool+00,0, 'Securing the Ramparts (10)'),
+(@pool+07,@pool+01,0, 'Blood Quickening (25)'),
+(@pool+08,@pool+01,0, 'Deprogramming (25)'),
+(@pool+09,@pool+01,0, 'Residue Rendezvous (25)'),
+(@pool+10,@pool+01,0, 'Respite for a Tormented Soul (25)'),
+(@pool+11,@pool+01,0, 'Securing the Ramparts (25)');
diff --git a/sql/updates/world/2011_03_10_02_world_creature_template.sql b/sql/updates/world/2011_03_10_02_world_creature_template.sql
new file mode 100644
index 00000000000..6e509bfd3a2
--- /dev/null
+++ b/sql/updates/world/2011_03_10_02_world_creature_template.sql
@@ -0,0 +1,2 @@
+-- Overide AI
+UPDATE `creature_template` SET `AIName`='AggressorAI' WHERE `entry`=27131;
diff --git a/sql/updates/world/2011_03_10_03_world_creature_loot_template.sql b/sql/updates/world/2011_03_10_03_world_creature_loot_template.sql
new file mode 100644
index 00000000000..73aeb530380
--- /dev/null
+++ b/sql/updates/world/2011_03_10_03_world_creature_loot_template.sql
@@ -0,0 +1,2 @@
+-- Use correct item for Tharon'ja quest item drop (Prophet's Enchanted Tiki)
+UPDATE `creature_loot_template` SET `item`=43670 WHERE `entry`=31360 AND `item`=13249;
diff --git a/sql/updates/world/2011_03_10_04_world_disables.sql b/sql/updates/world/2011_03_10_04_world_disables.sql
new file mode 100644
index 00000000000..875d02a08ba
--- /dev/null
+++ b/sql/updates/world/2011_03_10_04_world_disables.sql
@@ -0,0 +1,7 @@
+-- disable untill it can be properly scripted
+DELETE FROM `disables` WHERE `sourceType`=4 AND `entry` IN (7020,7021);
+INSERT INTO `disables`
+(`sourceType`,`entry`,`flags`,`params_0`,`params_1`,`comment`)
+VALUES
+(4,7020,0, '', '', 'disable Not In My House'),
+(4,7021,0, '', '', 'disable Not In My House');
diff --git a/sql/updates/world/2011_03_10_05_world_creature_questrelation.sql b/sql/updates/world/2011_03_10_05_world_creature_questrelation.sql
new file mode 100644
index 00000000000..21f73f30752
--- /dev/null
+++ b/sql/updates/world/2011_03_10_05_world_creature_questrelation.sql
@@ -0,0 +1,4 @@
+-- Wrong start/end NPCs for Caverns of Time Chain:
+-- Andormu(man) should be Andormu(child)
+UPDATE `creature_involvedrelation` SET `id`=20130 WHERE `quest`IN(10285,10298); 
+UPDATE `creature_questrelation` SET `id`=20130 WHERE `quest`=10296;
diff --git a/sql/updates/world/2011_03_10_06_world_conditions.sql b/sql/updates/world/2011_03_10_06_world_conditions.sql
new file mode 100644
index 00000000000..0c1fb9dddab
--- /dev/null
+++ b/sql/updates/world/2011_03_10_06_world_conditions.sql
@@ -0,0 +1,5 @@
+-- condition for Faerie Fire bonus (only in bear form)
+DELETE FROM `conditions` WHERE `SourceEntry` =60089;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(17,0,60089,0,1,5487,0,0,0, '', 'Faerie Fire - Bear Form'),
+(17,0,60089,1,1,9634,0,0,0, '', 'Faerie Fire - Dire Bear Form');
diff --git a/sql/updates/world/2011_03_10_07_world_conditions.sql b/sql/updates/world/2011_03_10_07_world_conditions.sql
new file mode 100644
index 00000000000..fd5bc79146f
--- /dev/null
+++ b/sql/updates/world/2011_03_10_07_world_conditions.sql
@@ -0,0 +1 @@
+DELETE FROM `conditions` WHERE `SourceGroup`=31360 AND `SourceEntry`=13249;
diff --git a/sql/updates/world/2011_03_10_08_world_spell_script_names.sql b/sql/updates/world/2011_03_10_08_world_spell_script_names.sql
new file mode 100644
index 00000000000..28598e0d313
--- /dev/null
+++ b/sql/updates/world/2011_03_10_08_world_spell_script_names.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_script_names` WHERE `spell_id`=48917;
+INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
+(48917, 'spell_q10041_q10040_who_are_they');
diff --git a/sql/updates/world/2011_03_10_09_world_sai.sql b/sql/updates/world/2011_03_10_09_world_sai.sql
new file mode 100644
index 00000000000..e6e903d1ef7
--- /dev/null
+++ b/sql/updates/world/2011_03_10_09_world_sai.sql
@@ -0,0 +1,55 @@
+DELETE FROM `gossip_menu` WHERE `entry` IN (7757,7758,7759,7760,7761,7772,21253,7775,7776,7755,7774);
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES
+(7757,9497),
+(7758,9503),
+(7759,9502),
+(7760,9505),
+(7761,9506),
+(7772,9520),
+(21253,9520),
+(7775,9523),
+(7776,9524),
+(7755,9498),
+(7774,9522);
+
+UPDATE `creature_template` SET `gossip_menu_id`=7774 WHERE `entry`=18712;
+UPDATE `creature_template` SET `gossip_menu_id`=7775 WHERE `entry`=17088;
+UPDATE `creature_template` SET `gossip_menu_id`=7776 WHERE `entry`=18720;
+UPDATE `creature_template` SET `gossip_menu_id`=7775 WHERE `entry`=16519;
+UPDATE `creature_template` SET `gossip_menu_id`=7772 WHERE `entry`=18714;
+UPDATE `creature_template` SET `gossip_menu_id`=21253 WHERE `entry`=18715;
+UPDATE `creature_template` SET `gossip_menu_id`=7759 WHERE `entry`=18716;
+UPDATE `creature_template` SET `gossip_menu_id`=7757 WHERE `entry`=18717;
+UPDATE `creature_template` SET `gossip_menu_id`=7760 WHERE `entry`=18719;
+
+DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (7772,21253,7757,7759,7760);
+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
+(7772,0,0, 'Scout Neftis, I need another disguise.',1,1,0,0,0,0,0,NULL),
+(21253,0,0, 'Private Weeks, I need another disguise.',1,1,0,0,0,0,0,NULL),
+(7757,0,0, 'Why are you fixing all of this up?',1,1,7755,0,0,0,0,NULL),
+(7759,0,0, 'What are you doing there?',1,1,7758,0,0,0,0,NULL),
+(7760,0,0, 'Advisor, what''s the latest news?',1,1,7761,0,0,0,0,NULL);
+
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry` IN (18714,18717,18716,18719,18715);
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (18714,18717,18716,18719,18715);
+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
+(18714,0,0,0,19,0,100,0,10041,0,0,0,11,48917,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Neftis - On Quest Accept - Cast spell 48917 on player'),
+(18714,0,1,0,20,0,100,0,10041,0,0,0,28,32756,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Neftis - On Quest Reward - Remove spell 32756 on player'),
+(18714,0,2,0,62,0,100,0,7772,0,0,0,11,48917,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Neftis - On Gossip option - Cast spell 48917 on player'),
+(18715,0,0,0,19,0,100,0,10040,0,0,0,11,48917,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Private Weeks - On Quest Accept - Cast spell 48917 on player'),
+(18715,0,1,0,20,0,100,0,10040,0,0,0,28,32756,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Private Weeks - On Quest Reward - Remove spell 32756 on player'),
+(18715,0,2,0,62,0,100,0,21253,0,0,0,11,48917,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Private Week - On Gossip option - Cast spell 48917 on player'),
+(18717,0,0,0,62,0,100,0,7757,0,0,0,11,47069,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Who Are They - Shadowy Laborer - On Gossip option - Cast spell 47069 on player'),
+(18716,0,0,0,62,0,100,0,7759,0,0,0,11,47068,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Who Are They - Shadowy Initiate - On Gossip option - Cast spell 47068 on player'),
+(18719,0,0,0,62,0,100,0,7760,0,0,0,11,47070,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Who Are They - Shadowy Advisor - On Gossip option - Cast spell 47070 on player');
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup` IN (7772,7757,7759,7760,21253);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`Comment`) VALUES
+(15,21253,0,0,9,10040,0,0,0, 'Show gossip option 21253 if player has quest 10040'),
+(15,7757,0,0,9,10040,0,0,0, 'Show gossip option 7757 if player has quest 10040'),
+(15,7759,0,0,9,10040,0,0,0, 'Show gossip option 7759 if player has quest 10040'),
+(15,7760,0,0,9,10040,0,0,0, 'Show gossip option 7760 if player has quest 10040'),
+(15,7772,0,1,9,10041,0,0,0, 'Show gossip option 7772 if player has quest 10041'),
+(15,7757,0,1,9,10041,0,0,0, 'Show gossip option 7757 if player has quest 10041'),
+(15,7759,0,1,9,10041,0,0,0, 'Show gossip option 7759 if player has quest 10041'),
+(15,7760,0,1,9,10041,0,0,0, 'Show gossip option 7760 if player has quest 10041');
diff --git a/sql/updates/world/2011_03_10_0_world_creatures.sql b/sql/updates/world/2011_03_10_0_world_creatures.sql
deleted file mode 100644
index d68a13999bf..00000000000
--- a/sql/updates/world/2011_03_10_0_world_creatures.sql
+++ /dev/null
@@ -1,10 +0,0 @@
-UPDATE `creature_template` SET `flags_extra`=((`flags_extra`|128)&~2) WHERE `entry` IN (38153,26043,37181,37702,37183,36848,37547,37519,37215,38463,38319,38879); -- Various triggers in ICC
-
--- Delete gunship spawns
-DELETE FROM `creature` WHERE `id` IN (37547,37519,37215,36971,37227,36961,36969,36950,37116,36978,37540,37488);
-
-DELETE FROM `creature_template_addon` WHERE `entry`=38463;
-INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
-(38463,0,0,1,0, '72100 0'); -- Empowering Orb Visual Stalker
-
-UPDATE `gameobject_template` SET `faction`=35, `flags`=16 WHERE `entry`=201741; -- Empowering Blood Orb
diff --git a/sql/updates/world/2011_03_10_1_world_pool_quest.sql b/sql/updates/world/2011_03_10_1_world_pool_quest.sql
deleted file mode 100644
index 34ebc7a9eab..00000000000
--- a/sql/updates/world/2011_03_10_1_world_pool_quest.sql
+++ /dev/null
@@ -1,45 +0,0 @@
--- ICC Quest pools
-SET @pool := 5679;
-DELETE FROM `pool_quest` WHERE `pool_entry` BETWEEN @pool AND @pool+11;
-DELETE FROM `pool_template` WHERE `entry` BETWEEN @pool AND @pool+11;
-DELETE FROM `pool_pool` WHERE `mother_pool` IN (@pool,@pool+1);
-
-INSERT INTO `pool_quest` (`entry`,`pool_entry`,`description`) VALUES
-(24874,@pool+02, 'Blood Quickening (10)'),
-(24869,@pool+03, 'Deprogramming (10)'),
-(24873,@pool+04, 'Residue Rendezvous (10)'),
-(24872,@pool+05, 'Respite for a Tormented Soul (10)'),
-(24870,@pool+06, 'Securing the Ramparts HORDE (10)'),
-(24871,@pool+06, 'Securing the Ramparts ALLY (10)'),
-(24879,@pool+07, 'Blood Quickening (25)'),
-(24875,@pool+08, 'Deprogramming (25)'),
-(24878,@pool+09, 'Residue Rendezvous (25)'),
-(24880,@pool+10, 'Respite for a Tormented Soul (25)'),
-(24876,@pool+11, 'Securing the Ramparts ALLY (25)'),
-(24877,@pool+11, 'Securing the Ramparts HORDE (25)');
-
-INSERT INTO `pool_template` (`entry`,`max_limit`,`description`) VALUES
-(@pool+00,1, 'General ICC 10man pool'),
-(@pool+01,1, 'General ICC 25man pool'),
-(@pool+02,1, 'Blood Quickening (10)'),
-(@pool+03,1, 'Deprogramming (10)'),
-(@pool+04,1, 'Residue Rendezvous (10)'),
-(@pool+05,1, 'Respite for a Tormented Soul (10)'),
-(@pool+06,2, 'Securing the Ramparts (10)'),
-(@pool+07,1, 'Blood Quickening (25)'),
-(@pool+08,1, 'Deprogramming (25)'),
-(@pool+09,1, 'Residue Rendezvous (25)'),
-(@pool+10,1, 'Respite for a Tormented Soul (25)'),
-(@pool+11,2, 'Securing the Ramparts (25)');
-
-INSERT INTO `pool_pool` (`pool_id`,`mother_pool`,`chance`,`description`) VALUES
-(@pool+02,@pool+00,0, 'Blood Quickening (10)'),
-(@pool+03,@pool+00,0, 'Deprogramming (10)'),
-(@pool+04,@pool+00,0, 'Residue Rendezvous (10)'),
-(@pool+05,@pool+00,0, 'Respite for a Tormented Soul (10)'),
-(@pool+06,@pool+00,0, 'Securing the Ramparts (10)'),
-(@pool+07,@pool+01,0, 'Blood Quickening (25)'),
-(@pool+08,@pool+01,0, 'Deprogramming (25)'),
-(@pool+09,@pool+01,0, 'Residue Rendezvous (25)'),
-(@pool+10,@pool+01,0, 'Respite for a Tormented Soul (25)'),
-(@pool+11,@pool+01,0, 'Securing the Ramparts (25)');
diff --git a/sql/updates/world/2011_03_10_2_world_creature_template.sql b/sql/updates/world/2011_03_10_2_world_creature_template.sql
deleted file mode 100644
index 6e509bfd3a2..00000000000
--- a/sql/updates/world/2011_03_10_2_world_creature_template.sql
+++ /dev/null
@@ -1,2 +0,0 @@
--- Overide AI
-UPDATE `creature_template` SET `AIName`='AggressorAI' WHERE `entry`=27131;
diff --git a/sql/updates/world/2011_03_10_3_world_creature_loot_template.sql b/sql/updates/world/2011_03_10_3_world_creature_loot_template.sql
deleted file mode 100644
index 73aeb530380..00000000000
--- a/sql/updates/world/2011_03_10_3_world_creature_loot_template.sql
+++ /dev/null
@@ -1,2 +0,0 @@
--- Use correct item for Tharon'ja quest item drop (Prophet's Enchanted Tiki)
-UPDATE `creature_loot_template` SET `item`=43670 WHERE `entry`=31360 AND `item`=13249;
diff --git a/sql/updates/world/2011_03_10_4_world_disables.sql b/sql/updates/world/2011_03_10_4_world_disables.sql
deleted file mode 100644
index 875d02a08ba..00000000000
--- a/sql/updates/world/2011_03_10_4_world_disables.sql
+++ /dev/null
@@ -1,7 +0,0 @@
--- disable untill it can be properly scripted
-DELETE FROM `disables` WHERE `sourceType`=4 AND `entry` IN (7020,7021);
-INSERT INTO `disables`
-(`sourceType`,`entry`,`flags`,`params_0`,`params_1`,`comment`)
-VALUES
-(4,7020,0, '', '', 'disable Not In My House'),
-(4,7021,0, '', '', 'disable Not In My House');
diff --git a/sql/updates/world/2011_03_10_5_world_creature_questrelation.sql b/sql/updates/world/2011_03_10_5_world_creature_questrelation.sql
deleted file mode 100644
index 21f73f30752..00000000000
--- a/sql/updates/world/2011_03_10_5_world_creature_questrelation.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- Wrong start/end NPCs for Caverns of Time Chain:
--- Andormu(man) should be Andormu(child)
-UPDATE `creature_involvedrelation` SET `id`=20130 WHERE `quest`IN(10285,10298); 
-UPDATE `creature_questrelation` SET `id`=20130 WHERE `quest`=10296;
diff --git a/sql/updates/world/2011_03_10_6_world_conditions.sql b/sql/updates/world/2011_03_10_6_world_conditions.sql
deleted file mode 100644
index 0c1fb9dddab..00000000000
--- a/sql/updates/world/2011_03_10_6_world_conditions.sql
+++ /dev/null
@@ -1,5 +0,0 @@
--- condition for Faerie Fire bonus (only in bear form)
-DELETE FROM `conditions` WHERE `SourceEntry` =60089;
-INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
-(17,0,60089,0,1,5487,0,0,0, '', 'Faerie Fire - Bear Form'),
-(17,0,60089,1,1,9634,0,0,0, '', 'Faerie Fire - Dire Bear Form');
diff --git a/sql/updates/world/2011_03_10_7_world_conditions.sql b/sql/updates/world/2011_03_10_7_world_conditions.sql
deleted file mode 100644
index fd5bc79146f..00000000000
--- a/sql/updates/world/2011_03_10_7_world_conditions.sql
+++ /dev/null
@@ -1 +0,0 @@
-DELETE FROM `conditions` WHERE `SourceGroup`=31360 AND `SourceEntry`=13249;
diff --git a/sql/updates/world/2011_03_10_8_world_spell_script_names.sql b/sql/updates/world/2011_03_10_8_world_spell_script_names.sql
deleted file mode 100644
index 28598e0d313..00000000000
--- a/sql/updates/world/2011_03_10_8_world_spell_script_names.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-DELETE FROM `spell_script_names` WHERE `spell_id`=48917;
-INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
-(48917, 'spell_q10041_q10040_who_are_they');
diff --git a/sql/updates/world/2011_03_10_9_world_sai.sql b/sql/updates/world/2011_03_10_9_world_sai.sql
deleted file mode 100644
index e6e903d1ef7..00000000000
--- a/sql/updates/world/2011_03_10_9_world_sai.sql
+++ /dev/null
@@ -1,55 +0,0 @@
-DELETE FROM `gossip_menu` WHERE `entry` IN (7757,7758,7759,7760,7761,7772,21253,7775,7776,7755,7774);
-INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES
-(7757,9497),
-(7758,9503),
-(7759,9502),
-(7760,9505),
-(7761,9506),
-(7772,9520),
-(21253,9520),
-(7775,9523),
-(7776,9524),
-(7755,9498),
-(7774,9522);
-
-UPDATE `creature_template` SET `gossip_menu_id`=7774 WHERE `entry`=18712;
-UPDATE `creature_template` SET `gossip_menu_id`=7775 WHERE `entry`=17088;
-UPDATE `creature_template` SET `gossip_menu_id`=7776 WHERE `entry`=18720;
-UPDATE `creature_template` SET `gossip_menu_id`=7775 WHERE `entry`=16519;
-UPDATE `creature_template` SET `gossip_menu_id`=7772 WHERE `entry`=18714;
-UPDATE `creature_template` SET `gossip_menu_id`=21253 WHERE `entry`=18715;
-UPDATE `creature_template` SET `gossip_menu_id`=7759 WHERE `entry`=18716;
-UPDATE `creature_template` SET `gossip_menu_id`=7757 WHERE `entry`=18717;
-UPDATE `creature_template` SET `gossip_menu_id`=7760 WHERE `entry`=18719;
-
-DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (7772,21253,7757,7759,7760);
-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
-(7772,0,0, 'Scout Neftis, I need another disguise.',1,1,0,0,0,0,0,NULL),
-(21253,0,0, 'Private Weeks, I need another disguise.',1,1,0,0,0,0,0,NULL),
-(7757,0,0, 'Why are you fixing all of this up?',1,1,7755,0,0,0,0,NULL),
-(7759,0,0, 'What are you doing there?',1,1,7758,0,0,0,0,NULL),
-(7760,0,0, 'Advisor, what''s the latest news?',1,1,7761,0,0,0,0,NULL);
-
-UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry` IN (18714,18717,18716,18719,18715);
-DELETE FROM `smart_scripts` WHERE `entryorguid` IN (18714,18717,18716,18719,18715);
-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
-(18714,0,0,0,19,0,100,0,10041,0,0,0,11,48917,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Neftis - On Quest Accept - Cast spell 48917 on player'),
-(18714,0,1,0,20,0,100,0,10041,0,0,0,28,32756,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Neftis - On Quest Reward - Remove spell 32756 on player'),
-(18714,0,2,0,62,0,100,0,7772,0,0,0,11,48917,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Neftis - On Gossip option - Cast spell 48917 on player'),
-(18715,0,0,0,19,0,100,0,10040,0,0,0,11,48917,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Private Weeks - On Quest Accept - Cast spell 48917 on player'),
-(18715,0,1,0,20,0,100,0,10040,0,0,0,28,32756,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Private Weeks - On Quest Reward - Remove spell 32756 on player'),
-(18715,0,2,0,62,0,100,0,21253,0,0,0,11,48917,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Private Week - On Gossip option - Cast spell 48917 on player'),
-(18717,0,0,0,62,0,100,0,7757,0,0,0,11,47069,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Who Are They - Shadowy Laborer - On Gossip option - Cast spell 47069 on player'),
-(18716,0,0,0,62,0,100,0,7759,0,0,0,11,47068,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Who Are They - Shadowy Initiate - On Gossip option - Cast spell 47068 on player'),
-(18719,0,0,0,62,0,100,0,7760,0,0,0,11,47070,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Who Are They - Shadowy Advisor - On Gossip option - Cast spell 47070 on player');
-
-DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup` IN (7772,7757,7759,7760,21253);
-INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`Comment`) VALUES
-(15,21253,0,0,9,10040,0,0,0, 'Show gossip option 21253 if player has quest 10040'),
-(15,7757,0,0,9,10040,0,0,0, 'Show gossip option 7757 if player has quest 10040'),
-(15,7759,0,0,9,10040,0,0,0, 'Show gossip option 7759 if player has quest 10040'),
-(15,7760,0,0,9,10040,0,0,0, 'Show gossip option 7760 if player has quest 10040'),
-(15,7772,0,1,9,10041,0,0,0, 'Show gossip option 7772 if player has quest 10041'),
-(15,7757,0,1,9,10041,0,0,0, 'Show gossip option 7757 if player has quest 10041'),
-(15,7759,0,1,9,10041,0,0,0, 'Show gossip option 7759 if player has quest 10041'),
-(15,7760,0,1,9,10041,0,0,0, 'Show gossip option 7760 if player has quest 10041');
diff --git a/sql/updates/world/2011_03_11_00_world_sai.sql b/sql/updates/world/2011_03_11_00_world_sai.sql
new file mode 100644
index 00000000000..0d7e13da7cf
--- /dev/null
+++ b/sql/updates/world/2011_03_11_00_world_sai.sql
@@ -0,0 +1,27 @@
+DELETE FROM `creature` WHERE `guid`=201309; -- duplicate spawn
+UPDATE `creature_template` SET `InhabitType`=7 WHERE `entry` IN (37181,37183);
+
+DELETE FROM `creature_text` WHERE `entry` IN (37119,37181,37183);
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(37119,0,0, 'This is our final stand. What happens here will echo through the ages. Regardless of outcome, they will know that we fought with honor. That we fought for the freedom and safety of our people!',1,0,0,22,0,16653, 'Highlord Tirion Fordring - SAY_TIRION_INTRO_1'),
+(37119,1,0, 'Remember, heroes, fear is your greatest enemy in these befouled halls. Steel your heart and your soul will shine brighter than a thousand suns. The enemy will falter at the sight of you. They will fall as the light of righteousness envelops them!',1,0,0,22,0,16654, 'Highlord Tirion Fordring - SAY_TIRION_INTRO_2'),
+(37119,2,0, 'Our march upon Icecrown Citadel begins now!',1,0,0,22,0,16655, 'Highlord Tirion Fordring - SAY_TIRION_INTRO_3'),
+(37119,3,0, 'ARTHAS! I swore that I would see you dead and the Scourge dismantled! I''m going to finish what I started at Light''s Hope!',1,0,0,22,0,16656, 'Highlord Tirion Fordring - SAY_TIRION_INTRO_4'),
+(37181,0,0, 'You now stand upon the hallowed ground of the Scourge. The Light won''t protect you here, paladin. Nothing will protect you...',1,0,0,0,0,17230, 'The Lich King - SAY_LK_INTRO_1'),
+(37181,1,0, 'You could have been my greatest champion, Fordring: A force of darkness that would wash over this world and deliver it into a new age of strife.',1,0,0,0,0,17231, 'The Lich King - SAY_LK_INTRO_2'),
+(37181,2,0, 'But that honor is no longer yours. Soon,I will have a new champion.',1,0,0,0,0,17232, 'The Lich King - SAY_LK_INTRO_3'),
+(37181,3,0, 'The breaking of this one has been taxing. The atrocities I have committed upon his soul. He has resisted for so long, but he will bow down before his king soon.',1,0,0,0,0,17233, 'The Lich King - SAY_LK_INTRO_4'),
+(37181,4,0, 'In the end, you will all serve me.',1,0,0,0,0,17234, 'The Lich King - SAY_LK_INTRO_5'),
+(37183,0,0, 'NEVER! I... I will never... serve... you...',1,0,0,0,0,17078, 'Highlord Bolvar Fordragon - SAY_BOLVAR_INTRO_1');
+
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=37011; -- The Damned
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (-200966,-201066,37011);
+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
+(-201066,0,0,0,6,0,100,1,0,0,0,0,11,70961,3,0,0,0,0,1,0,0,0,0,0,0,0, 'The Damned - Cast Shattered Bones on death'),
+(-201066,0,1,0,2,0,100,0,5,30,15000,20000,75,70960,0,0,0,0,0,1,0,0,0,0,0,0,0, 'The Damned - Cast Bone Flurry at 5-30%'),
+(-201066,0,2,0,6,0,100,1,0,0,0,0,45,1,1,0,0,0,0,10,201466,0,0,0,0,0,0, 'The Damned - Set data for Highlord Tirion Fordring'),
+(-200966,0,0,0,6,0,100,1,0,0,0,0,11,70961,3,0,0,0,0,1,0,0,0,0,0,0,0, 'The Damned - Cast Shattered Bones on death'),
+(-200966,0,1,0,2,0,100,0,5,30,15000,20000,75,70960,0,0,0,0,0,1,0,0,0,0,0,0,0, 'The Damned - Cast Bone Flurry at 5-30%'),
+(-200966,0,2,0,6,0,100,1,0,0,0,0,45,1,1,0,0,0,0,10,201466,0,0,0,0,0,0, 'The Damned - Set data for Highlord Tirion Fordring'),
+(37011,0,0,0,6,0,100,1,0,0,0,0,11,70961,3,0,0,0,0,1,0,0,0,0,0,0,0, 'The Damned - Cast Shattered Bones on death'),
+(37011,0,1,0,2,0,100,0,5,30,15000,20000,75,70960,0,0,0,0,0,1,0,0,0,0,0,0,0, 'The Damned - Cast Bone Flurry at 5-30%');
diff --git a/sql/updates/world/2011_03_11_00_world_scriptname.sql b/sql/updates/world/2011_03_11_00_world_scriptname.sql
new file mode 100644
index 00000000000..74f3d0f04ba
--- /dev/null
+++ b/sql/updates/world/2011_03_11_00_world_scriptname.sql
@@ -0,0 +1 @@
+UPDATE `creature_template` SET `ScriptName`='npc_highlord_tirion_fordring_lh' WHERE `entry`=37119;
diff --git a/sql/updates/world/2011_03_11_01_world_sai.sql b/sql/updates/world/2011_03_11_01_world_sai.sql
new file mode 100644
index 00000000000..ac4a83433c4
--- /dev/null
+++ b/sql/updates/world/2011_03_11_01_world_sai.sql
@@ -0,0 +1,45 @@
+UPDATE `creature_template` SET `InhabitType`=7 WHERE `entry`=38153;
+UPDATE `creature_template` SET `npcflag`=0 WHERE `entry` IN (37187,37200);
+UPDATE `creature` SET `npcflag`=0 WHERE `id` IN (37187,37200);
+UPDATE `creature` SET `npcflag`=`npcflag`|1 WHERE `guid`=200982; -- Set gossip flag for spawn at Deathbringer's Rise
+
+DELETE FROM `creature_text` WHERE `entry`=37187 AND `groupid` BETWEEN 15 AND 18;
+DELETE FROM `creature_text` WHERE `entry`=37200 AND `groupid` BETWEEN 13 AND 15;
+DELETE FROM `creature_text` WHERE `entry`=37119 AND `groupid` IN (4,5);
+DELETE FROM `creature_text` WHERE `entry`=37181 AND `groupid`=2;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(37187,15,0, 'The paladin still lives? Is it possible, Highlord? Could he have survived?',0,0,0,6,0,17107, 'High Overlord Saurfang - SAY_SAURFANG_INTRO_1'),
+(37187,16,0, 'Then we must save him! If we rescue Bolvar Fordragon, we may quell the unrest between the Alliance and the Horde.',0,0,0,5,0,17108, 'High Overlord Saurfang - SAY_SAURFANG_INTRO_2'),
+(37187,17,0, 'Our mission is now clear: The Lich King will answer for his crimes and we will save Highlord Bolvar Fordragon!',0,0,0,15,0,17109, 'High Overlord Saurfang - SAY_SAURFANG_INTRO_3'),
+(37187,18,0, 'Kor''kron, prepare Orgrim''s Hammer for its final voyage! Champions, our gunship will find a point to dock on the upper reaches of the citadel. Meet us there!',1,0,0,22,0,17110, 'High Overlord Saurfang - SAY_SAURFANG_INTRO_4'),
+(37119,4,0, 'The power of the Light knows no bounds, Saurfang. His soul is under great strain, but he lives - for now.',0,0,0,1,0,16658, 'Highlord Tirion Fordring - SAY_TIRION_INTRO_5'),
+(37181,2,0, 'But that honor is no longer yours. Soon, I will have a new champion.',1,0,0,0,0,17232, 'The Lich King - SAY_LK_INTRO_3'),
+(37200,13,0, 'Could it be, Lord Fordring? If Bolvar lives, mayhap there is hope fer peace between the Alliance and the Horde. We must reach the top o'' this cursed place and free the paladin!',0,0,0,6,0,16980, 'Muradin Bronzebeard - SAY_SAURFANG_INTRO_2'),
+(37200,14,0, 'Prepare the Skybreaker fer an aerial assault on the citadel!',1,0,0,5,0,16981, 'Muradin Bronzebeard - SAY_SAURFANG_INTRO_3'),
+(37200,15,0, 'Heroes, ye must fight yer way to a clear extraction point within Icecrown. We''ll try an'' rendezvous on the ramparts!',1,0,0,22,0,16982, 'Muradin Bronzebeard - SAY_SAURFANG_INTRO_4'),
+(37119,5,0, 'By the Light, it must be so!',0,0,0,5,0,16657, 'Highlord Tirion Fordring - SAY_TIRION_INTRO_A_5');
+
+SET @GUID := 200984;
+SET @PATH_ID := @GUID*10;
+DELETE FROM `waypoint_data` WHERE `id`=@PATH_ID;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH_ID,0,-39.2257,2211.269,27.90252,0,0,0,100,0),
+(@PATH_ID,1,-27.3663,2211.575,30.11564,0,0,0,100,0),
+(@PATH_ID,2,-15.8420,2211.618,30.11566,0,0,0,100,0),
+(@PATH_ID,3,2.744797,2211.411,30.11566,0,0,0,100,0),
+(@PATH_ID,4,24.05210,2211.306,30.11566,0,0,0,100,0),
+(@PATH_ID,5,64.72570,2211.561,30.11567,0,0,0,100,0);
+
+DELETE FROM `creature_formations` WHERE `leaderGUID`=@GUID;
+INSERT INTO `creature_formations` (`leaderGUID`,`memberGUID`,`dist`,`angle`,`groupAI`) VALUES
+(@GUID,@GUID,0,0,0),
+(@GUID,201185,2.72779,127.636,0),
+(@GUID,200979,5.34512,256.1602,0),
+(@GUID,200889,3.59949,206.7455,0);
+
+DELETE FROM `linked_respawn` WHERE `linkedGuid`=@GUID AND `linkType`=0;
+INSERT INTO `linked_respawn` (`guid`,`linkedGuid`,`linkType`) VALUES
+(201185,@GUID,0),
+(200979,@GUID,0),
+(200889,@GUID,0),
+(@GUID,@GUID,0);
diff --git a/sql/updates/world/2011_03_11_02_world_trinity_string.sql b/sql/updates/world/2011_03_11_02_world_trinity_string.sql
new file mode 100644
index 00000000000..925873f5d6f
--- /dev/null
+++ b/sql/updates/world/2011_03_11_02_world_trinity_string.sql
@@ -0,0 +1,6 @@
+UPDATE `trinity_string` SET `content_default` = 'Player selected NPC
+DB GUID: %u, current GUID: %u.
+Faction: %u.
+npcFlags: %u.
+Entry: %u.
+DisplayID: %u (Native: %u).' WHERE `entry` = 539;
diff --git a/sql/updates/world/2011_03_11_0_world_sai.sql b/sql/updates/world/2011_03_11_0_world_sai.sql
deleted file mode 100644
index 0d7e13da7cf..00000000000
--- a/sql/updates/world/2011_03_11_0_world_sai.sql
+++ /dev/null
@@ -1,27 +0,0 @@
-DELETE FROM `creature` WHERE `guid`=201309; -- duplicate spawn
-UPDATE `creature_template` SET `InhabitType`=7 WHERE `entry` IN (37181,37183);
-
-DELETE FROM `creature_text` WHERE `entry` IN (37119,37181,37183);
-INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
-(37119,0,0, 'This is our final stand. What happens here will echo through the ages. Regardless of outcome, they will know that we fought with honor. That we fought for the freedom and safety of our people!',1,0,0,22,0,16653, 'Highlord Tirion Fordring - SAY_TIRION_INTRO_1'),
-(37119,1,0, 'Remember, heroes, fear is your greatest enemy in these befouled halls. Steel your heart and your soul will shine brighter than a thousand suns. The enemy will falter at the sight of you. They will fall as the light of righteousness envelops them!',1,0,0,22,0,16654, 'Highlord Tirion Fordring - SAY_TIRION_INTRO_2'),
-(37119,2,0, 'Our march upon Icecrown Citadel begins now!',1,0,0,22,0,16655, 'Highlord Tirion Fordring - SAY_TIRION_INTRO_3'),
-(37119,3,0, 'ARTHAS! I swore that I would see you dead and the Scourge dismantled! I''m going to finish what I started at Light''s Hope!',1,0,0,22,0,16656, 'Highlord Tirion Fordring - SAY_TIRION_INTRO_4'),
-(37181,0,0, 'You now stand upon the hallowed ground of the Scourge. The Light won''t protect you here, paladin. Nothing will protect you...',1,0,0,0,0,17230, 'The Lich King - SAY_LK_INTRO_1'),
-(37181,1,0, 'You could have been my greatest champion, Fordring: A force of darkness that would wash over this world and deliver it into a new age of strife.',1,0,0,0,0,17231, 'The Lich King - SAY_LK_INTRO_2'),
-(37181,2,0, 'But that honor is no longer yours. Soon,I will have a new champion.',1,0,0,0,0,17232, 'The Lich King - SAY_LK_INTRO_3'),
-(37181,3,0, 'The breaking of this one has been taxing. The atrocities I have committed upon his soul. He has resisted for so long, but he will bow down before his king soon.',1,0,0,0,0,17233, 'The Lich King - SAY_LK_INTRO_4'),
-(37181,4,0, 'In the end, you will all serve me.',1,0,0,0,0,17234, 'The Lich King - SAY_LK_INTRO_5'),
-(37183,0,0, 'NEVER! I... I will never... serve... you...',1,0,0,0,0,17078, 'Highlord Bolvar Fordragon - SAY_BOLVAR_INTRO_1');
-
-UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=37011; -- The Damned
-DELETE FROM `smart_scripts` WHERE `entryorguid` IN (-200966,-201066,37011);
-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
-(-201066,0,0,0,6,0,100,1,0,0,0,0,11,70961,3,0,0,0,0,1,0,0,0,0,0,0,0, 'The Damned - Cast Shattered Bones on death'),
-(-201066,0,1,0,2,0,100,0,5,30,15000,20000,75,70960,0,0,0,0,0,1,0,0,0,0,0,0,0, 'The Damned - Cast Bone Flurry at 5-30%'),
-(-201066,0,2,0,6,0,100,1,0,0,0,0,45,1,1,0,0,0,0,10,201466,0,0,0,0,0,0, 'The Damned - Set data for Highlord Tirion Fordring'),
-(-200966,0,0,0,6,0,100,1,0,0,0,0,11,70961,3,0,0,0,0,1,0,0,0,0,0,0,0, 'The Damned - Cast Shattered Bones on death'),
-(-200966,0,1,0,2,0,100,0,5,30,15000,20000,75,70960,0,0,0,0,0,1,0,0,0,0,0,0,0, 'The Damned - Cast Bone Flurry at 5-30%'),
-(-200966,0,2,0,6,0,100,1,0,0,0,0,45,1,1,0,0,0,0,10,201466,0,0,0,0,0,0, 'The Damned - Set data for Highlord Tirion Fordring'),
-(37011,0,0,0,6,0,100,1,0,0,0,0,11,70961,3,0,0,0,0,1,0,0,0,0,0,0,0, 'The Damned - Cast Shattered Bones on death'),
-(37011,0,1,0,2,0,100,0,5,30,15000,20000,75,70960,0,0,0,0,0,1,0,0,0,0,0,0,0, 'The Damned - Cast Bone Flurry at 5-30%');
diff --git a/sql/updates/world/2011_03_11_0_world_scriptname.sql b/sql/updates/world/2011_03_11_0_world_scriptname.sql
deleted file mode 100644
index 74f3d0f04ba..00000000000
--- a/sql/updates/world/2011_03_11_0_world_scriptname.sql
+++ /dev/null
@@ -1 +0,0 @@
-UPDATE `creature_template` SET `ScriptName`='npc_highlord_tirion_fordring_lh' WHERE `entry`=37119;
diff --git a/sql/updates/world/2011_03_11_1_world_sai.sql b/sql/updates/world/2011_03_11_1_world_sai.sql
deleted file mode 100644
index ac4a83433c4..00000000000
--- a/sql/updates/world/2011_03_11_1_world_sai.sql
+++ /dev/null
@@ -1,45 +0,0 @@
-UPDATE `creature_template` SET `InhabitType`=7 WHERE `entry`=38153;
-UPDATE `creature_template` SET `npcflag`=0 WHERE `entry` IN (37187,37200);
-UPDATE `creature` SET `npcflag`=0 WHERE `id` IN (37187,37200);
-UPDATE `creature` SET `npcflag`=`npcflag`|1 WHERE `guid`=200982; -- Set gossip flag for spawn at Deathbringer's Rise
-
-DELETE FROM `creature_text` WHERE `entry`=37187 AND `groupid` BETWEEN 15 AND 18;
-DELETE FROM `creature_text` WHERE `entry`=37200 AND `groupid` BETWEEN 13 AND 15;
-DELETE FROM `creature_text` WHERE `entry`=37119 AND `groupid` IN (4,5);
-DELETE FROM `creature_text` WHERE `entry`=37181 AND `groupid`=2;
-INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
-(37187,15,0, 'The paladin still lives? Is it possible, Highlord? Could he have survived?',0,0,0,6,0,17107, 'High Overlord Saurfang - SAY_SAURFANG_INTRO_1'),
-(37187,16,0, 'Then we must save him! If we rescue Bolvar Fordragon, we may quell the unrest between the Alliance and the Horde.',0,0,0,5,0,17108, 'High Overlord Saurfang - SAY_SAURFANG_INTRO_2'),
-(37187,17,0, 'Our mission is now clear: The Lich King will answer for his crimes and we will save Highlord Bolvar Fordragon!',0,0,0,15,0,17109, 'High Overlord Saurfang - SAY_SAURFANG_INTRO_3'),
-(37187,18,0, 'Kor''kron, prepare Orgrim''s Hammer for its final voyage! Champions, our gunship will find a point to dock on the upper reaches of the citadel. Meet us there!',1,0,0,22,0,17110, 'High Overlord Saurfang - SAY_SAURFANG_INTRO_4'),
-(37119,4,0, 'The power of the Light knows no bounds, Saurfang. His soul is under great strain, but he lives - for now.',0,0,0,1,0,16658, 'Highlord Tirion Fordring - SAY_TIRION_INTRO_5'),
-(37181,2,0, 'But that honor is no longer yours. Soon, I will have a new champion.',1,0,0,0,0,17232, 'The Lich King - SAY_LK_INTRO_3'),
-(37200,13,0, 'Could it be, Lord Fordring? If Bolvar lives, mayhap there is hope fer peace between the Alliance and the Horde. We must reach the top o'' this cursed place and free the paladin!',0,0,0,6,0,16980, 'Muradin Bronzebeard - SAY_SAURFANG_INTRO_2'),
-(37200,14,0, 'Prepare the Skybreaker fer an aerial assault on the citadel!',1,0,0,5,0,16981, 'Muradin Bronzebeard - SAY_SAURFANG_INTRO_3'),
-(37200,15,0, 'Heroes, ye must fight yer way to a clear extraction point within Icecrown. We''ll try an'' rendezvous on the ramparts!',1,0,0,22,0,16982, 'Muradin Bronzebeard - SAY_SAURFANG_INTRO_4'),
-(37119,5,0, 'By the Light, it must be so!',0,0,0,5,0,16657, 'Highlord Tirion Fordring - SAY_TIRION_INTRO_A_5');
-
-SET @GUID := 200984;
-SET @PATH_ID := @GUID*10;
-DELETE FROM `waypoint_data` WHERE `id`=@PATH_ID;
-INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
-(@PATH_ID,0,-39.2257,2211.269,27.90252,0,0,0,100,0),
-(@PATH_ID,1,-27.3663,2211.575,30.11564,0,0,0,100,0),
-(@PATH_ID,2,-15.8420,2211.618,30.11566,0,0,0,100,0),
-(@PATH_ID,3,2.744797,2211.411,30.11566,0,0,0,100,0),
-(@PATH_ID,4,24.05210,2211.306,30.11566,0,0,0,100,0),
-(@PATH_ID,5,64.72570,2211.561,30.11567,0,0,0,100,0);
-
-DELETE FROM `creature_formations` WHERE `leaderGUID`=@GUID;
-INSERT INTO `creature_formations` (`leaderGUID`,`memberGUID`,`dist`,`angle`,`groupAI`) VALUES
-(@GUID,@GUID,0,0,0),
-(@GUID,201185,2.72779,127.636,0),
-(@GUID,200979,5.34512,256.1602,0),
-(@GUID,200889,3.59949,206.7455,0);
-
-DELETE FROM `linked_respawn` WHERE `linkedGuid`=@GUID AND `linkType`=0;
-INSERT INTO `linked_respawn` (`guid`,`linkedGuid`,`linkType`) VALUES
-(201185,@GUID,0),
-(200979,@GUID,0),
-(200889,@GUID,0),
-(@GUID,@GUID,0);
diff --git a/sql/updates/world/2011_03_11_2_world_trinity_string.sql b/sql/updates/world/2011_03_11_2_world_trinity_string.sql
deleted file mode 100644
index 925873f5d6f..00000000000
--- a/sql/updates/world/2011_03_11_2_world_trinity_string.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-UPDATE `trinity_string` SET `content_default` = 'Player selected NPC
-DB GUID: %u, current GUID: %u.
-Faction: %u.
-npcFlags: %u.
-Entry: %u.
-DisplayID: %u (Native: %u).' WHERE `entry` = 539;
diff --git a/sql/updates/world/2011_03_12_00_world_creature_template.sql b/sql/updates/world/2011_03_12_00_world_creature_template.sql
new file mode 100644
index 00000000000..4356a82443f
--- /dev/null
+++ b/sql/updates/world/2011_03_12_00_world_creature_template.sql
@@ -0,0 +1,43 @@
+/*
+1 	0x0000 0001 	MECHANIC_CHARM 	
+2 	0x0000 0002 	MECHANIC_DISORIENTED 	
+16 	0x0000 0010 	MECHANIC_FEAR 	
+32 	0x0000 0020 	MECHANIC_GRIP 
+64 	0x0000 0040 	MECHANIC_ROOT 
+128 	0x0000 0080 	MECHANIC_PACIFY 	(0 spells use this mechanic)
+256 	0x0000 0100 	MECHANIC_SILENCE 
+512 	0x0000 0200 	MECHANIC_SLEEP 	
+1024 	0x0000 0400 	MECHANIC_SNARE 	
+2048 	0x0000 0800 	MECHANIC_STUN 	
+4096 	0x0000 1000 	MECHANIC_FREEZE 
+8192 	0x0000 2000 	MECHANIC_KNOCKOUT 
+65536 	0x0001 0000 	MECHANIC_POLYMORPH 	
+131072 	0x0002 0000 	MECHANIC_BANISH 
+524288 	0x0008 0000 	MECHANIC_SHACKLE 
+4194304 	0x0040 0000 	MECHANIC_TURN 
+8388608 	0x0080 0000 	MECHANIC_HORROR 
+67108864 	0x0400 0000 	MECHANIC_DAZE 
+536870912 	0x2000 0000 	MECHANIC_SAPPED 
+*/
+-- Update Frozen Halls Immunities
+UPDATE `creature_template` SET `mechanic_immune_mask`=`mechanic_immune_mask`|1|2|16|32|64|128|256|512|1024|2048|4096|8192|65536|131072|524288|4194304|8388608|67108864|536870912 WHERE `entry` IN (
+-- Halls of Reflection:
+38112,-- Falric
+38599,-- Falric (1)
+38113,-- Marwyn
+38603,-- Marwyn (1)
+37226,-- Wrath of the Lich King
+-- Pit of Saron:
+36494,-- Forgemaster Garfrost
+37613,-- Forgemaster Garfrost (1) 
+36476,-- Ick
+37627,-- Ick (1)
+36477,-- Krick
+37629,-- Krick (1)
+36658,-- Scourgelord Tyrannus
+36938,-- Scourgelord Tyrannus (1)
+-- The Forge of Souls:
+36497,-- Bronjahm
+36498,-- Bronjahm (1)
+36502,-- Devourer of Souls
+37677);-- Devourer of Souls (1)
diff --git a/sql/updates/world/2011_03_12_0_world_creature_template.sql b/sql/updates/world/2011_03_12_0_world_creature_template.sql
deleted file mode 100644
index 4356a82443f..00000000000
--- a/sql/updates/world/2011_03_12_0_world_creature_template.sql
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-1 	0x0000 0001 	MECHANIC_CHARM 	
-2 	0x0000 0002 	MECHANIC_DISORIENTED 	
-16 	0x0000 0010 	MECHANIC_FEAR 	
-32 	0x0000 0020 	MECHANIC_GRIP 
-64 	0x0000 0040 	MECHANIC_ROOT 
-128 	0x0000 0080 	MECHANIC_PACIFY 	(0 spells use this mechanic)
-256 	0x0000 0100 	MECHANIC_SILENCE 
-512 	0x0000 0200 	MECHANIC_SLEEP 	
-1024 	0x0000 0400 	MECHANIC_SNARE 	
-2048 	0x0000 0800 	MECHANIC_STUN 	
-4096 	0x0000 1000 	MECHANIC_FREEZE 
-8192 	0x0000 2000 	MECHANIC_KNOCKOUT 
-65536 	0x0001 0000 	MECHANIC_POLYMORPH 	
-131072 	0x0002 0000 	MECHANIC_BANISH 
-524288 	0x0008 0000 	MECHANIC_SHACKLE 
-4194304 	0x0040 0000 	MECHANIC_TURN 
-8388608 	0x0080 0000 	MECHANIC_HORROR 
-67108864 	0x0400 0000 	MECHANIC_DAZE 
-536870912 	0x2000 0000 	MECHANIC_SAPPED 
-*/
--- Update Frozen Halls Immunities
-UPDATE `creature_template` SET `mechanic_immune_mask`=`mechanic_immune_mask`|1|2|16|32|64|128|256|512|1024|2048|4096|8192|65536|131072|524288|4194304|8388608|67108864|536870912 WHERE `entry` IN (
--- Halls of Reflection:
-38112,-- Falric
-38599,-- Falric (1)
-38113,-- Marwyn
-38603,-- Marwyn (1)
-37226,-- Wrath of the Lich King
--- Pit of Saron:
-36494,-- Forgemaster Garfrost
-37613,-- Forgemaster Garfrost (1) 
-36476,-- Ick
-37627,-- Ick (1)
-36477,-- Krick
-37629,-- Krick (1)
-36658,-- Scourgelord Tyrannus
-36938,-- Scourgelord Tyrannus (1)
--- The Forge of Souls:
-36497,-- Bronjahm
-36498,-- Bronjahm (1)
-36502,-- Devourer of Souls
-37677);-- Devourer of Souls (1)
diff --git a/sql/updates/world/2011_03_13_00_world_scriptname.sql b/sql/updates/world/2011_03_13_00_world_scriptname.sql
new file mode 100644
index 00000000000..b68be3b739d
--- /dev/null
+++ b/sql/updates/world/2011_03_13_00_world_scriptname.sql
@@ -0,0 +1 @@
+UPDATE `creature_template` SET `ScriptName`='boss_flame_leviathan_defense_cannon' WHERE `entry`=33139;
diff --git a/sql/updates/world/2011_03_13_01_world_areatrigger_scripts.sql b/sql/updates/world/2011_03_13_01_world_areatrigger_scripts.sql
new file mode 100644
index 00000000000..098030021ee
--- /dev/null
+++ b/sql/updates/world/2011_03_13_01_world_areatrigger_scripts.sql
@@ -0,0 +1,3 @@
+DELETE FROM `areatrigger_scripts` WHERE `entry`=5729;
+INSERT INTO `areatrigger_scripts` (`entry`,`ScriptName`) VALUES
+(5729,'at_icc_start_blood_quickening');
diff --git a/sql/updates/world/2011_03_13_01_world_creatures.sql b/sql/updates/world/2011_03_13_01_world_creatures.sql
new file mode 100644
index 00000000000..860491ec790
--- /dev/null
+++ b/sql/updates/world/2011_03_13_01_world_creatures.sql
@@ -0,0 +1,26 @@
+UPDATE `creature_template` SET `AIName`='SmartAI',`InhabitType`=7,`flags_extra`=`flags_extra`|128 WHERE `entry`=38557;
+UPDATE `creature_template` SET `InhabitType`=7 WHERE `entry`=38558;
+
+SET @GUID := 137784;
+DELETE FROM `creature` WHERE `guid` BETWEEN @GUID+0 AND @GUID+4;
+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,38558,631,15,1,0,0,4637.27,2786.25,424.639,3.57357,604800,0,0,0,0,0,0,0,0,0), -- Infiltrator Minchar
+(@GUID+1,38557,631,15,1,0,0,4642.60,2771.61,412.227,0.00000,604800,0,0,0,0,0,0,0,0,0), -- left leg
+(@GUID+2,38557,631,15,1,0,0,4630.34,2799.74,412.512,0.00000,604800,0,0,0,0,0,0,0,0,0), -- right leg
+(@GUID+3,38557,631,15,1,0,0,4630.73,2802.02,437.672,0.00000,604800,0,0,0,0,0,0,0,0,0), -- right arm
+(@GUID+4,38557,631,15,1,0,0,4645.42,2771.67,436.146,0.00000,604800,0,0,0,0,0,0,0,0,0); -- left arm
+
+DELETE FROM `smart_scripts` WHERE `entryorguid` BETWEEN -(@GUID+4) AND -(@GUID+1);
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(-(@GUID+1),0,0,0,25,0,100,0,0,0,0,0,11,72302,3,0,0,0,0,10,@GUID,0,0,0,0,0,0, 'Minchar Beam Stalker - Channel beam'),
+(-(@GUID+2),0,0,0,25,0,100,0,0,0,0,0,11,72301,3,0,0,0,0,10,@GUID,0,0,0,0,0,0, 'Minchar Beam Stalker - Channel beam'),
+(-(@GUID+3),0,0,0,25,0,100,0,0,0,0,0,11,72304,3,0,0,0,0,10,@GUID,0,0,0,0,0,0, 'Minchar Beam Stalker - Channel beam'),
+(-(@GUID+4),0,0,0,25,0,100,0,0,0,0,0,11,72303,3,0,0,0,0,10,@GUID,0,0,0,0,0,0, 'Minchar Beam Stalker - Channel beam');
+
+DELETE FROM `creature_addon` WHERE `guid`=@GUID;
+INSERT INTO `creature_addon` (`guid`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
+(@GUID,0,0x03000000,1,427, ''); -- Infiltrator Minchar
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=71322;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(13,0,71322,0,18,1,38558,0,0, '', 'Blood-Queen Lana''thel - Annihilate Minchar');
diff --git a/sql/updates/world/2011_03_13_0_world_scriptname.sql b/sql/updates/world/2011_03_13_0_world_scriptname.sql
deleted file mode 100644
index b68be3b739d..00000000000
--- a/sql/updates/world/2011_03_13_0_world_scriptname.sql
+++ /dev/null
@@ -1 +0,0 @@
-UPDATE `creature_template` SET `ScriptName`='boss_flame_leviathan_defense_cannon' WHERE `entry`=33139;
diff --git a/sql/updates/world/2011_03_13_1_world_areatrigger_scripts.sql b/sql/updates/world/2011_03_13_1_world_areatrigger_scripts.sql
deleted file mode 100644
index 098030021ee..00000000000
--- a/sql/updates/world/2011_03_13_1_world_areatrigger_scripts.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-DELETE FROM `areatrigger_scripts` WHERE `entry`=5729;
-INSERT INTO `areatrigger_scripts` (`entry`,`ScriptName`) VALUES
-(5729,'at_icc_start_blood_quickening');
diff --git a/sql/updates/world/2011_03_13_1_world_creatures.sql b/sql/updates/world/2011_03_13_1_world_creatures.sql
deleted file mode 100644
index 860491ec790..00000000000
--- a/sql/updates/world/2011_03_13_1_world_creatures.sql
+++ /dev/null
@@ -1,26 +0,0 @@
-UPDATE `creature_template` SET `AIName`='SmartAI',`InhabitType`=7,`flags_extra`=`flags_extra`|128 WHERE `entry`=38557;
-UPDATE `creature_template` SET `InhabitType`=7 WHERE `entry`=38558;
-
-SET @GUID := 137784;
-DELETE FROM `creature` WHERE `guid` BETWEEN @GUID+0 AND @GUID+4;
-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,38558,631,15,1,0,0,4637.27,2786.25,424.639,3.57357,604800,0,0,0,0,0,0,0,0,0), -- Infiltrator Minchar
-(@GUID+1,38557,631,15,1,0,0,4642.60,2771.61,412.227,0.00000,604800,0,0,0,0,0,0,0,0,0), -- left leg
-(@GUID+2,38557,631,15,1,0,0,4630.34,2799.74,412.512,0.00000,604800,0,0,0,0,0,0,0,0,0), -- right leg
-(@GUID+3,38557,631,15,1,0,0,4630.73,2802.02,437.672,0.00000,604800,0,0,0,0,0,0,0,0,0), -- right arm
-(@GUID+4,38557,631,15,1,0,0,4645.42,2771.67,436.146,0.00000,604800,0,0,0,0,0,0,0,0,0); -- left arm
-
-DELETE FROM `smart_scripts` WHERE `entryorguid` BETWEEN -(@GUID+4) AND -(@GUID+1);
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
-(-(@GUID+1),0,0,0,25,0,100,0,0,0,0,0,11,72302,3,0,0,0,0,10,@GUID,0,0,0,0,0,0, 'Minchar Beam Stalker - Channel beam'),
-(-(@GUID+2),0,0,0,25,0,100,0,0,0,0,0,11,72301,3,0,0,0,0,10,@GUID,0,0,0,0,0,0, 'Minchar Beam Stalker - Channel beam'),
-(-(@GUID+3),0,0,0,25,0,100,0,0,0,0,0,11,72304,3,0,0,0,0,10,@GUID,0,0,0,0,0,0, 'Minchar Beam Stalker - Channel beam'),
-(-(@GUID+4),0,0,0,25,0,100,0,0,0,0,0,11,72303,3,0,0,0,0,10,@GUID,0,0,0,0,0,0, 'Minchar Beam Stalker - Channel beam');
-
-DELETE FROM `creature_addon` WHERE `guid`=@GUID;
-INSERT INTO `creature_addon` (`guid`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
-(@GUID,0,0x03000000,1,427, ''); -- Infiltrator Minchar
-
-DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=71322;
-INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
-(13,0,71322,0,18,1,38558,0,0, '', 'Blood-Queen Lana''thel - Annihilate Minchar');
diff --git a/sql/updates/world/2011_03_16_00_world_creatures.sql b/sql/updates/world/2011_03_16_00_world_creatures.sql
new file mode 100644
index 00000000000..b3a4722d03b
--- /dev/null
+++ b/sql/updates/world/2011_03_16_00_world_creatures.sql
@@ -0,0 +1,34 @@
+SET @EQUIP := 10137;
+
+UPDATE `creature_template` SET `faction_A`=1770,`faction_H`=1770,`baseattacktime`=2000,`npcflag`=3,`unit_flags`=33088,`dynamicflags`=0,`speed_run`=1,`flags_extra`=`flags_extra`|2 WHERE `entry`=37597; -- Lady Jaina Proudmoore
+UPDATE `creature_template` SET `faction_A`=1770,`faction_H`=1770,`baseattacktime`=2000,`unit_flags`=33088,`equipment_id`=1221,`speed_run`=1,`flags_extra`=`flags_extra`|2 WHERE `entry`=38160; -- Lady Jaina Proudmoore
+UPDATE `creature_template` SET `baseattacktime`=5000,`unit_class`=2,`speed_walk`=0.4,`speed_run`=1.1428571428571 WHERE `entry`=36967; -- Spiteful Apparition (Ambient)
+UPDATE `creature_template` SET `baseattacktime`=2000,`speed_walk`=1.111112,`speed_run`=1.1428571428571 WHERE `entry`=36666; -- Spectral Warden
+UPDATE `creature_template` SET `equipment_id`=637,`speed_run`=1.1428571428571,`flags_extra`=`flags_extra`|2 WHERE `entry`=37582; -- Archmage Koreln
+UPDATE `creature_template` SET `faction_A`=1770,`faction_H`=1770,`baseattacktime`=2000,`unit_flags`=32832,`equipment_id`=637,`speed_run`=1.1428571428571,`flags_extra`=`flags_extra`|2 WHERE `entry`=37774; -- Archmage Elandra
+UPDATE `creature_template` SET `faction_A`=534,`faction_H`=534,`baseattacktime`=2000,`unit_flags`=32832,`equipment_id`=@EQUIP,`speed_run`=1.1428571428571 WHERE `entry`=37496; -- Coliseum Champion
+UPDATE `creature_template` SET `unit_flags`=`unit_flags`|32832,`speed_run`=1.1428571428571 WHERE `entry`=37779; -- Dark Ranger Loralen
+UPDATE `creature_template` SET `baseattacktime`=2000,`npcflag`=`npcflag`|3,`dynamicflags`=0,`speed_run`=1.1428571428571,`flags_extra`=`flags_extra`|2 WHERE `entry`=37596; -- Lady Sylvanas Windrunner
+UPDATE `creature_template` SET `baseattacktime`=2000,`speed_walk`=0.4,`speed_run`=1.1428571428571,`InhabitType`=7,`flags_extra`=`flags_extra`|128 WHERE `entry`=36508; -- Soulguard Beam Focus Target
+
+DELETE FROM `creature_equip_template` WHERE `entry`=@EQUIP;
+INSERT INTO `creature_equip_template` (`entry`,`equipentry1`,`equipentry2`,`equipentry3`) VALUES
+(@EQUIP,47814,46963,0);
+
+DELETE FROM `creature_template_addon` WHERE `entry` IN (36508,37583,37779);
+INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
+(37779,0,0,1,433, NULL), -- Dark Ranger Loralen
+(37583,0,0,2,0, NULL), -- Dark Ranger Kalira
+(36508,0,33554432,1,0, NULL); -- Soulguard Beam Focus Target
+
+UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1.5,`gender`=1 WHERE `modelid`=30684; -- Archmage Elandra
+UPDATE `creature_model_info` SET `bounding_radius`=0.347,`combat_reach`=1.5,`gender`=0 WHERE `modelid`=30638; -- Coliseum Champion
+UPDATE `creature_model_info` SET `bounding_radius`=0.465,`combat_reach`=0,`gender`=1 WHERE `modelid`=30867; -- Lady Jaina Proudmoore
+UPDATE `creature_model_info` SET `bounding_radius`=0.354,`combat_reach`=2.25,`gender`=1 WHERE `modelid`=30168; -- Soulguard Animator
+UPDATE `creature_model_info` SET `bounding_radius`=0.465,`combat_reach`=1.5,`gender`=0 WHERE `modelid`=30270; -- Soulguard Bonecaster
+UPDATE `creature_model_info` SET `bounding_radius`=0.459,`combat_reach`=2.25,`gender`=1 WHERE `modelid`=30240; -- Soulguard Adept
+UPDATE `creature_model_info` SET `bounding_radius`=0.5,`combat_reach`=1,`gender`=2 WHERE `modelid`=25942; -- Spiteful Apparition (Ambient)
+UPDATE `creature_model_info` SET `bounding_radius`=2.5,`combat_reach`=3.75,`gender`=0 WHERE `modelid`=30283; -- Spectral Warden
+UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1.5,`gender`=0 WHERE `modelid`=30862; -- Ebon Blade Commander
+UPDATE `creature_model_info` SET `bounding_radius`=0.372,`combat_reach`=1.2,`gender`=1 WHERE `modelid`=28213; -- Lady Sylvanas Windrunner
+UPDATE `creature_model_info` SET `bounding_radius`=0.5,`combat_reach`=1,`gender`=2 WHERE `modelid`=11686; -- Soulguard Beam Focus Target
\ No newline at end of file
diff --git a/sql/updates/world/2011_03_16_0_world_creatures.sql b/sql/updates/world/2011_03_16_0_world_creatures.sql
deleted file mode 100644
index b3a4722d03b..00000000000
--- a/sql/updates/world/2011_03_16_0_world_creatures.sql
+++ /dev/null
@@ -1,34 +0,0 @@
-SET @EQUIP := 10137;
-
-UPDATE `creature_template` SET `faction_A`=1770,`faction_H`=1770,`baseattacktime`=2000,`npcflag`=3,`unit_flags`=33088,`dynamicflags`=0,`speed_run`=1,`flags_extra`=`flags_extra`|2 WHERE `entry`=37597; -- Lady Jaina Proudmoore
-UPDATE `creature_template` SET `faction_A`=1770,`faction_H`=1770,`baseattacktime`=2000,`unit_flags`=33088,`equipment_id`=1221,`speed_run`=1,`flags_extra`=`flags_extra`|2 WHERE `entry`=38160; -- Lady Jaina Proudmoore
-UPDATE `creature_template` SET `baseattacktime`=5000,`unit_class`=2,`speed_walk`=0.4,`speed_run`=1.1428571428571 WHERE `entry`=36967; -- Spiteful Apparition (Ambient)
-UPDATE `creature_template` SET `baseattacktime`=2000,`speed_walk`=1.111112,`speed_run`=1.1428571428571 WHERE `entry`=36666; -- Spectral Warden
-UPDATE `creature_template` SET `equipment_id`=637,`speed_run`=1.1428571428571,`flags_extra`=`flags_extra`|2 WHERE `entry`=37582; -- Archmage Koreln
-UPDATE `creature_template` SET `faction_A`=1770,`faction_H`=1770,`baseattacktime`=2000,`unit_flags`=32832,`equipment_id`=637,`speed_run`=1.1428571428571,`flags_extra`=`flags_extra`|2 WHERE `entry`=37774; -- Archmage Elandra
-UPDATE `creature_template` SET `faction_A`=534,`faction_H`=534,`baseattacktime`=2000,`unit_flags`=32832,`equipment_id`=@EQUIP,`speed_run`=1.1428571428571 WHERE `entry`=37496; -- Coliseum Champion
-UPDATE `creature_template` SET `unit_flags`=`unit_flags`|32832,`speed_run`=1.1428571428571 WHERE `entry`=37779; -- Dark Ranger Loralen
-UPDATE `creature_template` SET `baseattacktime`=2000,`npcflag`=`npcflag`|3,`dynamicflags`=0,`speed_run`=1.1428571428571,`flags_extra`=`flags_extra`|2 WHERE `entry`=37596; -- Lady Sylvanas Windrunner
-UPDATE `creature_template` SET `baseattacktime`=2000,`speed_walk`=0.4,`speed_run`=1.1428571428571,`InhabitType`=7,`flags_extra`=`flags_extra`|128 WHERE `entry`=36508; -- Soulguard Beam Focus Target
-
-DELETE FROM `creature_equip_template` WHERE `entry`=@EQUIP;
-INSERT INTO `creature_equip_template` (`entry`,`equipentry1`,`equipentry2`,`equipentry3`) VALUES
-(@EQUIP,47814,46963,0);
-
-DELETE FROM `creature_template_addon` WHERE `entry` IN (36508,37583,37779);
-INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
-(37779,0,0,1,433, NULL), -- Dark Ranger Loralen
-(37583,0,0,2,0, NULL), -- Dark Ranger Kalira
-(36508,0,33554432,1,0, NULL); -- Soulguard Beam Focus Target
-
-UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1.5,`gender`=1 WHERE `modelid`=30684; -- Archmage Elandra
-UPDATE `creature_model_info` SET `bounding_radius`=0.347,`combat_reach`=1.5,`gender`=0 WHERE `modelid`=30638; -- Coliseum Champion
-UPDATE `creature_model_info` SET `bounding_radius`=0.465,`combat_reach`=0,`gender`=1 WHERE `modelid`=30867; -- Lady Jaina Proudmoore
-UPDATE `creature_model_info` SET `bounding_radius`=0.354,`combat_reach`=2.25,`gender`=1 WHERE `modelid`=30168; -- Soulguard Animator
-UPDATE `creature_model_info` SET `bounding_radius`=0.465,`combat_reach`=1.5,`gender`=0 WHERE `modelid`=30270; -- Soulguard Bonecaster
-UPDATE `creature_model_info` SET `bounding_radius`=0.459,`combat_reach`=2.25,`gender`=1 WHERE `modelid`=30240; -- Soulguard Adept
-UPDATE `creature_model_info` SET `bounding_radius`=0.5,`combat_reach`=1,`gender`=2 WHERE `modelid`=25942; -- Spiteful Apparition (Ambient)
-UPDATE `creature_model_info` SET `bounding_radius`=2.5,`combat_reach`=3.75,`gender`=0 WHERE `modelid`=30283; -- Spectral Warden
-UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1.5,`gender`=0 WHERE `modelid`=30862; -- Ebon Blade Commander
-UPDATE `creature_model_info` SET `bounding_radius`=0.372,`combat_reach`=1.2,`gender`=1 WHERE `modelid`=28213; -- Lady Sylvanas Windrunner
-UPDATE `creature_model_info` SET `bounding_radius`=0.5,`combat_reach`=1,`gender`=2 WHERE `modelid`=11686; -- Soulguard Beam Focus Target
\ No newline at end of file
diff --git a/sql/updates/world/2011_03_17_00_world_sai.sql b/sql/updates/world/2011_03_17_00_world_sai.sql
new file mode 100644
index 00000000000..3fb85bbd2ac
--- /dev/null
+++ b/sql/updates/world/2011_03_17_00_world_sai.sql
@@ -0,0 +1,297 @@
+-- Pathing for En'kilah Crypt Fiend Entry: 25386
+SET @NPC := 99939;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=3859.662,`position_y`=3393.562,`position_z`=67.97741 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,3856.184,3393.872,68.60241,0,0,0,100,0),
+(@PATH,2,3853.398,3388.785,70.60241,0,0,0,100,0),
+(@PATH,3,3856.184,3393.872,68.60241,0,0,0,100,0),
+(@PATH,4,3859.662,3393.562,67.97741,0,0,0,100,0),
+(@PATH,5,3865.199,3400.655,64.67162,0,0,0,100,0),
+(@PATH,6,3862.853,3407.01,64.17162,0,0,0,100,0),
+(@PATH,7,3864.934,3414.912,64.17162,0,0,0,100,0),
+(@PATH,8,3862.853,3407.01,64.17162,0,0,0,100,0),
+(@PATH,9,3865.199,3400.655,64.67162,0,0,0,100,0),
+(@PATH,10,3859.662,3393.562,67.97741,0,0,0,100,0);
+
+-- Pathing for En'kilah Crypt Fiend Entry: 25386
+SET @NPC := 100009;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=3896.402,`position_y`=3454.12,`position_z`=64.19093 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,3890.689,3458.416,65.06593,0,0,0,100,0),
+(@PATH,2,3878.707,3463.25,64.06593,0,0,0,100,0),
+(@PATH,3,3865.527,3468.116,64.16493,0,0,0,100,0),
+(@PATH,4,3867.453,3467.697,64.16493,0,0,0,100,0),
+(@PATH,5,3878.97,3463.877,64.06593,0,0,0,100,0),
+(@PATH,6,3896.402,3454.12,64.19093,0,0,0,100,0);
+
+-- Pathing for En'kilah Crypt Fiend Entry: 25386
+SET @NPC := 99955;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=3849.937,`position_y`=3440.836,`position_z`=64.08922 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,3844.136,3430.625,64.17162,0,0,0,100,0),
+(@PATH,2,3836.185,3415.533,67.29662,0,0,0,100,0),
+(@PATH,3,3838.057,3414.41,67.17162,0,0,0,100,0),
+(@PATH,4,3843.113,3427.501,64.29662,0,0,0,100,0),
+(@PATH,5,3848.386,3439.262,64.08922,0,0,0,100,0),
+(@PATH,6,3849.937,3440.836,64.08922,0,0,0,100,0);
+
+-- Pathing for En'kilah Crypt Fiend Entry: 25386
+SET @NPC := 99856;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=3944.872,`position_y`=3387.368,`position_z`=82.84169 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,3958.746,3388.819,83.46669,0,0,0,100,0),
+(@PATH,2,3939.345,3406.614,80.91746,0,0,0,100,0),
+(@PATH,3,3932.713,3412.609,80.93697,0,0,0,100,0),
+(@PATH,4,3931.988,3409.037,80.93697,0,0,0,100,0),
+(@PATH,5,3940.203,3397.782,80.96669,0,0,0,100,0),
+(@PATH,6,3944.872,3387.368,82.84169,0,0,0,100,0);
+
+-- Pathing for En'kilah Crypt Fiend Entry: 25386
+SET @NPC := 99853;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=3988.71,`position_y`=3389.023,`position_z`=84.59169 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,3995.287,3398.66,83.21669,0,0,0,100,0),
+(@PATH,2,3999.713,3411.761,84.47887,0,0,0,100,0),
+(@PATH,3,3992.017,3414.793,83.10387,0,0,0,100,0),
+(@PATH,4,3980.25,3399.608,80.96669,0,0,0,100,0),
+(@PATH,5,3973.198,3392.127,81.21669,0,0,0,100,0),
+(@PATH,6,3981.25,3389.583,83.71669,0,0,0,100,0),
+(@PATH,7,3988.71,3389.023,84.59169,0,0,0,100,0);
+
+-- Pathing for En'kilah Crypt Fiend Entry: 25386
+SET @NPC := 100008;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=3961.064,`position_y`=3422.165,`position_z`=80.91746 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,3958.62,3407.545,80.91746,0,0,0,100,0),
+(@PATH,2,3959.292,3391.561,82.09169,0,0,0,100,0),
+(@PATH,3,3959.987,3394.481,81.09169,0,0,0,100,0),
+(@PATH,4,3961.145,3408.606,80.91746,0,0,0,100,0),
+(@PATH,5,3963.867,3424.426,80.91746,0,0,0,100,0),
+(@PATH,6,3961.064,3422.165,80.91746,0,0,0,100,0);
+-- 0xF13000632A00102F .go 3958.62 3407.545 80.91746
+
+-- Pathing for En'kilah Crypt Fiend Entry: 25386
+SET @NPC := 100011;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=3973.765,`position_y`=3685.582,`position_z`=63.20702 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,3985.953,3658.16,62.64196,0,0,0,100,0),
+(@PATH,2,3981.12,3655.121,62.51696,0,0,0,100,0),
+(@PATH,3,3975.807,3676.29,63.20702,0,0,0,100,0),
+(@PATH,4,3968.138,3708.388,63.14015,0,0,0,100,0),
+(@PATH,5,3973.765,3685.582,63.20702,0,0,0,100,0);
+-- 0xF53000632A016E01 .go 3985.953 3658.16 62.64196
+
+-- Pathing for En'kilah Crypt Fiend Entry: 25386
+SET @NPC := 99855;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=3767.44,`position_y`=3483.963,`position_z`=64.18696 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,3765.76,3473.853,64.31196,0,0,0,100,0),
+(@PATH,2,3767.138,3500.103,64.0854,0,0,0,100,0),
+(@PATH,3,3770.234,3518.467,64.0854,0,0,0,100,0),
+(@PATH,4,3769.093,3509.577,64.0854,0,0,0,100,0),
+(@PATH,5,3768.024,3494.981,64.18696,0,0,0,100,0),
+(@PATH,6,3767.44,3483.963,64.18696,0,0,0,100,0);
+-- 0xF53000632A017C11 .go 3765.76 3473.853 64.31196
+
+-- Pathing for En'kilah Crypt Fiend Entry: 25386
+SET @NPC := 99939;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=3859.662,`position_y`=3393.562,`position_z`=67.97741 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,3856.184,3393.872,68.60241,0,0,0,100,0),
+(@PATH,2,3853.398,3388.785,70.60241,0,0,0,100,0),
+(@PATH,3,3856.184,3393.872,68.60241,0,0,0,100,0),
+(@PATH,4,3859.662,3393.562,67.97741,0,0,0,100,0),
+(@PATH,5,3865.199,3400.655,64.67162,0,0,0,100,0),
+(@PATH,6,3862.853,3407.01,64.17162,0,0,0,100,0),
+(@PATH,7,3864.934,3414.912,64.17162,0,0,0,100,0),
+(@PATH,8,3862.853,3407.01,64.17162,0,0,0,100,0),
+(@PATH,9,3865.199,3400.655,64.67162,0,0,0,100,0),
+(@PATH,10,3859.662,3393.562,67.97741,0,0,0,100,0);
+
+-- Pathing for En'kilah Crypt Fiend Entry: 25386
+SET @NPC := 100009;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=3896.402,`position_y`=3454.12,`position_z`=64.19093 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,3890.689,3458.416,65.06593,0,0,0,100,0),
+(@PATH,2,3878.707,3463.25,64.06593,0,0,0,100,0),
+(@PATH,3,3865.527,3468.116,64.16493,0,0,0,100,0),
+(@PATH,4,3867.453,3467.697,64.16493,0,0,0,100,0),
+(@PATH,5,3878.97,3463.877,64.06593,0,0,0,100,0),
+(@PATH,6,3896.402,3454.12,64.19093,0,0,0,100,0);
+
+-- Pathing for En'kilah Crypt Fiend Entry: 25386
+SET @NPC := 99955;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=3849.937,`position_y`=3440.836,`position_z`=64.08922 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,3844.136,3430.625,64.17162,0,0,0,100,0),
+(@PATH,2,3836.185,3415.533,67.29662,0,0,0,100,0),
+(@PATH,3,3838.057,3414.41,67.17162,0,0,0,100,0),
+(@PATH,4,3843.113,3427.501,64.29662,0,0,0,100,0),
+(@PATH,5,3848.386,3439.262,64.08922,0,0,0,100,0),
+(@PATH,6,3849.937,3440.836,64.08922,0,0,0,100,0);
+
+-- Pathing for En'kilah Crypt Fiend Entry: 25386
+SET @NPC := 99856;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=3944.872,`position_y`=3387.368,`position_z`=82.84169 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,3958.746,3388.819,83.46669,0,0,0,100,0),
+(@PATH,2,3939.345,3406.614,80.91746,0,0,0,100,0),
+(@PATH,3,3932.713,3412.609,80.93697,0,0,0,100,0),
+(@PATH,4,3931.988,3409.037,80.93697,0,0,0,100,0),
+(@PATH,5,3940.203,3397.782,80.96669,0,0,0,100,0),
+(@PATH,6,3944.872,3387.368,82.84169,0,0,0,100,0);
+
+-- Pathing for En'kilah Crypt Fiend Entry: 25386
+SET @NPC := 99853;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=3988.71,`position_y`=3389.023,`position_z`=84.59169 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,3995.287,3398.66,83.21669,0,0,0,100,0),
+(@PATH,2,3999.713,3411.761,84.47887,0,0,0,100,0),
+(@PATH,3,3992.017,3414.793,83.10387,0,0,0,100,0),
+(@PATH,4,3980.25,3399.608,80.96669,0,0,0,100,0),
+(@PATH,5,3973.198,3392.127,81.21669,0,0,0,100,0),
+(@PATH,6,3981.25,3389.583,83.71669,0,0,0,100,0),
+(@PATH,7,3988.71,3389.023,84.59169,0,0,0,100,0);
+
+-- Pathing for En'kilah Crypt Fiend Entry: 25386
+SET @NPC := 100008;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=3961.064,`position_y`=3422.165,`position_z`=80.91746 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,3958.62,3407.545,80.91746,0,0,0,100,0),
+(@PATH,2,3959.292,3391.561,82.09169,0,0,0,100,0),
+(@PATH,3,3959.987,3394.481,81.09169,0,0,0,100,0),
+(@PATH,4,3961.145,3408.606,80.91746,0,0,0,100,0),
+(@PATH,5,3963.867,3424.426,80.91746,0,0,0,100,0),
+(@PATH,6,3961.064,3422.165,80.91746,0,0,0,100,0);
+
+-- Pathing for En'kilah Crypt Fiend Entry: 25386
+SET @NPC := 100011;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=3973.765,`position_y`=3685.582,`position_z`=63.20702 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,3985.953,3658.16,62.64196,0,0,0,100,0),
+(@PATH,2,3981.12,3655.121,62.51696,0,0,0,100,0),
+(@PATH,3,3975.807,3676.29,63.20702,0,0,0,100,0),
+(@PATH,4,3968.138,3708.388,63.14015,0,0,0,100,0),
+(@PATH,5,3973.765,3685.582,63.20702,0,0,0,100,0);
+
+-- Pathing for En'kilah Crypt Fiend Entry: 25386
+SET @NPC := 99860;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=3736.829,`position_y`=3590.097,`position_z`=47.62042 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,3740.556,3611.562,49.59578,0,0,0,100,0),
+(@PATH,2,3743.815,3598.767,46.74542,0,0,0,100,0),
+(@PATH,3,3750.231,3578.953,46.87042,0,0,0,100,0),
+(@PATH,4,3744.763,3577.349,46.87042,0,0,0,100,0),
+(@PATH,5,3736.829,3590.097,47.62042,0,0,0,100,0);
+
+-- Pathing for En'kilah Crypt Fiend Entry: 25386
+SET @NPC := 99861;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=3781.2,`position_y`=3555.762,`position_z`=47.13174 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,3781.763,3556.428,47.13174,0,0,0,100,0),
+(@PATH,2,3784.81,3570.215,46.82142,0,0,0,100,0),
+(@PATH,3,3784.099,3579.592,48.19642,0,0,0,100,0),
+(@PATH,4,3784.9,3578.852,48.32142,0,0,0,100,0),
+(@PATH,5,3784.858,3565.897,46.63174,0,0,0,100,0),
+(@PATH,6,3781.2,3555.762,47.13174,0,0,0,100,0);
+
+-- Pathing for En'kilah Crypt Fiend Entry: 25386
+SET @NPC := 99873;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=3795.21,`position_y`=3453.815,`position_z`=82.97263 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,3789.819,3445.883,82.97262,0,0,0,100,0),
+(@PATH,2,3785.635,3440.609,82.97261,0,0,0,100,0),
+(@PATH,3,3780.893,3429.421,82.9726,0,0,0,100,0),
+(@PATH,4,3785.635,3440.609,82.97261,0,0,0,100,0),
+(@PATH,5,3789.819,3445.883,82.97262,0,0,0,100,0),
+(@PATH,6,3795.21,3453.815,82.97263,0,0,0,100,0);
+
+-- Pathing for En'kilah Crypt Fiend Entry: 25386
+SET @NPC := 99871;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=3812.432,`position_y`=3443.979,`position_z`=82.97263 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,3808.239,3432.998,82.97262,0,0,0,100,0),
+(@PATH,2,3805.263,3425.894,82.97261,0,0,0,100,0),
+(@PATH,3,3808.239,3432.998,82.97262,0,0,0,100,0),
+(@PATH,4,3812.432,3443.979,82.97263,0,0,0,100,0);
+
+-- Remove 2 over spawns 
+DELETE FROM `creature` WHERE `guid` IN (99859,99858);
+DELETE FROM `creature_addon` WHERE `guid` IN (99859,99858);
+
diff --git a/sql/updates/world/2011_03_17_01_world_sai.sql b/sql/updates/world/2011_03_17_01_world_sai.sql
new file mode 100644
index 00000000000..27a22d14aa8
--- /dev/null
+++ b/sql/updates/world/2011_03_17_01_world_sai.sql
@@ -0,0 +1,118 @@
+-- Pathing for Darkfallen Deathblade Entry: 26103
+SET @NPC := 119232;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=3657.896,`position_y`=3592.591,`position_z`=371.479 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,3665.972,3599.461,371.4846,0,0,0,100,0),
+(@PATH,2,3682.637,3610.097,371.4544,0,0,0,100,0),
+(@PATH,3,3696.372,3619.76,371.3447,0,0,0,100,0),
+(@PATH,4,3682.637,3610.097,371.4544,0,0,0,100,0),
+(@PATH,5,3665.972,3599.461,371.4846,0,0,0,100,0),
+(@PATH,6,3657.896,3592.591,371.479,0,0,0,100,0),
+(@PATH,7,3651.491,3585.525,371.674,0,0,0,100,0),
+(@PATH,8,3651.062,3578.088,371.551,0,0,0,100,0),
+(@PATH,9,3656.478,3568.307,371.4457,0,0,0,100,0),
+(@PATH,10,3665.993,3555.432,371.3665,0,0,0,100,0),
+(@PATH,11,3656.478,3568.307,371.4457,0,0,0,100,0),
+(@PATH,12,3651.062,3578.088,371.551,0,0,0,100,0),
+(@PATH,13,3651.473,3585.204,371.6653,0,0,0,100,0),
+(@PATH,14,3657.896,3592.591,371.479,0,0,0,100,0);
+
+-- Pathing for Darkfallen Deathblade Entry: 26103
+SET @NPC := 119253;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=3742.794,`position_y`=3604.008,`position_z`=346.2505 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,3728.665,3600.99,345.8076,0,0,0,100,0),
+(@PATH,2,3716.573,3595.571,346.0472,0,0,0,100,0),
+(@PATH,3,3709.646,3587.291,345.7931,0,0,0,100,0),
+(@PATH,4,3705.439,3578.289,345.9121,0,0,0,100,0),
+(@PATH,5,3703.899,3570.889,345.8815,0,0,0,100,0),
+(@PATH,6,3704.667,3561.633,345.6407,0,0,0,100,0),
+(@PATH,7,3706.808,3553.582,345.8144,0,0,0,100,0),
+(@PATH,8,3712.931,3543.78,345.7907,0,0,0,100,0),
+(@PATH,9,3718.246,3537.947,345.8893,0,0,0,100,0),
+(@PATH,10,3729.692,3532.638,345.8766,0,0,0,100,0),
+(@PATH,11,3741.682,3531.879,345.7675,0,0,0,100,0),
+(@PATH,12,3752.107,3533.592,345.952,0,0,0,100,0),
+(@PATH,13,3762.405,3538.37,346.1658,0,0,0,100,0),
+(@PATH,14,3772.811,3550.474,346.3304,0,0,0,100,0),
+(@PATH,15,3776.353,3563.746,346.2406,0,0,0,100,0),
+(@PATH,16,3774.419,3578.473,346.1627,0,0,0,100,0),
+(@PATH,17,3768.748,3590.277,346.2671,0,0,0,100,0),
+(@PATH,18,3755.322,3600.473,346.2415,0,0,0,100,0),
+(@PATH,19,3742.794,3604.008,346.2505,0,0,0,100,0);
+
+-- Pathing for Darkfallen Deathblade Entry: 26103
+SET @NPC := 119306;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=3825.312,`position_y`=3561.968,`position_z`=371.449 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,3828.243,3550.227,371.6633,0,0,0,100,0),
+(@PATH,2,3821.141,3538.786,371.4709,0,0,0,100,0),
+(@PATH,3,3810.434,3533.297,371.4811,0,0,0,100,0),
+(@PATH,4,3797.684,3527.717,371.4747,0,0,0,100,0),
+(@PATH,5,3788.295,3523.66,371.5133,0,0,0,100,0),
+(@PATH,6,3797.684,3527.717,371.4747,0,0,0,100,0),
+(@PATH,7,3810.434,3533.297,371.4811,0,0,0,100,0),
+(@PATH,8,3821.141,3538.786,371.4709,0,0,0,100,0),
+(@PATH,9,3828.243,3550.227,371.6633,0,0,0,100,0),
+(@PATH,10,3825.312,3561.968,371.449,0,0,0,100,0),
+(@PATH,11,3818.058,3572.063,371.4479,0,0,0,100,0),
+(@PATH,12,3825.312,3561.968,371.449,0,0,0,100,0);
+
+-- Pathing for Darkfallen Deathblade Entry: 26103
+SET @NPC := 119344;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=3719.171,`position_y`=3634.032,`position_z`=371.4312 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,3728.891,3640.265,371.399,0,0,0,100,0),
+(@PATH,2,3744.495,3650.741,371.4715,0,0,0,100,0),
+(@PATH,3,3754.314,3654.938,371.6409,0,0,0,100,0),
+(@PATH,4,3762.468,3653.046,371.6256,0,0,0,100,0),
+(@PATH,5,3769.032,3645.54,371.4821,0,0,0,100,0),
+(@PATH,6,3779.281,3629.354,371.3682,0,0,0,100,0),
+(@PATH,7,3769.032,3645.54,371.4821,0,0,0,100,0),
+(@PATH,8,3762.468,3653.046,371.6256,0,0,0,100,0),
+(@PATH,9,3754.314,3654.938,371.6409,0,0,0,100,0),
+(@PATH,10,3744.495,3650.741,371.4715,0,0,0,100,0),
+(@PATH,11,3728.891,3640.265,371.399,0,0,0,100,0),
+(@PATH,12,3719.171,3634.032,371.4312,0,0,0,100,0),
+(@PATH,13,3706.394,3625.895,371.3447,0,0,0,100,0),
+(@PATH,14,3719.171,3634.032,371.4312,0,0,0,100,0);
+
+-- Pathing for Darkfallen Deathblade Entry: 26103
+SET @NPC := 119346;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=3757.834,`position_y`=3500.429,`position_z`=371.4323 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,3744.604,3489.214,371.4503,0,0,0,100,0),
+(@PATH,2,3731.337,3479.792,371.4355,0,0,0,100,0),
+(@PATH,3,3724.038,3478.357,371.6531,0,0,0,100,0),
+(@PATH,4,3716.938,3479.223,371.649,0,0,0,100,0),
+(@PATH,5,3709.829,3487.23,371.4689,0,0,0,100,0),
+(@PATH,6,3699.577,3504.449,371.358,0,0,0,100,0),
+(@PATH,7,3709.829,3487.23,371.4689,0,0,0,100,0),
+(@PATH,8,3716.938,3479.223,371.649,0,0,0,100,0),
+(@PATH,9,3724.038,3478.357,371.6531,0,0,0,100,0),
+(@PATH,10,3731.337,3479.792,371.4355,0,0,0,100,0),
+(@PATH,11,3744.604,3489.214,371.4503,0,0,0,100,0),
+(@PATH,12,3757.834,3500.429,371.4323,0,0,0,100,0),
+(@PATH,13,3769.854,3508.61,371.3447,0,0,0,100,0),
+(@PATH,14,3757.834,3500.429,371.4323,0,0,0,100,0);
+
diff --git a/sql/updates/world/2011_03_17_02_world_sai.sql b/sql/updates/world/2011_03_17_02_world_sai.sql
new file mode 100644
index 00000000000..19b4b7e4ea0
--- /dev/null
+++ b/sql/updates/world/2011_03_17_02_world_sai.sql
@@ -0,0 +1,78 @@
+-- Pathing for Fizzcrank Airman Entry: 26601
+SET @NPC := 117944;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=4120.091,`position_y`=5343.777,`position_z`=29.24856 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,4111.694,5334.971,28.74856,0,0,0,100,0),
+(@PATH,2,4102.274,5325.254,28.6343,0,0,0,100,0),
+(@PATH,3,4091.229,5314.824,29.10337,0,0,0,100,0),
+(@PATH,4,4083.519,5306.313,28.47837,0,0,0,100,0),
+(@PATH,5,4072.305,5295.377,28.82582,0,0,0,100,0),
+(@PATH,6,4083.519,5306.313,28.47837,0,0,0,100,0),
+(@PATH,7,4091.229,5314.824,29.10337,0,0,0,100,0),
+(@PATH,8,4102.274,5325.254,28.6343,0,0,0,100,0),
+(@PATH,9,4111.694,5334.971,28.74856,0,0,0,100,0),
+(@PATH,10,4120.091,5343.777,29.24856,0,0,0,100,0);
+
+-- Pathing for Fizzcrank Airman Entry: 26601
+SET @NPC := 117922;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=4171.854,`position_y`=5364.676,`position_z`=29.09072 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,4162.717,5358.622,28.71572,0,0,0,100,0),
+(@PATH,2,4171.854,5364.676,29.09072,0,0,0,100,0),
+(@PATH,3,4175.919,5373.461,28.73422,0,0,0,100,0),
+(@PATH,4,4180.79,5375.921,28.85922,0,0,0,100,0),
+(@PATH,5,4189.647,5383.252,28.98422,0,0,0,100,0),
+(@PATH,6,4196.353,5389.414,28.98422,0,0,0,100,0),
+(@PATH,7,4205.784,5399.744,29.17458,0,0,0,100,0),
+(@PATH,8,4175.919,5373.461,28.73422,0,0,0,100,0),
+(@PATH,9,4171.854,5364.676,29.09072,0,0,0,100,0);
+
+-- Pathing for Fizzcrank Airman Entry: 26601
+SET @NPC := 117952;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=4114.012,`position_y`=5310.07,`position_z`=28.7593 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,4114.952,5312.266,28.7593,0,0,0,100,0),
+(@PATH,2,4120.03,5314.749,28.8843,0,0,0,100,0),
+(@PATH,3,4128.648,5324.809,28.7593,0,0,0,100,0),
+(@PATH,4,4132.928,5329.057,28.7593,0,0,0,100,0),
+(@PATH,5,4129.167,5323.958,28.7593,0,0,0,100,0),
+(@PATH,6,4120.03,5314.749,28.8843,0,0,0,100,0),
+(@PATH,7,4114.952,5312.266,28.7593,0,0,0,100,0),
+(@PATH,8,4114.012,5310.07,28.7593,0,0,0,100,0),
+(@PATH,9,4110.154,5305.583,28.7593,0,0,0,100,0),
+(@PATH,10,4106.395,5299.221,29.22841,0,0,0,100,0),
+(@PATH,11,4098.468,5291.356,29.32582,0,0,0,100,0),
+(@PATH,12,4087.384,5281.144,29.20082,0,0,0,100,0),
+(@PATH,13,4098.468,5291.356,29.32582,0,0,0,100,0),
+(@PATH,14,4106.395,5299.221,29.22841,0,0,0,100,0),
+(@PATH,15,4110.154,5305.583,28.7593,0,0,0,100,0),
+(@PATH,16,4114.012,5310.07,28.7593,0,0,0,100,0);
+
+-- Pathing for Fizzcrank Airman Entry: 26601
+SET @NPC := 117951;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=4156.205,`position_y`=5379.297,`position_z`=28.60338 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,4145.584,5368.483,28.97838,0,0,0,100,0),
+(@PATH,2,4137.288,5361.018,28.96572,0,0,0,100,0),
+(@PATH,3,4145.584,5368.483,28.97838,0,0,0,100,0),
+(@PATH,4,4156.205,5379.297,28.60338,0,0,0,100,0),
+(@PATH,5,4165.664,5389.022,28.97838,0,0,0,100,0),
+(@PATH,6,4175.249,5398.305,29.10922,0,0,0,100,0),
+(@PATH,7,4165.664,5389.022,28.97838,0,0,0,100,0),
+(@PATH,8,4156.205,5379.297,28.60338,0,0,0,100,0);
diff --git a/sql/updates/world/2011_03_17_03_world_creature_template.sql b/sql/updates/world/2011_03_17_03_world_creature_template.sql
new file mode 100644
index 00000000000..6190390b4c6
--- /dev/null
+++ b/sql/updates/world/2011_03_17_03_world_creature_template.sql
@@ -0,0 +1,44 @@
+-- Razaani Light Orb Fixup
+SET @ENTRY := 20635; -- NPC entry
+UPDATE `creature` SET `modelid`=0 WHERE `id`=@ENTRY;
+UPDATE `creature_template` SET `InhabitType`=7 WHERE `entry`=@ENTRY;
+-- Blade's Edge - Orb Trigger 01 Fixup and set as trigger
+SET @ENTRY := 20666; -- NPC entry
+UPDATE `creature` SET `modelid`=0,`spawndist`=0,`MovementType`=0 WHERE `id`=@ENTRY;
+UPDATE `creature_template` SET `InhabitType`=7,`flags_extra`=`flags_extra`|128 WHERE `entry`=@ENTRY;
+-- Blade's Edge - Flesh Beast Zap Trigger Fixup and set as trigger
+SET @ENTRY := 20670; -- NPC entry
+UPDATE `creature` SET `modelid`=0,`spawndist`=0,`MovementType`=0 WHERE `id`=@ENTRY;
+UPDATE `creature_template` SET `InhabitType`=7,`flags_extra`=`flags_extra`|128 WHERE `entry`=@ENTRY;
+-- Razaani Light Orb - Mini Fixup and set as trigger
+SET @ENTRY := 20771; -- NPC entry
+UPDATE `creature` SET `modelid`=0,`spawndist`=0,`MovementType`=0 WHERE `id`=@ENTRY;
+UPDATE `creature_template` SET `InhabitType`=7,`flags_extra`=`flags_extra`|128 WHERE `entry`=@ENTRY;
+-- Blade's Edge - Deadsoul Orb Fixup and set as trigger
+SET @ENTRY := 20845; -- NPC entry
+UPDATE `creature` SET `modelid`=0,`spawndist`=0,`MovementType`=0 WHERE `id`=@ENTRY;
+UPDATE `creature_template` SET `InhabitType`=7,`flags_extra`=`flags_extra`|128 WHERE `entry`=@ENTRY;
+-- Blade's Edge - Deadsoul Orb Flight 01 Fixup and set as trigger
+SET @ENTRY := 20851; -- NPC entry
+UPDATE `creature` SET `modelid`=0,`spawndist`=0,`MovementType`=0 WHERE `id`=@ENTRY;
+UPDATE `creature_template` SET `InhabitType`=7,`flags_extra`=`flags_extra`|128 WHERE `entry`=@ENTRY;
+-- Blade's Edge - Deadsoul Orb Flight 02 Fixup and set as trigger
+SET @ENTRY := 20852; -- NPC entry
+UPDATE `creature` SET `modelid`=0,`spawndist`=0,`MovementType`=0 WHERE `id`=@ENTRY;
+UPDATE `creature_template` SET `InhabitType`=7,`flags_extra`=`flags_extra`|128 WHERE `entry`=@ENTRY;
+-- Blade's Edge - Deadsoul Orb Flight 03 Fixup and set as trigger
+SET @ENTRY := 20853; -- NPC entry
+UPDATE `creature` SET `modelid`=0,`spawndist`=0,`MovementType`=0 WHERE `id`=@ENTRY;
+UPDATE `creature_template` SET `InhabitType`=7,`flags_extra`=`flags_extra`|128 WHERE `entry`=@ENTRY;
+-- Blade's Edge - Deadsoul Orb Flight 04 Fixup and set as trigger
+SET @ENTRY := 20855; -- NPC entry
+UPDATE `creature` SET `modelid`=0,`spawndist`=0,`MovementType`=0 WHERE `id`=@ENTRY;
+UPDATE `creature_template` SET `InhabitType`=7,`flags_extra`=`flags_extra`|128 WHERE `entry`=@ENTRY;
+-- Blade's Edge - Deadsoul Orb Flight 05 Fixup and set as trigger
+SET @ENTRY := 20856; -- NPC entry
+UPDATE `creature` SET `modelid`=0,`spawndist`=0,`MovementType`=0 WHERE `id`=@ENTRY;
+UPDATE `creature_template` SET `InhabitType`=7,`flags_extra`=`flags_extra`|128 WHERE `entry`=@ENTRY;
+-- Blade's Edge - Nexus Prince Event - Orb01 Fixup and set as trigger
+SET @ENTRY := 21025; -- NPC entry
+UPDATE `creature` SET `modelid`=0,`spawndist`=0,`MovementType`=0 WHERE `id`=@ENTRY;
+UPDATE `creature_template` SET `InhabitType`=7,`flags_extra`=`flags_extra`|128 WHERE `entry`=@ENTRY;
diff --git a/sql/updates/world/2011_03_17_04_world_sai.sql b/sql/updates/world/2011_03_17_04_world_sai.sql
new file mode 100644
index 00000000000..8494c2c2649
--- /dev/null
+++ b/sql/updates/world/2011_03_17_04_world_sai.sql
@@ -0,0 +1,19 @@
+-- Lost Drakkari Spirit SAI
+SET @ENTRY := 29129;
+SET @AURA := 17327;
+SET @SPELL1 := 37361;
+SET @SPELL2 := 24050;
+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;
+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,23,0,100,0,@AURA,0,2000,2000,11,@AURA,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Lost Drakkari Spirit - Aura Spirit Particles not present - Add Aura Spirit Particles'),
+(@ENTRY,0,1,2,4,0,100,1,0,0,0,0,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Lost Drakkari Spirit - On Aggro - Prevent Combat Movement'),
+(@ENTRY,0,2,0,61,0,100,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Lost Drakkari Spirit - On Aggro - Set Phase 1'),
+(@ENTRY,0,3,0,0,1,100,0,0,0,1000,1000,11,@SPELL1,1,0,0,0,0,2,0,0,0,0,0,0,0,'Lost Drakkari Spirit - Combat - Cast Arcane Bolt (Phase 1)'),
+(@ENTRY,0,4,5,3,1,100,0,15,0,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Lost Drakkari Spirit - Mana at 15% - Allow combat movement (Phase 1)'),
+(@ENTRY,0,5,0,61,1,100,0,0,0,0,0,22,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Lost Drakkari Spirit - Mana at 15% - Set phase 2 (Phase 1)'),
+(@ENTRY,0,6,0,9,1,100,0,35,80,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Lost Drakkari Spirit - At 35 yards - Allow combat movement (Phase 1)'),
+(@ENTRY,0,7,0,9,1,100,0,0,15,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Lost Drakkari Spirit - Below 15 yards - Prevent combat movement (Phase 1)'),
+(@ENTRY,0,8,0,3,2,100,0,100,30,100,100,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Lost Drakkari Spirit - Mana above 30% - Set phase 1 (Phase 2)'),
+(@ENTRY,0,9,0,0,0,100,0,10000,16000,15000,18000,11,@SPELL2,1,0,0,0,0,2,0,0,0,0,0,0,0,'Lost Drakkari Spirit - Combat - Cast Spirit Burst');
diff --git a/sql/updates/world/2011_03_17_05_world_sai.sql b/sql/updates/world/2011_03_17_05_world_sai.sql
new file mode 100644
index 00000000000..7da7c189fe1
--- /dev/null
+++ b/sql/updates/world/2011_03_17_05_world_sai.sql
@@ -0,0 +1,29 @@
+-- Frozen Earth SAI
+SET @ENTRY   := 28411; -- NPC entry
+SET @TARGET  := 23837; -- ELM General Porpose Bunny
+SET @SPELL1  := 54532; -- Ice Spike
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (@ENTRY,-119784,-119944,-119945,-119947,-119949,-119951,-119968,-119991);
+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,0,1000,4000,10000,17000,11,@SPELL1,0,0,0,0,0,2,0,0,0,0,0,0,0,'Frozen Earth - Combat - Cast Ice Spike on victim'),
+(-119784,0,0,0,1,0,100,0,1000,4000,4000,7000,11,51590,2,0,0,0,0,11,@TARGET,120,0,0,0,0,0,'Frozen Earth - OOC - Cast Toss Ice Boulder'),
+(-119784,0,1,0,0,0,100,0,1000,4000,10000,17000,11,@SPELL1,0,0,0,0,0,2,0,0,0,0,0,0,0,'Frozen Earth - Combat - Cast Ice Spike on victim'),
+(-119944,0,0,0,1,0,100,0,1000,4000,4000,7000,11,51590,2,0,0,0,0,11,@TARGET,120,0,0,0,0,0,'Frozen Earth - OOC - Cast Toss Ice Boulder'),
+(-119944,0,1,0,0,0,100,0,1000,4000,10000,17000,11,@SPELL1,0,0,0,0,0,2,0,0,0,0,0,0,0,'Frozen Earth - Combat - Cast Ice Spike on victim'),
+(-119945,0,0,0,1,0,100,0,1000,4000,4000,7000,11,51590,2,0,0,0,0,11,@TARGET,120,0,0,0,0,0,'Frozen Earth - OOC - Cast Toss Ice Boulder'),
+(-119945,0,1,0,0,0,100,0,1000,4000,10000,17000,11,@SPELL1,0,0,0,0,0,2,0,0,0,0,0,0,0,'Frozen Earth - Combat - Cast Ice Spike on victim'),
+(-119947,0,0,0,1,0,100,0,1000,4000,4000,7000,11,51590,2,0,0,0,0,11,@TARGET,120,0,0,0,0,0,'Frozen Earth - OOC - Cast Toss Ice Boulder'),
+(-119947,0,1,0,0,0,100,0,1000,4000,10000,17000,11,@SPELL1,0,0,0,0,0,2,0,0,0,0,0,0,0,'Frozen Earth - Combat - Cast Ice Spike on victim'),
+(-119949,0,0,0,1,0,100,0,1000,4000,4000,7000,11,51590,2,0,0,0,0,11,@TARGET,120,0,0,0,0,0,'Frozen Earth - OOC - Cast Toss Ice Boulder'),
+(-119949,0,1,0,0,0,100,0,1000,4000,10000,17000,11,@SPELL1,0,0,0,0,0,2,0,0,0,0,0,0,0,'Frozen Earth - Combat - Cast Ice Spike on victim'),
+(-119951,0,0,0,1,0,100,0,1000,4000,4000,7000,11,51590,2,0,0,0,0,11,@TARGET,120,0,0,0,0,0,'Frozen Earth - OOC - Cast Toss Ice Boulder'),
+(-119951,0,1,0,0,0,100,0,1000,4000,10000,17000,11,@SPELL1,0,0,0,0,0,2,0,0,0,0,0,0,0,'Frozen Earth - Combat - Cast Ice Spike on victim'),
+(-119968,0,0,0,1,0,100,0,1000,4000,4000,7000,11,51590,2,0,0,0,0,11,@TARGET,120,0,0,0,0,0,'Frozen Earth - OOC - Cast Toss Ice Boulder'),
+(-119968,0,1,0,0,0,100,0,1000,4000,10000,17000,11,@SPELL1,0,0,0,0,0,2,0,0,0,0,0,0,0,'Frozen Earth - Combat - Cast Ice Spike on victim'),
+(-119991,0,0,0,1,0,100,0,1000,4000,4000,7000,11,51590,2,0,0,0,0,11,@TARGET,120,0,0,0,0,0,'Frozen Earth - OOC - Cast Toss Ice Boulder'),
+(-119991,0,1,0,0,0,100,0,1000,4000,10000,17000,11,@SPELL1,0,0,0,0,0,2,0,0,0,0,0,0,0,'Frozen Earth - Combat - Cast Ice Spike on victim');
+-- Fix Spell condition for Spell 51590 to only target ELM General Porpose Bunny
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=51590;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(13,0,51590,0,18,1,23837,0,0,'','Spell 51590 targets only ELM General Porpose Bunny');
diff --git a/sql/updates/world/2011_03_17_06_world_sai.sql b/sql/updates/world/2011_03_17_06_world_sai.sql
new file mode 100644
index 00000000000..f7eec6ea0c1
--- /dev/null
+++ b/sql/updates/world/2011_03_17_06_world_sai.sql
@@ -0,0 +1,8 @@
+-- Legion Fel Cannon SAI
+SET @ENTRY := 21233;
+SET @SPELL1 := 36238; -- Fel Cannon Blast
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,1,0,100,1,1000,1000,1000,1000,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Legion Fel Cannon - OOC - Prevent Combat Movement'),
+(@ENTRY,0,1,0,0,0,100,0,0,1000,2500,2500,11,@SPELL1,1,0,0,0,0,2,0,0,0,0,0,0,0,'Legion Fel Cannon - Combat - Cast Fel Cannon Blast');
diff --git a/sql/updates/world/2011_03_17_07_world_sai.sql b/sql/updates/world/2011_03_17_07_world_sai.sql
new file mode 100644
index 00000000000..9d1ea279ebd
--- /dev/null
+++ b/sql/updates/world/2011_03_17_07_world_sai.sql
@@ -0,0 +1,8 @@
+-- Fel Cannon MKI SAI
+SET @ENTRY := 22461;
+SET @SPELL1 := 36238; -- Fel Cannon Blast
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,1,0,100,1,1000,1000,1000,1000,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Fel Cannon MKI - OOC - Prevent Combat Movement'),
+(@ENTRY,0,1,0,0,0,100,0,0,1000,2500,2500,11,@SPELL1,1,0,0,0,0,2,0,0,0,0,0,0,0,'Fel Cannon MKI - Combat - Cast Fel Cannon Blast');
diff --git a/sql/updates/world/2011_03_17_08_world_sai.sql b/sql/updates/world/2011_03_17_08_world_sai.sql
new file mode 100644
index 00000000000..03fa5a829a8
--- /dev/null
+++ b/sql/updates/world/2011_03_17_08_world_sai.sql
@@ -0,0 +1,11 @@
+-- High Priest Andorath SAI
+SET @ENTRY   := 25392;
+SET @CHANNEL := 45491; -- Necrotic Purple Beam
+SET @TARGET  := 25534; -- En'kilah Blood Globe
+UPDATE `creature_template` SET `speed_run`=1,`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,2000,6000,32000,32000,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0,'High Priest Andorath - OOC - Run Script every 32 sec'),
+(@ENTRY*100,9,0,0,0,0,100,0,0,0,0,0,11,@CHANNEL,0,0,0,0,0,11,@TARGET,20,0,0,0,0,0, 'High Priest Andorath - script - Channel spell'),
+(@ENTRY*100,9,1,0,0,0,100,0,23000,23000,0,0,92,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'High Priest Andorath - script - Stop Channeling');
diff --git a/sql/updates/world/2011_03_17_09_world_sai.sql b/sql/updates/world/2011_03_17_09_world_sai.sql
new file mode 100644
index 00000000000..62e5f4c1f64
--- /dev/null
+++ b/sql/updates/world/2011_03_17_09_world_sai.sql
@@ -0,0 +1,7 @@
+-- Add aura to Zul'Drak Gateway Trigger if aura not present
+SET @ENTRY := 28181;
+SET @SPELL := 50795;
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,23,0,100,0,@SPELL,0,2000,2000,11,@SPELL,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Zul''Drak Gateway Trigger - Aura Zul''Drak Gateway not present - Add Aura Zul''Drak Gateway');
diff --git a/sql/updates/world/2011_03_17_0_world_sai.sql b/sql/updates/world/2011_03_17_0_world_sai.sql
deleted file mode 100644
index 3fb85bbd2ac..00000000000
--- a/sql/updates/world/2011_03_17_0_world_sai.sql
+++ /dev/null
@@ -1,297 +0,0 @@
--- Pathing for En'kilah Crypt Fiend Entry: 25386
-SET @NPC := 99939;
-SET @PATH := @NPC * 10;
-UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=3859.662,`position_y`=3393.562,`position_z`=67.97741 WHERE `guid`=@NPC;
-DELETE FROM `creature_addon` WHERE `guid`=@NPC;
-INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, '');
-DELETE FROM `waypoint_data` WHERE `id`=@PATH;
-INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
-(@PATH,1,3856.184,3393.872,68.60241,0,0,0,100,0),
-(@PATH,2,3853.398,3388.785,70.60241,0,0,0,100,0),
-(@PATH,3,3856.184,3393.872,68.60241,0,0,0,100,0),
-(@PATH,4,3859.662,3393.562,67.97741,0,0,0,100,0),
-(@PATH,5,3865.199,3400.655,64.67162,0,0,0,100,0),
-(@PATH,6,3862.853,3407.01,64.17162,0,0,0,100,0),
-(@PATH,7,3864.934,3414.912,64.17162,0,0,0,100,0),
-(@PATH,8,3862.853,3407.01,64.17162,0,0,0,100,0),
-(@PATH,9,3865.199,3400.655,64.67162,0,0,0,100,0),
-(@PATH,10,3859.662,3393.562,67.97741,0,0,0,100,0);
-
--- Pathing for En'kilah Crypt Fiend Entry: 25386
-SET @NPC := 100009;
-SET @PATH := @NPC * 10;
-UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=3896.402,`position_y`=3454.12,`position_z`=64.19093 WHERE `guid`=@NPC;
-DELETE FROM `creature_addon` WHERE `guid`=@NPC;
-INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, '');
-DELETE FROM `waypoint_data` WHERE `id`=@PATH;
-INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
-(@PATH,1,3890.689,3458.416,65.06593,0,0,0,100,0),
-(@PATH,2,3878.707,3463.25,64.06593,0,0,0,100,0),
-(@PATH,3,3865.527,3468.116,64.16493,0,0,0,100,0),
-(@PATH,4,3867.453,3467.697,64.16493,0,0,0,100,0),
-(@PATH,5,3878.97,3463.877,64.06593,0,0,0,100,0),
-(@PATH,6,3896.402,3454.12,64.19093,0,0,0,100,0);
-
--- Pathing for En'kilah Crypt Fiend Entry: 25386
-SET @NPC := 99955;
-SET @PATH := @NPC * 10;
-UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=3849.937,`position_y`=3440.836,`position_z`=64.08922 WHERE `guid`=@NPC;
-DELETE FROM `creature_addon` WHERE `guid`=@NPC;
-INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, '');
-DELETE FROM `waypoint_data` WHERE `id`=@PATH;
-INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
-(@PATH,1,3844.136,3430.625,64.17162,0,0,0,100,0),
-(@PATH,2,3836.185,3415.533,67.29662,0,0,0,100,0),
-(@PATH,3,3838.057,3414.41,67.17162,0,0,0,100,0),
-(@PATH,4,3843.113,3427.501,64.29662,0,0,0,100,0),
-(@PATH,5,3848.386,3439.262,64.08922,0,0,0,100,0),
-(@PATH,6,3849.937,3440.836,64.08922,0,0,0,100,0);
-
--- Pathing for En'kilah Crypt Fiend Entry: 25386
-SET @NPC := 99856;
-SET @PATH := @NPC * 10;
-UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=3944.872,`position_y`=3387.368,`position_z`=82.84169 WHERE `guid`=@NPC;
-DELETE FROM `creature_addon` WHERE `guid`=@NPC;
-INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, '');
-DELETE FROM `waypoint_data` WHERE `id`=@PATH;
-INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
-(@PATH,1,3958.746,3388.819,83.46669,0,0,0,100,0),
-(@PATH,2,3939.345,3406.614,80.91746,0,0,0,100,0),
-(@PATH,3,3932.713,3412.609,80.93697,0,0,0,100,0),
-(@PATH,4,3931.988,3409.037,80.93697,0,0,0,100,0),
-(@PATH,5,3940.203,3397.782,80.96669,0,0,0,100,0),
-(@PATH,6,3944.872,3387.368,82.84169,0,0,0,100,0);
-
--- Pathing for En'kilah Crypt Fiend Entry: 25386
-SET @NPC := 99853;
-SET @PATH := @NPC * 10;
-UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=3988.71,`position_y`=3389.023,`position_z`=84.59169 WHERE `guid`=@NPC;
-DELETE FROM `creature_addon` WHERE `guid`=@NPC;
-INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, '');
-DELETE FROM `waypoint_data` WHERE `id`=@PATH;
-INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
-(@PATH,1,3995.287,3398.66,83.21669,0,0,0,100,0),
-(@PATH,2,3999.713,3411.761,84.47887,0,0,0,100,0),
-(@PATH,3,3992.017,3414.793,83.10387,0,0,0,100,0),
-(@PATH,4,3980.25,3399.608,80.96669,0,0,0,100,0),
-(@PATH,5,3973.198,3392.127,81.21669,0,0,0,100,0),
-(@PATH,6,3981.25,3389.583,83.71669,0,0,0,100,0),
-(@PATH,7,3988.71,3389.023,84.59169,0,0,0,100,0);
-
--- Pathing for En'kilah Crypt Fiend Entry: 25386
-SET @NPC := 100008;
-SET @PATH := @NPC * 10;
-UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=3961.064,`position_y`=3422.165,`position_z`=80.91746 WHERE `guid`=@NPC;
-DELETE FROM `creature_addon` WHERE `guid`=@NPC;
-INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, '');
-DELETE FROM `waypoint_data` WHERE `id`=@PATH;
-INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
-(@PATH,1,3958.62,3407.545,80.91746,0,0,0,100,0),
-(@PATH,2,3959.292,3391.561,82.09169,0,0,0,100,0),
-(@PATH,3,3959.987,3394.481,81.09169,0,0,0,100,0),
-(@PATH,4,3961.145,3408.606,80.91746,0,0,0,100,0),
-(@PATH,5,3963.867,3424.426,80.91746,0,0,0,100,0),
-(@PATH,6,3961.064,3422.165,80.91746,0,0,0,100,0);
--- 0xF13000632A00102F .go 3958.62 3407.545 80.91746
-
--- Pathing for En'kilah Crypt Fiend Entry: 25386
-SET @NPC := 100011;
-SET @PATH := @NPC * 10;
-UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=3973.765,`position_y`=3685.582,`position_z`=63.20702 WHERE `guid`=@NPC;
-DELETE FROM `creature_addon` WHERE `guid`=@NPC;
-INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, '');
-DELETE FROM `waypoint_data` WHERE `id`=@PATH;
-INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
-(@PATH,1,3985.953,3658.16,62.64196,0,0,0,100,0),
-(@PATH,2,3981.12,3655.121,62.51696,0,0,0,100,0),
-(@PATH,3,3975.807,3676.29,63.20702,0,0,0,100,0),
-(@PATH,4,3968.138,3708.388,63.14015,0,0,0,100,0),
-(@PATH,5,3973.765,3685.582,63.20702,0,0,0,100,0);
--- 0xF53000632A016E01 .go 3985.953 3658.16 62.64196
-
--- Pathing for En'kilah Crypt Fiend Entry: 25386
-SET @NPC := 99855;
-SET @PATH := @NPC * 10;
-UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=3767.44,`position_y`=3483.963,`position_z`=64.18696 WHERE `guid`=@NPC;
-DELETE FROM `creature_addon` WHERE `guid`=@NPC;
-INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, '');
-DELETE FROM `waypoint_data` WHERE `id`=@PATH;
-INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
-(@PATH,1,3765.76,3473.853,64.31196,0,0,0,100,0),
-(@PATH,2,3767.138,3500.103,64.0854,0,0,0,100,0),
-(@PATH,3,3770.234,3518.467,64.0854,0,0,0,100,0),
-(@PATH,4,3769.093,3509.577,64.0854,0,0,0,100,0),
-(@PATH,5,3768.024,3494.981,64.18696,0,0,0,100,0),
-(@PATH,6,3767.44,3483.963,64.18696,0,0,0,100,0);
--- 0xF53000632A017C11 .go 3765.76 3473.853 64.31196
-
--- Pathing for En'kilah Crypt Fiend Entry: 25386
-SET @NPC := 99939;
-SET @PATH := @NPC * 10;
-UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=3859.662,`position_y`=3393.562,`position_z`=67.97741 WHERE `guid`=@NPC;
-DELETE FROM `creature_addon` WHERE `guid`=@NPC;
-INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, '');
-DELETE FROM `waypoint_data` WHERE `id`=@PATH;
-INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
-(@PATH,1,3856.184,3393.872,68.60241,0,0,0,100,0),
-(@PATH,2,3853.398,3388.785,70.60241,0,0,0,100,0),
-(@PATH,3,3856.184,3393.872,68.60241,0,0,0,100,0),
-(@PATH,4,3859.662,3393.562,67.97741,0,0,0,100,0),
-(@PATH,5,3865.199,3400.655,64.67162,0,0,0,100,0),
-(@PATH,6,3862.853,3407.01,64.17162,0,0,0,100,0),
-(@PATH,7,3864.934,3414.912,64.17162,0,0,0,100,0),
-(@PATH,8,3862.853,3407.01,64.17162,0,0,0,100,0),
-(@PATH,9,3865.199,3400.655,64.67162,0,0,0,100,0),
-(@PATH,10,3859.662,3393.562,67.97741,0,0,0,100,0);
-
--- Pathing for En'kilah Crypt Fiend Entry: 25386
-SET @NPC := 100009;
-SET @PATH := @NPC * 10;
-UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=3896.402,`position_y`=3454.12,`position_z`=64.19093 WHERE `guid`=@NPC;
-DELETE FROM `creature_addon` WHERE `guid`=@NPC;
-INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, '');
-DELETE FROM `waypoint_data` WHERE `id`=@PATH;
-INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
-(@PATH,1,3890.689,3458.416,65.06593,0,0,0,100,0),
-(@PATH,2,3878.707,3463.25,64.06593,0,0,0,100,0),
-(@PATH,3,3865.527,3468.116,64.16493,0,0,0,100,0),
-(@PATH,4,3867.453,3467.697,64.16493,0,0,0,100,0),
-(@PATH,5,3878.97,3463.877,64.06593,0,0,0,100,0),
-(@PATH,6,3896.402,3454.12,64.19093,0,0,0,100,0);
-
--- Pathing for En'kilah Crypt Fiend Entry: 25386
-SET @NPC := 99955;
-SET @PATH := @NPC * 10;
-UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=3849.937,`position_y`=3440.836,`position_z`=64.08922 WHERE `guid`=@NPC;
-DELETE FROM `creature_addon` WHERE `guid`=@NPC;
-INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, '');
-DELETE FROM `waypoint_data` WHERE `id`=@PATH;
-INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
-(@PATH,1,3844.136,3430.625,64.17162,0,0,0,100,0),
-(@PATH,2,3836.185,3415.533,67.29662,0,0,0,100,0),
-(@PATH,3,3838.057,3414.41,67.17162,0,0,0,100,0),
-(@PATH,4,3843.113,3427.501,64.29662,0,0,0,100,0),
-(@PATH,5,3848.386,3439.262,64.08922,0,0,0,100,0),
-(@PATH,6,3849.937,3440.836,64.08922,0,0,0,100,0);
-
--- Pathing for En'kilah Crypt Fiend Entry: 25386
-SET @NPC := 99856;
-SET @PATH := @NPC * 10;
-UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=3944.872,`position_y`=3387.368,`position_z`=82.84169 WHERE `guid`=@NPC;
-DELETE FROM `creature_addon` WHERE `guid`=@NPC;
-INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, '');
-DELETE FROM `waypoint_data` WHERE `id`=@PATH;
-INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
-(@PATH,1,3958.746,3388.819,83.46669,0,0,0,100,0),
-(@PATH,2,3939.345,3406.614,80.91746,0,0,0,100,0),
-(@PATH,3,3932.713,3412.609,80.93697,0,0,0,100,0),
-(@PATH,4,3931.988,3409.037,80.93697,0,0,0,100,0),
-(@PATH,5,3940.203,3397.782,80.96669,0,0,0,100,0),
-(@PATH,6,3944.872,3387.368,82.84169,0,0,0,100,0);
-
--- Pathing for En'kilah Crypt Fiend Entry: 25386
-SET @NPC := 99853;
-SET @PATH := @NPC * 10;
-UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=3988.71,`position_y`=3389.023,`position_z`=84.59169 WHERE `guid`=@NPC;
-DELETE FROM `creature_addon` WHERE `guid`=@NPC;
-INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, '');
-DELETE FROM `waypoint_data` WHERE `id`=@PATH;
-INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
-(@PATH,1,3995.287,3398.66,83.21669,0,0,0,100,0),
-(@PATH,2,3999.713,3411.761,84.47887,0,0,0,100,0),
-(@PATH,3,3992.017,3414.793,83.10387,0,0,0,100,0),
-(@PATH,4,3980.25,3399.608,80.96669,0,0,0,100,0),
-(@PATH,5,3973.198,3392.127,81.21669,0,0,0,100,0),
-(@PATH,6,3981.25,3389.583,83.71669,0,0,0,100,0),
-(@PATH,7,3988.71,3389.023,84.59169,0,0,0,100,0);
-
--- Pathing for En'kilah Crypt Fiend Entry: 25386
-SET @NPC := 100008;
-SET @PATH := @NPC * 10;
-UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=3961.064,`position_y`=3422.165,`position_z`=80.91746 WHERE `guid`=@NPC;
-DELETE FROM `creature_addon` WHERE `guid`=@NPC;
-INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, '');
-DELETE FROM `waypoint_data` WHERE `id`=@PATH;
-INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
-(@PATH,1,3958.62,3407.545,80.91746,0,0,0,100,0),
-(@PATH,2,3959.292,3391.561,82.09169,0,0,0,100,0),
-(@PATH,3,3959.987,3394.481,81.09169,0,0,0,100,0),
-(@PATH,4,3961.145,3408.606,80.91746,0,0,0,100,0),
-(@PATH,5,3963.867,3424.426,80.91746,0,0,0,100,0),
-(@PATH,6,3961.064,3422.165,80.91746,0,0,0,100,0);
-
--- Pathing for En'kilah Crypt Fiend Entry: 25386
-SET @NPC := 100011;
-SET @PATH := @NPC * 10;
-UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=3973.765,`position_y`=3685.582,`position_z`=63.20702 WHERE `guid`=@NPC;
-DELETE FROM `creature_addon` WHERE `guid`=@NPC;
-INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, '');
-DELETE FROM `waypoint_data` WHERE `id`=@PATH;
-INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
-(@PATH,1,3985.953,3658.16,62.64196,0,0,0,100,0),
-(@PATH,2,3981.12,3655.121,62.51696,0,0,0,100,0),
-(@PATH,3,3975.807,3676.29,63.20702,0,0,0,100,0),
-(@PATH,4,3968.138,3708.388,63.14015,0,0,0,100,0),
-(@PATH,5,3973.765,3685.582,63.20702,0,0,0,100,0);
-
--- Pathing for En'kilah Crypt Fiend Entry: 25386
-SET @NPC := 99860;
-SET @PATH := @NPC * 10;
-UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=3736.829,`position_y`=3590.097,`position_z`=47.62042 WHERE `guid`=@NPC;
-DELETE FROM `creature_addon` WHERE `guid`=@NPC;
-INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, '');
-DELETE FROM `waypoint_data` WHERE `id`=@PATH;
-INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
-(@PATH,1,3740.556,3611.562,49.59578,0,0,0,100,0),
-(@PATH,2,3743.815,3598.767,46.74542,0,0,0,100,0),
-(@PATH,3,3750.231,3578.953,46.87042,0,0,0,100,0),
-(@PATH,4,3744.763,3577.349,46.87042,0,0,0,100,0),
-(@PATH,5,3736.829,3590.097,47.62042,0,0,0,100,0);
-
--- Pathing for En'kilah Crypt Fiend Entry: 25386
-SET @NPC := 99861;
-SET @PATH := @NPC * 10;
-UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=3781.2,`position_y`=3555.762,`position_z`=47.13174 WHERE `guid`=@NPC;
-DELETE FROM `creature_addon` WHERE `guid`=@NPC;
-INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, '');
-DELETE FROM `waypoint_data` WHERE `id`=@PATH;
-INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
-(@PATH,1,3781.763,3556.428,47.13174,0,0,0,100,0),
-(@PATH,2,3784.81,3570.215,46.82142,0,0,0,100,0),
-(@PATH,3,3784.099,3579.592,48.19642,0,0,0,100,0),
-(@PATH,4,3784.9,3578.852,48.32142,0,0,0,100,0),
-(@PATH,5,3784.858,3565.897,46.63174,0,0,0,100,0),
-(@PATH,6,3781.2,3555.762,47.13174,0,0,0,100,0);
-
--- Pathing for En'kilah Crypt Fiend Entry: 25386
-SET @NPC := 99873;
-SET @PATH := @NPC * 10;
-UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=3795.21,`position_y`=3453.815,`position_z`=82.97263 WHERE `guid`=@NPC;
-DELETE FROM `creature_addon` WHERE `guid`=@NPC;
-INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, '');
-DELETE FROM `waypoint_data` WHERE `id`=@PATH;
-INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
-(@PATH,1,3789.819,3445.883,82.97262,0,0,0,100,0),
-(@PATH,2,3785.635,3440.609,82.97261,0,0,0,100,0),
-(@PATH,3,3780.893,3429.421,82.9726,0,0,0,100,0),
-(@PATH,4,3785.635,3440.609,82.97261,0,0,0,100,0),
-(@PATH,5,3789.819,3445.883,82.97262,0,0,0,100,0),
-(@PATH,6,3795.21,3453.815,82.97263,0,0,0,100,0);
-
--- Pathing for En'kilah Crypt Fiend Entry: 25386
-SET @NPC := 99871;
-SET @PATH := @NPC * 10;
-UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=3812.432,`position_y`=3443.979,`position_z`=82.97263 WHERE `guid`=@NPC;
-DELETE FROM `creature_addon` WHERE `guid`=@NPC;
-INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, '');
-DELETE FROM `waypoint_data` WHERE `id`=@PATH;
-INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
-(@PATH,1,3808.239,3432.998,82.97262,0,0,0,100,0),
-(@PATH,2,3805.263,3425.894,82.97261,0,0,0,100,0),
-(@PATH,3,3808.239,3432.998,82.97262,0,0,0,100,0),
-(@PATH,4,3812.432,3443.979,82.97263,0,0,0,100,0);
-
--- Remove 2 over spawns 
-DELETE FROM `creature` WHERE `guid` IN (99859,99858);
-DELETE FROM `creature_addon` WHERE `guid` IN (99859,99858);
-
diff --git a/sql/updates/world/2011_03_17_1_world_sai.sql b/sql/updates/world/2011_03_17_1_world_sai.sql
deleted file mode 100644
index 27a22d14aa8..00000000000
--- a/sql/updates/world/2011_03_17_1_world_sai.sql
+++ /dev/null
@@ -1,118 +0,0 @@
--- Pathing for Darkfallen Deathblade Entry: 26103
-SET @NPC := 119232;
-SET @PATH := @NPC * 10;
-UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=3657.896,`position_y`=3592.591,`position_z`=371.479 WHERE `guid`=@NPC;
-DELETE FROM `creature_addon` WHERE `guid`=@NPC;
-INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, '');
-DELETE FROM `waypoint_data` WHERE `id`=@PATH;
-INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
-(@PATH,1,3665.972,3599.461,371.4846,0,0,0,100,0),
-(@PATH,2,3682.637,3610.097,371.4544,0,0,0,100,0),
-(@PATH,3,3696.372,3619.76,371.3447,0,0,0,100,0),
-(@PATH,4,3682.637,3610.097,371.4544,0,0,0,100,0),
-(@PATH,5,3665.972,3599.461,371.4846,0,0,0,100,0),
-(@PATH,6,3657.896,3592.591,371.479,0,0,0,100,0),
-(@PATH,7,3651.491,3585.525,371.674,0,0,0,100,0),
-(@PATH,8,3651.062,3578.088,371.551,0,0,0,100,0),
-(@PATH,9,3656.478,3568.307,371.4457,0,0,0,100,0),
-(@PATH,10,3665.993,3555.432,371.3665,0,0,0,100,0),
-(@PATH,11,3656.478,3568.307,371.4457,0,0,0,100,0),
-(@PATH,12,3651.062,3578.088,371.551,0,0,0,100,0),
-(@PATH,13,3651.473,3585.204,371.6653,0,0,0,100,0),
-(@PATH,14,3657.896,3592.591,371.479,0,0,0,100,0);
-
--- Pathing for Darkfallen Deathblade Entry: 26103
-SET @NPC := 119253;
-SET @PATH := @NPC * 10;
-UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=3742.794,`position_y`=3604.008,`position_z`=346.2505 WHERE `guid`=@NPC;
-DELETE FROM `creature_addon` WHERE `guid`=@NPC;
-INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, '');
-DELETE FROM `waypoint_data` WHERE `id`=@PATH;
-INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
-(@PATH,1,3728.665,3600.99,345.8076,0,0,0,100,0),
-(@PATH,2,3716.573,3595.571,346.0472,0,0,0,100,0),
-(@PATH,3,3709.646,3587.291,345.7931,0,0,0,100,0),
-(@PATH,4,3705.439,3578.289,345.9121,0,0,0,100,0),
-(@PATH,5,3703.899,3570.889,345.8815,0,0,0,100,0),
-(@PATH,6,3704.667,3561.633,345.6407,0,0,0,100,0),
-(@PATH,7,3706.808,3553.582,345.8144,0,0,0,100,0),
-(@PATH,8,3712.931,3543.78,345.7907,0,0,0,100,0),
-(@PATH,9,3718.246,3537.947,345.8893,0,0,0,100,0),
-(@PATH,10,3729.692,3532.638,345.8766,0,0,0,100,0),
-(@PATH,11,3741.682,3531.879,345.7675,0,0,0,100,0),
-(@PATH,12,3752.107,3533.592,345.952,0,0,0,100,0),
-(@PATH,13,3762.405,3538.37,346.1658,0,0,0,100,0),
-(@PATH,14,3772.811,3550.474,346.3304,0,0,0,100,0),
-(@PATH,15,3776.353,3563.746,346.2406,0,0,0,100,0),
-(@PATH,16,3774.419,3578.473,346.1627,0,0,0,100,0),
-(@PATH,17,3768.748,3590.277,346.2671,0,0,0,100,0),
-(@PATH,18,3755.322,3600.473,346.2415,0,0,0,100,0),
-(@PATH,19,3742.794,3604.008,346.2505,0,0,0,100,0);
-
--- Pathing for Darkfallen Deathblade Entry: 26103
-SET @NPC := 119306;
-SET @PATH := @NPC * 10;
-UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=3825.312,`position_y`=3561.968,`position_z`=371.449 WHERE `guid`=@NPC;
-DELETE FROM `creature_addon` WHERE `guid`=@NPC;
-INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, '');
-DELETE FROM `waypoint_data` WHERE `id`=@PATH;
-INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
-(@PATH,1,3828.243,3550.227,371.6633,0,0,0,100,0),
-(@PATH,2,3821.141,3538.786,371.4709,0,0,0,100,0),
-(@PATH,3,3810.434,3533.297,371.4811,0,0,0,100,0),
-(@PATH,4,3797.684,3527.717,371.4747,0,0,0,100,0),
-(@PATH,5,3788.295,3523.66,371.5133,0,0,0,100,0),
-(@PATH,6,3797.684,3527.717,371.4747,0,0,0,100,0),
-(@PATH,7,3810.434,3533.297,371.4811,0,0,0,100,0),
-(@PATH,8,3821.141,3538.786,371.4709,0,0,0,100,0),
-(@PATH,9,3828.243,3550.227,371.6633,0,0,0,100,0),
-(@PATH,10,3825.312,3561.968,371.449,0,0,0,100,0),
-(@PATH,11,3818.058,3572.063,371.4479,0,0,0,100,0),
-(@PATH,12,3825.312,3561.968,371.449,0,0,0,100,0);
-
--- Pathing for Darkfallen Deathblade Entry: 26103
-SET @NPC := 119344;
-SET @PATH := @NPC * 10;
-UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=3719.171,`position_y`=3634.032,`position_z`=371.4312 WHERE `guid`=@NPC;
-DELETE FROM `creature_addon` WHERE `guid`=@NPC;
-INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, '');
-DELETE FROM `waypoint_data` WHERE `id`=@PATH;
-INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
-(@PATH,1,3728.891,3640.265,371.399,0,0,0,100,0),
-(@PATH,2,3744.495,3650.741,371.4715,0,0,0,100,0),
-(@PATH,3,3754.314,3654.938,371.6409,0,0,0,100,0),
-(@PATH,4,3762.468,3653.046,371.6256,0,0,0,100,0),
-(@PATH,5,3769.032,3645.54,371.4821,0,0,0,100,0),
-(@PATH,6,3779.281,3629.354,371.3682,0,0,0,100,0),
-(@PATH,7,3769.032,3645.54,371.4821,0,0,0,100,0),
-(@PATH,8,3762.468,3653.046,371.6256,0,0,0,100,0),
-(@PATH,9,3754.314,3654.938,371.6409,0,0,0,100,0),
-(@PATH,10,3744.495,3650.741,371.4715,0,0,0,100,0),
-(@PATH,11,3728.891,3640.265,371.399,0,0,0,100,0),
-(@PATH,12,3719.171,3634.032,371.4312,0,0,0,100,0),
-(@PATH,13,3706.394,3625.895,371.3447,0,0,0,100,0),
-(@PATH,14,3719.171,3634.032,371.4312,0,0,0,100,0);
-
--- Pathing for Darkfallen Deathblade Entry: 26103
-SET @NPC := 119346;
-SET @PATH := @NPC * 10;
-UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=3757.834,`position_y`=3500.429,`position_z`=371.4323 WHERE `guid`=@NPC;
-DELETE FROM `creature_addon` WHERE `guid`=@NPC;
-INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, '');
-DELETE FROM `waypoint_data` WHERE `id`=@PATH;
-INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
-(@PATH,1,3744.604,3489.214,371.4503,0,0,0,100,0),
-(@PATH,2,3731.337,3479.792,371.4355,0,0,0,100,0),
-(@PATH,3,3724.038,3478.357,371.6531,0,0,0,100,0),
-(@PATH,4,3716.938,3479.223,371.649,0,0,0,100,0),
-(@PATH,5,3709.829,3487.23,371.4689,0,0,0,100,0),
-(@PATH,6,3699.577,3504.449,371.358,0,0,0,100,0),
-(@PATH,7,3709.829,3487.23,371.4689,0,0,0,100,0),
-(@PATH,8,3716.938,3479.223,371.649,0,0,0,100,0),
-(@PATH,9,3724.038,3478.357,371.6531,0,0,0,100,0),
-(@PATH,10,3731.337,3479.792,371.4355,0,0,0,100,0),
-(@PATH,11,3744.604,3489.214,371.4503,0,0,0,100,0),
-(@PATH,12,3757.834,3500.429,371.4323,0,0,0,100,0),
-(@PATH,13,3769.854,3508.61,371.3447,0,0,0,100,0),
-(@PATH,14,3757.834,3500.429,371.4323,0,0,0,100,0);
-
diff --git a/sql/updates/world/2011_03_17_2_world_sai.sql b/sql/updates/world/2011_03_17_2_world_sai.sql
deleted file mode 100644
index 19b4b7e4ea0..00000000000
--- a/sql/updates/world/2011_03_17_2_world_sai.sql
+++ /dev/null
@@ -1,78 +0,0 @@
--- Pathing for Fizzcrank Airman Entry: 26601
-SET @NPC := 117944;
-SET @PATH := @NPC * 10;
-UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=4120.091,`position_y`=5343.777,`position_z`=29.24856 WHERE `guid`=@NPC;
-DELETE FROM `creature_addon` WHERE `guid`=@NPC;
-INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, '');
-DELETE FROM `waypoint_data` WHERE `id`=@PATH;
-INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
-(@PATH,1,4111.694,5334.971,28.74856,0,0,0,100,0),
-(@PATH,2,4102.274,5325.254,28.6343,0,0,0,100,0),
-(@PATH,3,4091.229,5314.824,29.10337,0,0,0,100,0),
-(@PATH,4,4083.519,5306.313,28.47837,0,0,0,100,0),
-(@PATH,5,4072.305,5295.377,28.82582,0,0,0,100,0),
-(@PATH,6,4083.519,5306.313,28.47837,0,0,0,100,0),
-(@PATH,7,4091.229,5314.824,29.10337,0,0,0,100,0),
-(@PATH,8,4102.274,5325.254,28.6343,0,0,0,100,0),
-(@PATH,9,4111.694,5334.971,28.74856,0,0,0,100,0),
-(@PATH,10,4120.091,5343.777,29.24856,0,0,0,100,0);
-
--- Pathing for Fizzcrank Airman Entry: 26601
-SET @NPC := 117922;
-SET @PATH := @NPC * 10;
-UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=4171.854,`position_y`=5364.676,`position_z`=29.09072 WHERE `guid`=@NPC;
-DELETE FROM `creature_addon` WHERE `guid`=@NPC;
-INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, '');
-DELETE FROM `waypoint_data` WHERE `id`=@PATH;
-INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
-(@PATH,1,4162.717,5358.622,28.71572,0,0,0,100,0),
-(@PATH,2,4171.854,5364.676,29.09072,0,0,0,100,0),
-(@PATH,3,4175.919,5373.461,28.73422,0,0,0,100,0),
-(@PATH,4,4180.79,5375.921,28.85922,0,0,0,100,0),
-(@PATH,5,4189.647,5383.252,28.98422,0,0,0,100,0),
-(@PATH,6,4196.353,5389.414,28.98422,0,0,0,100,0),
-(@PATH,7,4205.784,5399.744,29.17458,0,0,0,100,0),
-(@PATH,8,4175.919,5373.461,28.73422,0,0,0,100,0),
-(@PATH,9,4171.854,5364.676,29.09072,0,0,0,100,0);
-
--- Pathing for Fizzcrank Airman Entry: 26601
-SET @NPC := 117952;
-SET @PATH := @NPC * 10;
-UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=4114.012,`position_y`=5310.07,`position_z`=28.7593 WHERE `guid`=@NPC;
-DELETE FROM `creature_addon` WHERE `guid`=@NPC;
-INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, '');
-DELETE FROM `waypoint_data` WHERE `id`=@PATH;
-INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
-(@PATH,1,4114.952,5312.266,28.7593,0,0,0,100,0),
-(@PATH,2,4120.03,5314.749,28.8843,0,0,0,100,0),
-(@PATH,3,4128.648,5324.809,28.7593,0,0,0,100,0),
-(@PATH,4,4132.928,5329.057,28.7593,0,0,0,100,0),
-(@PATH,5,4129.167,5323.958,28.7593,0,0,0,100,0),
-(@PATH,6,4120.03,5314.749,28.8843,0,0,0,100,0),
-(@PATH,7,4114.952,5312.266,28.7593,0,0,0,100,0),
-(@PATH,8,4114.012,5310.07,28.7593,0,0,0,100,0),
-(@PATH,9,4110.154,5305.583,28.7593,0,0,0,100,0),
-(@PATH,10,4106.395,5299.221,29.22841,0,0,0,100,0),
-(@PATH,11,4098.468,5291.356,29.32582,0,0,0,100,0),
-(@PATH,12,4087.384,5281.144,29.20082,0,0,0,100,0),
-(@PATH,13,4098.468,5291.356,29.32582,0,0,0,100,0),
-(@PATH,14,4106.395,5299.221,29.22841,0,0,0,100,0),
-(@PATH,15,4110.154,5305.583,28.7593,0,0,0,100,0),
-(@PATH,16,4114.012,5310.07,28.7593,0,0,0,100,0);
-
--- Pathing for Fizzcrank Airman Entry: 26601
-SET @NPC := 117951;
-SET @PATH := @NPC * 10;
-UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=4156.205,`position_y`=5379.297,`position_z`=28.60338 WHERE `guid`=@NPC;
-DELETE FROM `creature_addon` WHERE `guid`=@NPC;
-INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, '');
-DELETE FROM `waypoint_data` WHERE `id`=@PATH;
-INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
-(@PATH,1,4145.584,5368.483,28.97838,0,0,0,100,0),
-(@PATH,2,4137.288,5361.018,28.96572,0,0,0,100,0),
-(@PATH,3,4145.584,5368.483,28.97838,0,0,0,100,0),
-(@PATH,4,4156.205,5379.297,28.60338,0,0,0,100,0),
-(@PATH,5,4165.664,5389.022,28.97838,0,0,0,100,0),
-(@PATH,6,4175.249,5398.305,29.10922,0,0,0,100,0),
-(@PATH,7,4165.664,5389.022,28.97838,0,0,0,100,0),
-(@PATH,8,4156.205,5379.297,28.60338,0,0,0,100,0);
diff --git a/sql/updates/world/2011_03_17_3_world_creature_template.sql b/sql/updates/world/2011_03_17_3_world_creature_template.sql
deleted file mode 100644
index 6190390b4c6..00000000000
--- a/sql/updates/world/2011_03_17_3_world_creature_template.sql
+++ /dev/null
@@ -1,44 +0,0 @@
--- Razaani Light Orb Fixup
-SET @ENTRY := 20635; -- NPC entry
-UPDATE `creature` SET `modelid`=0 WHERE `id`=@ENTRY;
-UPDATE `creature_template` SET `InhabitType`=7 WHERE `entry`=@ENTRY;
--- Blade's Edge - Orb Trigger 01 Fixup and set as trigger
-SET @ENTRY := 20666; -- NPC entry
-UPDATE `creature` SET `modelid`=0,`spawndist`=0,`MovementType`=0 WHERE `id`=@ENTRY;
-UPDATE `creature_template` SET `InhabitType`=7,`flags_extra`=`flags_extra`|128 WHERE `entry`=@ENTRY;
--- Blade's Edge - Flesh Beast Zap Trigger Fixup and set as trigger
-SET @ENTRY := 20670; -- NPC entry
-UPDATE `creature` SET `modelid`=0,`spawndist`=0,`MovementType`=0 WHERE `id`=@ENTRY;
-UPDATE `creature_template` SET `InhabitType`=7,`flags_extra`=`flags_extra`|128 WHERE `entry`=@ENTRY;
--- Razaani Light Orb - Mini Fixup and set as trigger
-SET @ENTRY := 20771; -- NPC entry
-UPDATE `creature` SET `modelid`=0,`spawndist`=0,`MovementType`=0 WHERE `id`=@ENTRY;
-UPDATE `creature_template` SET `InhabitType`=7,`flags_extra`=`flags_extra`|128 WHERE `entry`=@ENTRY;
--- Blade's Edge - Deadsoul Orb Fixup and set as trigger
-SET @ENTRY := 20845; -- NPC entry
-UPDATE `creature` SET `modelid`=0,`spawndist`=0,`MovementType`=0 WHERE `id`=@ENTRY;
-UPDATE `creature_template` SET `InhabitType`=7,`flags_extra`=`flags_extra`|128 WHERE `entry`=@ENTRY;
--- Blade's Edge - Deadsoul Orb Flight 01 Fixup and set as trigger
-SET @ENTRY := 20851; -- NPC entry
-UPDATE `creature` SET `modelid`=0,`spawndist`=0,`MovementType`=0 WHERE `id`=@ENTRY;
-UPDATE `creature_template` SET `InhabitType`=7,`flags_extra`=`flags_extra`|128 WHERE `entry`=@ENTRY;
--- Blade's Edge - Deadsoul Orb Flight 02 Fixup and set as trigger
-SET @ENTRY := 20852; -- NPC entry
-UPDATE `creature` SET `modelid`=0,`spawndist`=0,`MovementType`=0 WHERE `id`=@ENTRY;
-UPDATE `creature_template` SET `InhabitType`=7,`flags_extra`=`flags_extra`|128 WHERE `entry`=@ENTRY;
--- Blade's Edge - Deadsoul Orb Flight 03 Fixup and set as trigger
-SET @ENTRY := 20853; -- NPC entry
-UPDATE `creature` SET `modelid`=0,`spawndist`=0,`MovementType`=0 WHERE `id`=@ENTRY;
-UPDATE `creature_template` SET `InhabitType`=7,`flags_extra`=`flags_extra`|128 WHERE `entry`=@ENTRY;
--- Blade's Edge - Deadsoul Orb Flight 04 Fixup and set as trigger
-SET @ENTRY := 20855; -- NPC entry
-UPDATE `creature` SET `modelid`=0,`spawndist`=0,`MovementType`=0 WHERE `id`=@ENTRY;
-UPDATE `creature_template` SET `InhabitType`=7,`flags_extra`=`flags_extra`|128 WHERE `entry`=@ENTRY;
--- Blade's Edge - Deadsoul Orb Flight 05 Fixup and set as trigger
-SET @ENTRY := 20856; -- NPC entry
-UPDATE `creature` SET `modelid`=0,`spawndist`=0,`MovementType`=0 WHERE `id`=@ENTRY;
-UPDATE `creature_template` SET `InhabitType`=7,`flags_extra`=`flags_extra`|128 WHERE `entry`=@ENTRY;
--- Blade's Edge - Nexus Prince Event - Orb01 Fixup and set as trigger
-SET @ENTRY := 21025; -- NPC entry
-UPDATE `creature` SET `modelid`=0,`spawndist`=0,`MovementType`=0 WHERE `id`=@ENTRY;
-UPDATE `creature_template` SET `InhabitType`=7,`flags_extra`=`flags_extra`|128 WHERE `entry`=@ENTRY;
diff --git a/sql/updates/world/2011_03_17_4_world_sai.sql b/sql/updates/world/2011_03_17_4_world_sai.sql
deleted file mode 100644
index 8494c2c2649..00000000000
--- a/sql/updates/world/2011_03_17_4_world_sai.sql
+++ /dev/null
@@ -1,19 +0,0 @@
--- Lost Drakkari Spirit SAI
-SET @ENTRY := 29129;
-SET @AURA := 17327;
-SET @SPELL1 := 37361;
-SET @SPELL2 := 24050;
-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;
-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,23,0,100,0,@AURA,0,2000,2000,11,@AURA,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Lost Drakkari Spirit - Aura Spirit Particles not present - Add Aura Spirit Particles'),
-(@ENTRY,0,1,2,4,0,100,1,0,0,0,0,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Lost Drakkari Spirit - On Aggro - Prevent Combat Movement'),
-(@ENTRY,0,2,0,61,0,100,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Lost Drakkari Spirit - On Aggro - Set Phase 1'),
-(@ENTRY,0,3,0,0,1,100,0,0,0,1000,1000,11,@SPELL1,1,0,0,0,0,2,0,0,0,0,0,0,0,'Lost Drakkari Spirit - Combat - Cast Arcane Bolt (Phase 1)'),
-(@ENTRY,0,4,5,3,1,100,0,15,0,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Lost Drakkari Spirit - Mana at 15% - Allow combat movement (Phase 1)'),
-(@ENTRY,0,5,0,61,1,100,0,0,0,0,0,22,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Lost Drakkari Spirit - Mana at 15% - Set phase 2 (Phase 1)'),
-(@ENTRY,0,6,0,9,1,100,0,35,80,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Lost Drakkari Spirit - At 35 yards - Allow combat movement (Phase 1)'),
-(@ENTRY,0,7,0,9,1,100,0,0,15,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Lost Drakkari Spirit - Below 15 yards - Prevent combat movement (Phase 1)'),
-(@ENTRY,0,8,0,3,2,100,0,100,30,100,100,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Lost Drakkari Spirit - Mana above 30% - Set phase 1 (Phase 2)'),
-(@ENTRY,0,9,0,0,0,100,0,10000,16000,15000,18000,11,@SPELL2,1,0,0,0,0,2,0,0,0,0,0,0,0,'Lost Drakkari Spirit - Combat - Cast Spirit Burst');
diff --git a/sql/updates/world/2011_03_17_5_world_sai.sql b/sql/updates/world/2011_03_17_5_world_sai.sql
deleted file mode 100644
index 7da7c189fe1..00000000000
--- a/sql/updates/world/2011_03_17_5_world_sai.sql
+++ /dev/null
@@ -1,29 +0,0 @@
--- Frozen Earth SAI
-SET @ENTRY   := 28411; -- NPC entry
-SET @TARGET  := 23837; -- ELM General Porpose Bunny
-SET @SPELL1  := 54532; -- Ice Spike
-UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY;
-DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY;
-DELETE FROM `smart_scripts` WHERE `entryorguid` IN (@ENTRY,-119784,-119944,-119945,-119947,-119949,-119951,-119968,-119991);
-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,0,1000,4000,10000,17000,11,@SPELL1,0,0,0,0,0,2,0,0,0,0,0,0,0,'Frozen Earth - Combat - Cast Ice Spike on victim'),
-(-119784,0,0,0,1,0,100,0,1000,4000,4000,7000,11,51590,2,0,0,0,0,11,@TARGET,120,0,0,0,0,0,'Frozen Earth - OOC - Cast Toss Ice Boulder'),
-(-119784,0,1,0,0,0,100,0,1000,4000,10000,17000,11,@SPELL1,0,0,0,0,0,2,0,0,0,0,0,0,0,'Frozen Earth - Combat - Cast Ice Spike on victim'),
-(-119944,0,0,0,1,0,100,0,1000,4000,4000,7000,11,51590,2,0,0,0,0,11,@TARGET,120,0,0,0,0,0,'Frozen Earth - OOC - Cast Toss Ice Boulder'),
-(-119944,0,1,0,0,0,100,0,1000,4000,10000,17000,11,@SPELL1,0,0,0,0,0,2,0,0,0,0,0,0,0,'Frozen Earth - Combat - Cast Ice Spike on victim'),
-(-119945,0,0,0,1,0,100,0,1000,4000,4000,7000,11,51590,2,0,0,0,0,11,@TARGET,120,0,0,0,0,0,'Frozen Earth - OOC - Cast Toss Ice Boulder'),
-(-119945,0,1,0,0,0,100,0,1000,4000,10000,17000,11,@SPELL1,0,0,0,0,0,2,0,0,0,0,0,0,0,'Frozen Earth - Combat - Cast Ice Spike on victim'),
-(-119947,0,0,0,1,0,100,0,1000,4000,4000,7000,11,51590,2,0,0,0,0,11,@TARGET,120,0,0,0,0,0,'Frozen Earth - OOC - Cast Toss Ice Boulder'),
-(-119947,0,1,0,0,0,100,0,1000,4000,10000,17000,11,@SPELL1,0,0,0,0,0,2,0,0,0,0,0,0,0,'Frozen Earth - Combat - Cast Ice Spike on victim'),
-(-119949,0,0,0,1,0,100,0,1000,4000,4000,7000,11,51590,2,0,0,0,0,11,@TARGET,120,0,0,0,0,0,'Frozen Earth - OOC - Cast Toss Ice Boulder'),
-(-119949,0,1,0,0,0,100,0,1000,4000,10000,17000,11,@SPELL1,0,0,0,0,0,2,0,0,0,0,0,0,0,'Frozen Earth - Combat - Cast Ice Spike on victim'),
-(-119951,0,0,0,1,0,100,0,1000,4000,4000,7000,11,51590,2,0,0,0,0,11,@TARGET,120,0,0,0,0,0,'Frozen Earth - OOC - Cast Toss Ice Boulder'),
-(-119951,0,1,0,0,0,100,0,1000,4000,10000,17000,11,@SPELL1,0,0,0,0,0,2,0,0,0,0,0,0,0,'Frozen Earth - Combat - Cast Ice Spike on victim'),
-(-119968,0,0,0,1,0,100,0,1000,4000,4000,7000,11,51590,2,0,0,0,0,11,@TARGET,120,0,0,0,0,0,'Frozen Earth - OOC - Cast Toss Ice Boulder'),
-(-119968,0,1,0,0,0,100,0,1000,4000,10000,17000,11,@SPELL1,0,0,0,0,0,2,0,0,0,0,0,0,0,'Frozen Earth - Combat - Cast Ice Spike on victim'),
-(-119991,0,0,0,1,0,100,0,1000,4000,4000,7000,11,51590,2,0,0,0,0,11,@TARGET,120,0,0,0,0,0,'Frozen Earth - OOC - Cast Toss Ice Boulder'),
-(-119991,0,1,0,0,0,100,0,1000,4000,10000,17000,11,@SPELL1,0,0,0,0,0,2,0,0,0,0,0,0,0,'Frozen Earth - Combat - Cast Ice Spike on victim');
--- Fix Spell condition for Spell 51590 to only target ELM General Porpose Bunny
-DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=51590;
-INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
-(13,0,51590,0,18,1,23837,0,0,'','Spell 51590 targets only ELM General Porpose Bunny');
diff --git a/sql/updates/world/2011_03_17_6_world_sai.sql b/sql/updates/world/2011_03_17_6_world_sai.sql
deleted file mode 100644
index f7eec6ea0c1..00000000000
--- a/sql/updates/world/2011_03_17_6_world_sai.sql
+++ /dev/null
@@ -1,8 +0,0 @@
--- Legion Fel Cannon SAI
-SET @ENTRY := 21233;
-SET @SPELL1 := 36238; -- Fel Cannon Blast
-UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
-DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
-(@ENTRY,0,0,0,1,0,100,1,1000,1000,1000,1000,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Legion Fel Cannon - OOC - Prevent Combat Movement'),
-(@ENTRY,0,1,0,0,0,100,0,0,1000,2500,2500,11,@SPELL1,1,0,0,0,0,2,0,0,0,0,0,0,0,'Legion Fel Cannon - Combat - Cast Fel Cannon Blast');
diff --git a/sql/updates/world/2011_03_17_7_world_sai.sql b/sql/updates/world/2011_03_17_7_world_sai.sql
deleted file mode 100644
index 9d1ea279ebd..00000000000
--- a/sql/updates/world/2011_03_17_7_world_sai.sql
+++ /dev/null
@@ -1,8 +0,0 @@
--- Fel Cannon MKI SAI
-SET @ENTRY := 22461;
-SET @SPELL1 := 36238; -- Fel Cannon Blast
-UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
-DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
-(@ENTRY,0,0,0,1,0,100,1,1000,1000,1000,1000,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Fel Cannon MKI - OOC - Prevent Combat Movement'),
-(@ENTRY,0,1,0,0,0,100,0,0,1000,2500,2500,11,@SPELL1,1,0,0,0,0,2,0,0,0,0,0,0,0,'Fel Cannon MKI - Combat - Cast Fel Cannon Blast');
diff --git a/sql/updates/world/2011_03_17_8_world_sai.sql b/sql/updates/world/2011_03_17_8_world_sai.sql
deleted file mode 100644
index 03fa5a829a8..00000000000
--- a/sql/updates/world/2011_03_17_8_world_sai.sql
+++ /dev/null
@@ -1,11 +0,0 @@
--- High Priest Andorath SAI
-SET @ENTRY   := 25392;
-SET @CHANNEL := 45491; -- Necrotic Purple Beam
-SET @TARGET  := 25534; -- En'kilah Blood Globe
-UPDATE `creature_template` SET `speed_run`=1,`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,2000,6000,32000,32000,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0,'High Priest Andorath - OOC - Run Script every 32 sec'),
-(@ENTRY*100,9,0,0,0,0,100,0,0,0,0,0,11,@CHANNEL,0,0,0,0,0,11,@TARGET,20,0,0,0,0,0, 'High Priest Andorath - script - Channel spell'),
-(@ENTRY*100,9,1,0,0,0,100,0,23000,23000,0,0,92,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'High Priest Andorath - script - Stop Channeling');
diff --git a/sql/updates/world/2011_03_17_9_world_sai.sql b/sql/updates/world/2011_03_17_9_world_sai.sql
deleted file mode 100644
index 62e5f4c1f64..00000000000
--- a/sql/updates/world/2011_03_17_9_world_sai.sql
+++ /dev/null
@@ -1,7 +0,0 @@
--- Add aura to Zul'Drak Gateway Trigger if aura not present
-SET @ENTRY := 28181;
-SET @SPELL := 50795;
-UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
-DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
-(@ENTRY,0,0,0,23,0,100,0,@SPELL,0,2000,2000,11,@SPELL,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Zul''Drak Gateway Trigger - Aura Zul''Drak Gateway not present - Add Aura Zul''Drak Gateway');
diff --git a/sql/updates/world/2011_03_18_00_world_game_event_misc.sql b/sql/updates/world/2011_03_18_00_world_game_event_misc.sql
new file mode 100644
index 00000000000..3856bb0c3db
--- /dev/null
+++ b/sql/updates/world/2011_03_18_00_world_game_event_misc.sql
@@ -0,0 +1,93 @@
+-- Create temporary table that holds the entry conversion data. (Generating numbers by index and autoincrement is not used because
+-- we need the same numbers to update the characters db and need to do that without cross db queries
+CREATE TABLE `game_event_temp` (
+  `entryOld` TINYINT(3) UNSIGNED NOT NULL,
+  `entryNew` TINYINT(3) UNSIGNED NOT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+-- Renumbered entry data
+INSERT INTO `game_event_temp` (`entryOld`,`entryNew`) VALUES
+(1,1),(2,2),(3,3),(4,4),(5,5),(6,6),(7,7),(8,8),(9,9),(10,10),(11,11),(12,12),(13,13),(14,14),(15,15),(16,16),(17,17),(18,18),(19,19),(20,20),(21,21),(22,22),
+(23,23),(26,24),(27,25),(28,26),(29,27),(30,28),(31,29),(32,30),(33,31),(34,32),(35,33),(36,34),(37,35),(38,36),(39,37),(40,38),(41,39),(42,40),(43,41),(44,42),
+(45,43),(46,44),(47,45),(48,46),(49,47),(50,48),(51,49),(52,50),(53,51),(54,52),(124,53),(125,54),(126,55),(127,56),(128,57),(129,58),(130,59),(131,60);
+
+-- Update game_event
+ALTER TABLE `game_event` DROP PRIMARY KEY;
+UPDATE `game_event`, `game_event_temp` SET `game_event`.`entry` = `game_event_temp`.`entryNew` WHERE `game_event`.`entry` = `game_event_temp`.`entryOld`;
+ALTER TABLE `game_event` 
+CHANGE `entry` `eventEntry` TINYINT(3) UNSIGNED NOT NULL COMMENT 'Entry of the game event',
+ADD PRIMARY KEY (`eventEntry`);
+
+-- Update game_event_battleground_holiday
+ALTER TABLE `game_event_battleground_holiday` DROP PRIMARY KEY;
+UPDATE `game_event_battleground_holiday`, `game_event_temp` SET `game_event_battleground_holiday`.`event` = `game_event_temp`.`entryNew` WHERE `game_event_battleground_holiday`.`event` = `game_event_temp`.`entryOld`;
+ALTER TABLE `game_event_battleground_holiday`
+CHANGE `event` `eventEntry` TINYINT(3) UNSIGNED NOT NULL COMMENT 'Entry of the game event' FIRST,
+ADD PRIMARY KEY (`eventEntry`);
+
+-- Update game_event_condition
+ALTER TABLE `game_event_condition` DROP PRIMARY KEY;
+UPDATE `game_event_condition`, `game_event_temp` SET `game_event_condition`.`event_id` = `game_event_temp`.`entryNew` WHERE `game_event_condition`.`event_id` = `game_event_temp`.`entryOld`;
+ALTER TABLE `game_event_condition`
+CHANGE `event_id` `eventEntry` TINYINT(3) UNSIGNED NOT NULL COMMENT 'Entry of the game event' FIRST,
+ADD PRIMARY KEY (`eventEntry`, `condition_id`);
+
+-- Update game_event_creature
+UPDATE `game_event_creature`, `game_event_temp` SET `game_event_creature`.`event` = `game_event_temp`.`entryNew` WHERE `game_event_creature`.`event` = `game_event_temp`.`entryOld`;
+ALTER TABLE `game_event_creature` CHANGE `event` `eventEntry` TINYINT(3) NOT NULL COMMENT 'Entry of the game event. Put negative entry to remove during event.' FIRST;
+
+-- Update game_event_creature_quest
+UPDATE `game_event_creature_quest`, `game_event_temp` SET `game_event_creature_quest`.`event` = `game_event_temp`.`entryNew` WHERE `game_event_creature_quest`.`event` = `game_event_temp`.`entryOld`;
+ALTER TABLE `game_event_creature_quest` CHANGE `event` `eventEntry` TINYINT(3) UNSIGNED NOT NULL COMMENT 'Entry of the game event.' FIRST;
+
+-- Update game_event_gameobject
+UPDATE `game_event_gameobject`, `game_event_temp` SET `game_event_gameobject`.`event` = `game_event_temp`.`entryNew` WHERE `game_event_gameobject`.`event` = `game_event_temp`.`entryOld`;
+ALTER TABLE `game_event_gameobject` CHANGE `event` `eventEntry` TINYINT(3) NOT NULL COMMENT 'Entry of the game event. Put negative entry to remove during event.' FIRST;
+
+-- Update game_event_gameobject_quest
+ALTER TABLE `game_event_gameobject_quest` DROP PRIMARY KEY;
+UPDATE `game_event_gameobject_quest`, `game_event_temp` SET `game_event_gameobject_quest`.`event` = `game_event_temp`.`entryNew` WHERE `game_event_gameobject_quest`.`event` = `game_event_temp`.`entryOld`;
+ALTER TABLE `game_event_gameobject_quest` 
+CHANGE `event` `eventEntry` TINYINT(3) UNSIGNED NOT NULL COMMENT 'Entry of the game event' FIRST,
+ADD PRIMARY KEY (`id`, `quest`, `eventEntry`);
+
+-- Update game_event_model_equip
+UPDATE `game_event_model_equip`, `game_event_temp` SET `game_event_model_equip`.`event` = `game_event_temp`.`entryNew` WHERE `game_event_model_equip`.`event` = `game_event_temp`.`entryOld`;
+ALTER TABLE `game_event_model_equip` CHANGE `event` `eventEntry` TINYINT(3) NOT NULL COMMENT 'Entry of the game event.' FIRST;
+
+-- Update game_event_npc_vendor
+UPDATE `game_event_npc_vendor`, `game_event_temp` SET `game_event_npc_vendor`.`event` = `game_event_temp`.`entryNew` WHERE `game_event_npc_vendor`.`event` = `game_event_temp`.`entryOld`;
+ALTER TABLE `game_event_npc_vendor` CHANGE `event` `eventEntry` TINYINT(3) NOT NULL COMMENT 'Entry of the game event.' FIRST;
+
+-- Update game_event_npcflag
+ALTER TABLE `game_event_npcflag` DROP PRIMARY KEY;
+UPDATE `game_event_npcflag`, `game_event_temp` SET `game_event_npcflag`.`event_id` = `game_event_temp`.`entryNew` WHERE `game_event_npcflag`.`event_id` = `game_event_temp`.`entryOld`;
+ALTER TABLE `game_event_npcflag` 
+CHANGE `event_id` `eventEntry` TINYINT(3) UNSIGNED NOT NULL COMMENT 'Entry of the game event' FIRST,
+ADD PRIMARY KEY (`guid`, `eventEntry`);
+
+-- Update game_event_pool
+UPDATE `game_event_pool`, `game_event_temp` SET `game_event_pool`.`event` = `game_event_temp`.`entryNew` WHERE `game_event_pool`.`event` = `game_event_temp`.`entryOld`;
+ALTER TABLE `game_event_pool` CHANGE `event` `eventEntry` TINYINT(3) NOT NULL COMMENT 'Entry of the game event. Put negative entry to remove during event.' FIRST;
+
+-- Update game_event_prerequisite
+ALTER TABLE `game_event_prerequisite` DROP PRIMARY KEY;
+UPDATE `game_event_prerequisite`, `game_event_temp` SET `game_event_prerequisite`.`event_id` = `game_event_temp`.`entryNew` WHERE `game_event_prerequisite`.`event_id` = `game_event_temp`.`entryOld`;
+ALTER TABLE `game_event_prerequisite`
+CHANGE `event_id` `eventEntry` TINYINT(3) UNSIGNED NOT NULL COMMENT 'Entry of the game event' FIRST,
+ADD PRIMARY KEY (`eventEntry`, `prerequisite_event`);
+
+-- Update game_event_quest_condition
+UPDATE `game_event_quest_condition`, `game_event_temp` SET `game_event_quest_condition`.`event_id` = `game_event_temp`.`entryNew` WHERE `game_event_quest_condition`.`event_id` = `game_event_temp`.`entryOld`;
+ALTER TABLE `game_event_quest_condition` CHANGE `event_id` `eventEntry` TINYINT(3) UNSIGNED NOT NULL COMMENT 'Entry of the game event.' FIRST;
+
+-- Update season_linked_event
+ALTER TABLE `season_linked_event` DROP PRIMARY KEY;
+UPDATE `season_linked_event`, `game_event_temp` SET `season_linked_event`.`event` = `game_event_temp`.`entryNew` WHERE `season_linked_event`.`event` = `game_event_temp`.`entryOld`;
+ALTER TABLE season_linked_event
+RENAME TO `game_event_arena_seasons`,
+CHANGE `event` `eventEntry` TINYINT(3) UNSIGNED NOT NULL COMMENT 'Entry of the game event' FIRST,
+CHANGE `season` `season` TINYINT(3) UNSIGNED NOT NULL COMMENT 'Arena season number';
+
+-- Remove temporary table
+DROP TABLE `game_event_temp`;
diff --git a/sql/updates/world/2011_03_18_01_world_instance_pit_of_saron.sql b/sql/updates/world/2011_03_18_01_world_instance_pit_of_saron.sql
new file mode 100644
index 00000000000..64ec58fc315
--- /dev/null
+++ b/sql/updates/world/2011_03_18_01_world_instance_pit_of_saron.sql
@@ -0,0 +1,39 @@
+DELETE FROM `creature_questrelation` WHERE `quest` IN (24510,24499,24498,24710,24711,24506,24511,24682,24507,24712,24713);
+DELETE FROM `creature_involvedrelation` WHERE `quest` IN (24510,24499,24498,24710,24711,24506,24511,24682,24507,24712,24713);
+INSERT INTO `creature_questrelation` (`id`,`quest`) VALUES 
+-- alliance
+(37776,24510),
+(37597,24499),
+(38160,24683),
+(36993,24498),
+(37591,24710),
+(38188,24711),
+-- horde
+(37780,24506),
+(37596,24511),
+(38161,24682),
+(36990,24507),
+(37592,24712),
+(38189,24713);
+INSERT INTO `creature_involvedrelation` (`id`,`quest`) VALUES 
+-- alliance
+(37597,24510),
+(38160,24499),
+(36993,24683),
+(37591,24498),
+(38188,24710),
+(37221,24711),
+-- horde
+(37596,24506),
+(38161,24511),
+(36990,24682),
+(37592,24507),
+(38189,24712),
+(37223,24713);
+
+SET @GOBJ := 201969; -- ball and chain
+UPDATE `gameobject_template` SET `AIName`='SmartGameObjectAI' WHERE `entry`=@GOBJ;
+DELETE FROM `smart_scripts` WHERE `source_type`=1 AND `entryorguid`=@GOBJ;
+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 
+(@GOBJ,1,0,0,64,0,100,0,0,0,0,0,33,36764,0,0,0,0,0,7,0,0,0,0,0,0,0, 'credit on gossip hello - alliance'),
+(@GOBJ,1,1,0,64,0,100,0,0,0,0,0,33,36770,0,0,0,0,0,7,0,0,0,0,0,0,0, 'credit on gossip hello - horde');
diff --git a/sql/updates/world/2011_03_18_02_world_creatures.sql b/sql/updates/world/2011_03_18_02_world_creatures.sql
new file mode 100644
index 00000000000..61eea952386
--- /dev/null
+++ b/sql/updates/world/2011_03_18_02_world_creatures.sql
@@ -0,0 +1,8 @@
+SET @GUID := 137789;
+DELETE FROM `creature` WHERE `guid` BETWEEN @GUID AND @GUID+4;
+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,16980,631,15,1,0,0,4203.70,2484.83,364.956,3.14159,604800,0,0,0,0,0,0,0,0,0), -- The Lich King
+(@GUID+1,22515,631,15,1,0,0,4241.19,2557.49,364.952,4.72984,120,0,0,0,0,0,0,0,0,0), -- World Trigger
+(@GUID+2,22515,631,15,1,0,0,4241.34,2411.52,364.952,1.57080,120,0,0,0,0,0,0,0,0,0), -- World Trigger
+(@GUID+3,22515,631,10,1,0,0,4166.02,2557.49,364.952,4.72984,120,0,0,0,0,0,0,0,0,0), -- World Trigger
+(@GUID+4,22515,631,10,1,0,0,4241.34,2411.52,364.952,1.57080,120,0,0,0,0,0,0,0,0,0); -- World Trigger
diff --git a/sql/updates/world/2011_03_18_0_world_game_event_misc.sql b/sql/updates/world/2011_03_18_0_world_game_event_misc.sql
deleted file mode 100644
index 3856bb0c3db..00000000000
--- a/sql/updates/world/2011_03_18_0_world_game_event_misc.sql
+++ /dev/null
@@ -1,93 +0,0 @@
--- Create temporary table that holds the entry conversion data. (Generating numbers by index and autoincrement is not used because
--- we need the same numbers to update the characters db and need to do that without cross db queries
-CREATE TABLE `game_event_temp` (
-  `entryOld` TINYINT(3) UNSIGNED NOT NULL,
-  `entryNew` TINYINT(3) UNSIGNED NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
--- Renumbered entry data
-INSERT INTO `game_event_temp` (`entryOld`,`entryNew`) VALUES
-(1,1),(2,2),(3,3),(4,4),(5,5),(6,6),(7,7),(8,8),(9,9),(10,10),(11,11),(12,12),(13,13),(14,14),(15,15),(16,16),(17,17),(18,18),(19,19),(20,20),(21,21),(22,22),
-(23,23),(26,24),(27,25),(28,26),(29,27),(30,28),(31,29),(32,30),(33,31),(34,32),(35,33),(36,34),(37,35),(38,36),(39,37),(40,38),(41,39),(42,40),(43,41),(44,42),
-(45,43),(46,44),(47,45),(48,46),(49,47),(50,48),(51,49),(52,50),(53,51),(54,52),(124,53),(125,54),(126,55),(127,56),(128,57),(129,58),(130,59),(131,60);
-
--- Update game_event
-ALTER TABLE `game_event` DROP PRIMARY KEY;
-UPDATE `game_event`, `game_event_temp` SET `game_event`.`entry` = `game_event_temp`.`entryNew` WHERE `game_event`.`entry` = `game_event_temp`.`entryOld`;
-ALTER TABLE `game_event` 
-CHANGE `entry` `eventEntry` TINYINT(3) UNSIGNED NOT NULL COMMENT 'Entry of the game event',
-ADD PRIMARY KEY (`eventEntry`);
-
--- Update game_event_battleground_holiday
-ALTER TABLE `game_event_battleground_holiday` DROP PRIMARY KEY;
-UPDATE `game_event_battleground_holiday`, `game_event_temp` SET `game_event_battleground_holiday`.`event` = `game_event_temp`.`entryNew` WHERE `game_event_battleground_holiday`.`event` = `game_event_temp`.`entryOld`;
-ALTER TABLE `game_event_battleground_holiday`
-CHANGE `event` `eventEntry` TINYINT(3) UNSIGNED NOT NULL COMMENT 'Entry of the game event' FIRST,
-ADD PRIMARY KEY (`eventEntry`);
-
--- Update game_event_condition
-ALTER TABLE `game_event_condition` DROP PRIMARY KEY;
-UPDATE `game_event_condition`, `game_event_temp` SET `game_event_condition`.`event_id` = `game_event_temp`.`entryNew` WHERE `game_event_condition`.`event_id` = `game_event_temp`.`entryOld`;
-ALTER TABLE `game_event_condition`
-CHANGE `event_id` `eventEntry` TINYINT(3) UNSIGNED NOT NULL COMMENT 'Entry of the game event' FIRST,
-ADD PRIMARY KEY (`eventEntry`, `condition_id`);
-
--- Update game_event_creature
-UPDATE `game_event_creature`, `game_event_temp` SET `game_event_creature`.`event` = `game_event_temp`.`entryNew` WHERE `game_event_creature`.`event` = `game_event_temp`.`entryOld`;
-ALTER TABLE `game_event_creature` CHANGE `event` `eventEntry` TINYINT(3) NOT NULL COMMENT 'Entry of the game event. Put negative entry to remove during event.' FIRST;
-
--- Update game_event_creature_quest
-UPDATE `game_event_creature_quest`, `game_event_temp` SET `game_event_creature_quest`.`event` = `game_event_temp`.`entryNew` WHERE `game_event_creature_quest`.`event` = `game_event_temp`.`entryOld`;
-ALTER TABLE `game_event_creature_quest` CHANGE `event` `eventEntry` TINYINT(3) UNSIGNED NOT NULL COMMENT 'Entry of the game event.' FIRST;
-
--- Update game_event_gameobject
-UPDATE `game_event_gameobject`, `game_event_temp` SET `game_event_gameobject`.`event` = `game_event_temp`.`entryNew` WHERE `game_event_gameobject`.`event` = `game_event_temp`.`entryOld`;
-ALTER TABLE `game_event_gameobject` CHANGE `event` `eventEntry` TINYINT(3) NOT NULL COMMENT 'Entry of the game event. Put negative entry to remove during event.' FIRST;
-
--- Update game_event_gameobject_quest
-ALTER TABLE `game_event_gameobject_quest` DROP PRIMARY KEY;
-UPDATE `game_event_gameobject_quest`, `game_event_temp` SET `game_event_gameobject_quest`.`event` = `game_event_temp`.`entryNew` WHERE `game_event_gameobject_quest`.`event` = `game_event_temp`.`entryOld`;
-ALTER TABLE `game_event_gameobject_quest` 
-CHANGE `event` `eventEntry` TINYINT(3) UNSIGNED NOT NULL COMMENT 'Entry of the game event' FIRST,
-ADD PRIMARY KEY (`id`, `quest`, `eventEntry`);
-
--- Update game_event_model_equip
-UPDATE `game_event_model_equip`, `game_event_temp` SET `game_event_model_equip`.`event` = `game_event_temp`.`entryNew` WHERE `game_event_model_equip`.`event` = `game_event_temp`.`entryOld`;
-ALTER TABLE `game_event_model_equip` CHANGE `event` `eventEntry` TINYINT(3) NOT NULL COMMENT 'Entry of the game event.' FIRST;
-
--- Update game_event_npc_vendor
-UPDATE `game_event_npc_vendor`, `game_event_temp` SET `game_event_npc_vendor`.`event` = `game_event_temp`.`entryNew` WHERE `game_event_npc_vendor`.`event` = `game_event_temp`.`entryOld`;
-ALTER TABLE `game_event_npc_vendor` CHANGE `event` `eventEntry` TINYINT(3) NOT NULL COMMENT 'Entry of the game event.' FIRST;
-
--- Update game_event_npcflag
-ALTER TABLE `game_event_npcflag` DROP PRIMARY KEY;
-UPDATE `game_event_npcflag`, `game_event_temp` SET `game_event_npcflag`.`event_id` = `game_event_temp`.`entryNew` WHERE `game_event_npcflag`.`event_id` = `game_event_temp`.`entryOld`;
-ALTER TABLE `game_event_npcflag` 
-CHANGE `event_id` `eventEntry` TINYINT(3) UNSIGNED NOT NULL COMMENT 'Entry of the game event' FIRST,
-ADD PRIMARY KEY (`guid`, `eventEntry`);
-
--- Update game_event_pool
-UPDATE `game_event_pool`, `game_event_temp` SET `game_event_pool`.`event` = `game_event_temp`.`entryNew` WHERE `game_event_pool`.`event` = `game_event_temp`.`entryOld`;
-ALTER TABLE `game_event_pool` CHANGE `event` `eventEntry` TINYINT(3) NOT NULL COMMENT 'Entry of the game event. Put negative entry to remove during event.' FIRST;
-
--- Update game_event_prerequisite
-ALTER TABLE `game_event_prerequisite` DROP PRIMARY KEY;
-UPDATE `game_event_prerequisite`, `game_event_temp` SET `game_event_prerequisite`.`event_id` = `game_event_temp`.`entryNew` WHERE `game_event_prerequisite`.`event_id` = `game_event_temp`.`entryOld`;
-ALTER TABLE `game_event_prerequisite`
-CHANGE `event_id` `eventEntry` TINYINT(3) UNSIGNED NOT NULL COMMENT 'Entry of the game event' FIRST,
-ADD PRIMARY KEY (`eventEntry`, `prerequisite_event`);
-
--- Update game_event_quest_condition
-UPDATE `game_event_quest_condition`, `game_event_temp` SET `game_event_quest_condition`.`event_id` = `game_event_temp`.`entryNew` WHERE `game_event_quest_condition`.`event_id` = `game_event_temp`.`entryOld`;
-ALTER TABLE `game_event_quest_condition` CHANGE `event_id` `eventEntry` TINYINT(3) UNSIGNED NOT NULL COMMENT 'Entry of the game event.' FIRST;
-
--- Update season_linked_event
-ALTER TABLE `season_linked_event` DROP PRIMARY KEY;
-UPDATE `season_linked_event`, `game_event_temp` SET `season_linked_event`.`event` = `game_event_temp`.`entryNew` WHERE `season_linked_event`.`event` = `game_event_temp`.`entryOld`;
-ALTER TABLE season_linked_event
-RENAME TO `game_event_arena_seasons`,
-CHANGE `event` `eventEntry` TINYINT(3) UNSIGNED NOT NULL COMMENT 'Entry of the game event' FIRST,
-CHANGE `season` `season` TINYINT(3) UNSIGNED NOT NULL COMMENT 'Arena season number';
-
--- Remove temporary table
-DROP TABLE `game_event_temp`;
diff --git a/sql/updates/world/2011_03_18_1_world_instance_pit_of_saron.sql b/sql/updates/world/2011_03_18_1_world_instance_pit_of_saron.sql
deleted file mode 100644
index 64ec58fc315..00000000000
--- a/sql/updates/world/2011_03_18_1_world_instance_pit_of_saron.sql
+++ /dev/null
@@ -1,39 +0,0 @@
-DELETE FROM `creature_questrelation` WHERE `quest` IN (24510,24499,24498,24710,24711,24506,24511,24682,24507,24712,24713);
-DELETE FROM `creature_involvedrelation` WHERE `quest` IN (24510,24499,24498,24710,24711,24506,24511,24682,24507,24712,24713);
-INSERT INTO `creature_questrelation` (`id`,`quest`) VALUES 
--- alliance
-(37776,24510),
-(37597,24499),
-(38160,24683),
-(36993,24498),
-(37591,24710),
-(38188,24711),
--- horde
-(37780,24506),
-(37596,24511),
-(38161,24682),
-(36990,24507),
-(37592,24712),
-(38189,24713);
-INSERT INTO `creature_involvedrelation` (`id`,`quest`) VALUES 
--- alliance
-(37597,24510),
-(38160,24499),
-(36993,24683),
-(37591,24498),
-(38188,24710),
-(37221,24711),
--- horde
-(37596,24506),
-(38161,24511),
-(36990,24682),
-(37592,24507),
-(38189,24712),
-(37223,24713);
-
-SET @GOBJ := 201969; -- ball and chain
-UPDATE `gameobject_template` SET `AIName`='SmartGameObjectAI' WHERE `entry`=@GOBJ;
-DELETE FROM `smart_scripts` WHERE `source_type`=1 AND `entryorguid`=@GOBJ;
-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 
-(@GOBJ,1,0,0,64,0,100,0,0,0,0,0,33,36764,0,0,0,0,0,7,0,0,0,0,0,0,0, 'credit on gossip hello - alliance'),
-(@GOBJ,1,1,0,64,0,100,0,0,0,0,0,33,36770,0,0,0,0,0,7,0,0,0,0,0,0,0, 'credit on gossip hello - horde');
diff --git a/sql/updates/world/2011_03_18_2_world_creatures.sql b/sql/updates/world/2011_03_18_2_world_creatures.sql
deleted file mode 100644
index 61eea952386..00000000000
--- a/sql/updates/world/2011_03_18_2_world_creatures.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-SET @GUID := 137789;
-DELETE FROM `creature` WHERE `guid` BETWEEN @GUID AND @GUID+4;
-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,16980,631,15,1,0,0,4203.70,2484.83,364.956,3.14159,604800,0,0,0,0,0,0,0,0,0), -- The Lich King
-(@GUID+1,22515,631,15,1,0,0,4241.19,2557.49,364.952,4.72984,120,0,0,0,0,0,0,0,0,0), -- World Trigger
-(@GUID+2,22515,631,15,1,0,0,4241.34,2411.52,364.952,1.57080,120,0,0,0,0,0,0,0,0,0), -- World Trigger
-(@GUID+3,22515,631,10,1,0,0,4166.02,2557.49,364.952,4.72984,120,0,0,0,0,0,0,0,0,0), -- World Trigger
-(@GUID+4,22515,631,10,1,0,0,4241.34,2411.52,364.952,1.57080,120,0,0,0,0,0,0,0,0,0); -- World Trigger
diff --git a/sql/updates/world/2011_03_19_00_world_spell_proc_event.sql b/sql/updates/world/2011_03_19_00_world_spell_proc_event.sql
new file mode 100644
index 00000000000..a0537fd6dd6
--- /dev/null
+++ b/sql/updates/world/2011_03_19_00_world_spell_proc_event.sql
@@ -0,0 +1,7 @@
+DELETE FROM `spell_proc_event` WHERE `entry` IN (11213,12574,12575,12576,12577);
+INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES
+(11213,0x00,3,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0,0,0), -- Arcane Concentration (Rank 1)
+(12574,0x00,3,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0,0,0), -- Arcane Concentration (Rank 2)
+(12575,0x00,3,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0,0,0), -- Arcane Concentration (Rank 3)
+(12576,0x00,3,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0,0,0), -- Arcane Concentration (Rank 4)
+(12577,0x00,3,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0,0,0); -- Arcane Concentration (Rank 5)
diff --git a/sql/updates/world/2011_03_19_0_world_spell_proc_event.sql b/sql/updates/world/2011_03_19_0_world_spell_proc_event.sql
deleted file mode 100644
index a0537fd6dd6..00000000000
--- a/sql/updates/world/2011_03_19_0_world_spell_proc_event.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-DELETE FROM `spell_proc_event` WHERE `entry` IN (11213,12574,12575,12576,12577);
-INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES
-(11213,0x00,3,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0,0,0), -- Arcane Concentration (Rank 1)
-(12574,0x00,3,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0,0,0), -- Arcane Concentration (Rank 2)
-(12575,0x00,3,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0,0,0), -- Arcane Concentration (Rank 3)
-(12576,0x00,3,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0,0,0), -- Arcane Concentration (Rank 4)
-(12577,0x00,3,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0,0,0); -- Arcane Concentration (Rank 5)
diff --git a/sql/updates/world/2011_03_20_00_world_game_event.sql b/sql/updates/world/2011_03_20_00_world_game_event.sql
new file mode 100644
index 00000000000..ebee67b8d36
--- /dev/null
+++ b/sql/updates/world/2011_03_20_00_world_game_event.sql
@@ -0,0 +1,2 @@
+UPDATE `game_event` SET `holiday`=400 WHERE `eventEntry`=53; -- Call to Arms: Strand of the Ancients!
+UPDATE `game_event` SET `holiday`=420 WHERE `eventEntry`=54; -- Call to Arms: Isle of Conquest!
diff --git a/sql/updates/world/2011_03_20_0_world_game_event.sql b/sql/updates/world/2011_03_20_0_world_game_event.sql
deleted file mode 100644
index ebee67b8d36..00000000000
--- a/sql/updates/world/2011_03_20_0_world_game_event.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-UPDATE `game_event` SET `holiday`=400 WHERE `eventEntry`=53; -- Call to Arms: Strand of the Ancients!
-UPDATE `game_event` SET `holiday`=420 WHERE `eventEntry`=54; -- Call to Arms: Isle of Conquest!
diff --git a/sql/updates/world/2011_03_21_00_world_sai.sql b/sql/updates/world/2011_03_21_00_world_sai.sql
new file mode 100644
index 00000000000..cddb08883af
--- /dev/null
+++ b/sql/updates/world/2011_03_21_00_world_sai.sql
@@ -0,0 +1,3 @@
+-- Lost Drakkari Spirit SAI fix
+UPDATE `smart_scripts` SET `event_param1`=0,`event_param2`=15 WHERE `entryorguid`=29129 AND `id`=4;
+UPDATE `smart_scripts` SET `event_param1`=30,`event_param2`=100 WHERE `entryorguid`=29129 AND `id`=8;
diff --git a/sql/updates/world/2011_03_21_01_world_creature_template.sql b/sql/updates/world/2011_03_21_01_world_creature_template.sql
new file mode 100644
index 00000000000..628619b25f9
--- /dev/null
+++ b/sql/updates/world/2011_03_21_01_world_creature_template.sql
@@ -0,0 +1,2 @@
+UPDATE `creature_template` SET `difficulty_entry_1`=0 WHERE `entry`=37596;
+DELETE FROM `creature_template` WHERE `entry`=3759601;
diff --git a/sql/updates/world/2011_03_21_02_world_creature_template.sql b/sql/updates/world/2011_03_21_02_world_creature_template.sql
new file mode 100644
index 00000000000..960d96663c0
--- /dev/null
+++ b/sql/updates/world/2011_03_21_02_world_creature_template.sql
@@ -0,0 +1,2 @@
+-- Remove beast lore info from all creatures
+UPDATE `creature_template` SET `dynamicflags`=`dynamicflags`&~16;
diff --git a/sql/updates/world/2011_03_21_03_world_achievement_criteria_data.sql b/sql/updates/world/2011_03_21_03_world_achievement_criteria_data.sql
new file mode 100644
index 00000000000..2a95cb57206
--- /dev/null
+++ b/sql/updates/world/2011_03_21_03_world_achievement_criteria_data.sql
@@ -0,0 +1,32 @@
+-- Fix Achievements related to Trial of the Crusader
+DELETE FROM `achievement_criteria_data` WHERE `criteria_id` IN (
+11684,11685,11686,11687,11688, -- 10 Player
+11679,11680,11681,11682,11683, -- 25 Player
+11689,11690,11691,11692,11693, -- 10 Player
+11542,11546,11547,11549,11678  -- 25 Player
+) AND `type` IN (0,12);
+INSERT INTO `achievement_criteria_data` (`criteria_id`, `type`, `value1`, `value2`, `ScriptName`) VALUES 
+-- Call of the Crusade (10 player)
+(11684,12,0,0, ''),
+(11685,12,0,0, ''),
+(11686,12,0,0, ''),
+(11687,12,0,0, ''),
+(11688,12,0,0, ''),
+-- Call of the Crusade (25 player)
+(11679,12,1,0, ''),
+(11680,12,1,0, ''),
+(11681,12,1,0, ''),
+(11682,12,1,0, ''),
+(11683,12,1,0, ''),
+-- Call of the Grand Crusade (10 player)
+(11689,12,2,0, ''),
+(11690,12,2,0, ''),
+(11691,12,2,0, ''),
+(11692,12,2,0, ''),
+(11693,12,2,0, ''),
+-- Call of the Grand Crusade (25 player)
+(11542,12,3,0, ''),
+(11546,12,3,0, ''),
+(11547,12,3,0, ''),
+(11549,12,3,0, ''),
+(11678,12,3,0, '');
diff --git a/sql/updates/world/2011_03_21_04_world_spell_required.sql b/sql/updates/world/2011_03_21_04_world_spell_required.sql
new file mode 100644
index 00000000000..38e3a4b59a8
--- /dev/null
+++ b/sql/updates/world/2011_03_21_04_world_spell_required.sql
@@ -0,0 +1,3 @@
+-- Dire Bear form should require Bear Form
+DELETE FROM `spell_required` WHERE `spell_id`=9634;
+INSERT INTO `spell_required` (`spell_id`,`req_spell`) VALUES (9634,5487);
diff --git a/sql/updates/world/2011_03_21_05_world_spell_ranks.sql b/sql/updates/world/2011_03_21_05_world_spell_ranks.sql
new file mode 100644
index 00000000000..9d39c4effd8
--- /dev/null
+++ b/sql/updates/world/2011_03_21_05_world_spell_ranks.sql
@@ -0,0 +1,6 @@
+DELETE FROM `spell_ranks` WHERE `first_spell_id` IN (5487,33943);
+INSERT INTO `spell_ranks` (`first_spell_id`,`spell_id`,`rank`) VALUES
+(5487,5487,1),
+(5487,9634,2),
+(33943,33943,1),
+(33943,40120,2);
diff --git a/sql/updates/world/2011_03_21_06_world_creature.sql b/sql/updates/world/2011_03_21_06_world_creature.sql
new file mode 100644
index 00000000000..22de14493b3
--- /dev/null
+++ b/sql/updates/world/2011_03_21_06_world_creature.sql
@@ -0,0 +1,16 @@
+SET @GUID := 95035 ; -- set guid by TDB
+
+-- Spawn for Rotting Frost Giant in 25 man instances
+DELETE FROM `creature` WHERE `id`=38494;
+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,38494,631,10,1,0,0,-452.366,2354.51,191.242,0.778178,86400,0,0,1,0,0,2,0,0,0);
+        
+-- Correct spawn mask for Rotting Frost Giant in 10 man instances (10/10 Heroic)
+UPDATE `creature` SET `spawnmask`=5 WHERE `id`=38490;
+
+-- add a path to the creature
+DELETE FROM `creature_addon` WHERE `guid`=@GUID;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
+(@GUID,2087860,0,0,0,0, '');
diff --git a/sql/updates/world/2011_03_21_07_world_spell_required.sql b/sql/updates/world/2011_03_21_07_world_spell_required.sql
new file mode 100644
index 00000000000..e76c4801dd1
--- /dev/null
+++ b/sql/updates/world/2011_03_21_07_world_spell_required.sql
@@ -0,0 +1 @@
+DELETE FROM `spell_required` WHERE `spell_id`=9634;
diff --git a/sql/updates/world/2011_03_21_08_world_spell_required.sql b/sql/updates/world/2011_03_21_08_world_spell_required.sql
new file mode 100644
index 00000000000..1c6e207127b
--- /dev/null
+++ b/sql/updates/world/2011_03_21_08_world_spell_required.sql
@@ -0,0 +1 @@
+DELETE FROM `spell_required` WHERE `spell_id`=40120;
diff --git a/sql/updates/world/2011_03_21_0_world_sai.sql b/sql/updates/world/2011_03_21_0_world_sai.sql
deleted file mode 100644
index cddb08883af..00000000000
--- a/sql/updates/world/2011_03_21_0_world_sai.sql
+++ /dev/null
@@ -1,3 +0,0 @@
--- Lost Drakkari Spirit SAI fix
-UPDATE `smart_scripts` SET `event_param1`=0,`event_param2`=15 WHERE `entryorguid`=29129 AND `id`=4;
-UPDATE `smart_scripts` SET `event_param1`=30,`event_param2`=100 WHERE `entryorguid`=29129 AND `id`=8;
diff --git a/sql/updates/world/2011_03_21_1_world_creature_template.sql b/sql/updates/world/2011_03_21_1_world_creature_template.sql
deleted file mode 100644
index 628619b25f9..00000000000
--- a/sql/updates/world/2011_03_21_1_world_creature_template.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-UPDATE `creature_template` SET `difficulty_entry_1`=0 WHERE `entry`=37596;
-DELETE FROM `creature_template` WHERE `entry`=3759601;
diff --git a/sql/updates/world/2011_03_21_2_world_creature_template.sql b/sql/updates/world/2011_03_21_2_world_creature_template.sql
deleted file mode 100644
index 960d96663c0..00000000000
--- a/sql/updates/world/2011_03_21_2_world_creature_template.sql
+++ /dev/null
@@ -1,2 +0,0 @@
--- Remove beast lore info from all creatures
-UPDATE `creature_template` SET `dynamicflags`=`dynamicflags`&~16;
diff --git a/sql/updates/world/2011_03_21_3_world_achievement_criteria_data.sql b/sql/updates/world/2011_03_21_3_world_achievement_criteria_data.sql
deleted file mode 100644
index 2a95cb57206..00000000000
--- a/sql/updates/world/2011_03_21_3_world_achievement_criteria_data.sql
+++ /dev/null
@@ -1,32 +0,0 @@
--- Fix Achievements related to Trial of the Crusader
-DELETE FROM `achievement_criteria_data` WHERE `criteria_id` IN (
-11684,11685,11686,11687,11688, -- 10 Player
-11679,11680,11681,11682,11683, -- 25 Player
-11689,11690,11691,11692,11693, -- 10 Player
-11542,11546,11547,11549,11678  -- 25 Player
-) AND `type` IN (0,12);
-INSERT INTO `achievement_criteria_data` (`criteria_id`, `type`, `value1`, `value2`, `ScriptName`) VALUES 
--- Call of the Crusade (10 player)
-(11684,12,0,0, ''),
-(11685,12,0,0, ''),
-(11686,12,0,0, ''),
-(11687,12,0,0, ''),
-(11688,12,0,0, ''),
--- Call of the Crusade (25 player)
-(11679,12,1,0, ''),
-(11680,12,1,0, ''),
-(11681,12,1,0, ''),
-(11682,12,1,0, ''),
-(11683,12,1,0, ''),
--- Call of the Grand Crusade (10 player)
-(11689,12,2,0, ''),
-(11690,12,2,0, ''),
-(11691,12,2,0, ''),
-(11692,12,2,0, ''),
-(11693,12,2,0, ''),
--- Call of the Grand Crusade (25 player)
-(11542,12,3,0, ''),
-(11546,12,3,0, ''),
-(11547,12,3,0, ''),
-(11549,12,3,0, ''),
-(11678,12,3,0, '');
diff --git a/sql/updates/world/2011_03_21_4_world_spell_required.sql b/sql/updates/world/2011_03_21_4_world_spell_required.sql
deleted file mode 100644
index 38e3a4b59a8..00000000000
--- a/sql/updates/world/2011_03_21_4_world_spell_required.sql
+++ /dev/null
@@ -1,3 +0,0 @@
--- Dire Bear form should require Bear Form
-DELETE FROM `spell_required` WHERE `spell_id`=9634;
-INSERT INTO `spell_required` (`spell_id`,`req_spell`) VALUES (9634,5487);
diff --git a/sql/updates/world/2011_03_21_5_world_spell_ranks.sql b/sql/updates/world/2011_03_21_5_world_spell_ranks.sql
deleted file mode 100644
index 9d39c4effd8..00000000000
--- a/sql/updates/world/2011_03_21_5_world_spell_ranks.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-DELETE FROM `spell_ranks` WHERE `first_spell_id` IN (5487,33943);
-INSERT INTO `spell_ranks` (`first_spell_id`,`spell_id`,`rank`) VALUES
-(5487,5487,1),
-(5487,9634,2),
-(33943,33943,1),
-(33943,40120,2);
diff --git a/sql/updates/world/2011_03_21_6_world_creature.sql b/sql/updates/world/2011_03_21_6_world_creature.sql
deleted file mode 100644
index 22de14493b3..00000000000
--- a/sql/updates/world/2011_03_21_6_world_creature.sql
+++ /dev/null
@@ -1,16 +0,0 @@
-SET @GUID := 95035 ; -- set guid by TDB
-
--- Spawn for Rotting Frost Giant in 25 man instances
-DELETE FROM `creature` WHERE `id`=38494;
-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,38494,631,10,1,0,0,-452.366,2354.51,191.242,0.778178,86400,0,0,1,0,0,2,0,0,0);
-        
--- Correct spawn mask for Rotting Frost Giant in 10 man instances (10/10 Heroic)
-UPDATE `creature` SET `spawnmask`=5 WHERE `id`=38490;
-
--- add a path to the creature
-DELETE FROM `creature_addon` WHERE `guid`=@GUID;
-INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
-(@GUID,2087860,0,0,0,0, '');
diff --git a/sql/updates/world/2011_03_21_7_world_spell_required.sql b/sql/updates/world/2011_03_21_7_world_spell_required.sql
deleted file mode 100644
index e76c4801dd1..00000000000
--- a/sql/updates/world/2011_03_21_7_world_spell_required.sql
+++ /dev/null
@@ -1 +0,0 @@
-DELETE FROM `spell_required` WHERE `spell_id`=9634;
diff --git a/sql/updates/world/2011_03_21_8_world_spell_required.sql b/sql/updates/world/2011_03_21_8_world_spell_required.sql
deleted file mode 100644
index 1c6e207127b..00000000000
--- a/sql/updates/world/2011_03_21_8_world_spell_required.sql
+++ /dev/null
@@ -1 +0,0 @@
-DELETE FROM `spell_required` WHERE `spell_id`=40120;
diff --git a/sql/updates/world/2011_03_22_00_world_sai.sql b/sql/updates/world/2011_03_22_00_world_sai.sql
new file mode 100644
index 00000000000..8b6ac8d9fe9
--- /dev/null
+++ b/sql/updates/world/2011_03_22_00_world_sai.sql
@@ -0,0 +1,22 @@
+-- Necro Overlord Mezhen SAI
+SET @GUID   := 95036; -- 1 Required for ELM General Purpose Bunny
+SET @ENTRY   := 24018; -- NPC entry
+SET @CHANNEL := 43151; -- Necrolord: Purple Beam
+SET @TARGET  := 24021; -- ELM General Purpose Bunny (scale x0.01)
+SET @SPELL1  := 32862; -- Drain Soul
+SET @SPELL2  := 43559; -- Raise Dead
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,1,0,100,1,1000,1000,1000,1000,11,@CHANNEL,2,0,0,0,0,11,@TARGET,30,0,0,0,0,0, 'Necro Overlord Mezhen - On spawn & reset - Channel Necrolord: Purple Beam');
+
+-- Fix Spell condition for Spell 43151 to only target ELM General Purpose Bunny (scale x0.01)
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=43151;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(13,0,43151,0,18,1,24021,0,0,'','Spell 43151 targets only ELM General Purpose Bunny (scale x0.01)');
+-- Add missing ELM General Purpose Bunny (scale x0.01)
+DELETE FROM `creature` WHERE `guid`=@GUID; 
+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,24021,571,1,1,0,0,2597.148,-3735.499,261.9468,0.2094395,120,0,0,1,0,0,0);
+-- ELM General Purpose Bunny (scale x0.01) fix InhabitType
+UPDATE `creature_template` SET `InhabitType`=7 WHERE entry=24021;
diff --git a/sql/updates/world/2011_03_22_01_world_sai.sql b/sql/updates/world/2011_03_22_01_world_sai.sql
new file mode 100644
index 00000000000..974b24f8cbd
--- /dev/null
+++ b/sql/updates/world/2011_03_22_01_world_sai.sql
@@ -0,0 +1,83 @@
+-- Add missing Invisible Stalker (Floating)
+SET @GUID := 85175; -- 2 Required
+DELETE FROM `creature` WHERE `guid` BETWEEN @GUID AND @GUID+1; 
+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,23033,571,1,1,0,0,3799.331,3428.748,92.80447,3.804818,120,0,0,1,0,0,0),
+(@GUID+1,23033,571,1,1,0,0,3789.681,3434.306,92.37619,4.764749,120,0,0,1,0,0,0);
+-- High Priest Talet-Kha Fixup
+SET @ENTRY  := 26073; -- NPC entry
+SET @SPELL1 := 45492; -- Shadow Nova
+SET @SPELL2 := 11640; -- Renew         cast once below 45%
+SET @SPELL3 := 15587; -- Mind Blast    cast below 45% after renew 
+UPDATE `creature` SET `modelid`=0,`spawndist`=0,`MovementType`=0 WHERE `id`=@ENTRY;
+DELETE FROM `creature_addon` WHERE `guid`=85240;
+DELETE FROM `creature_template_addon` WHERE `entry`=26073;
+INSERT INTO `creature_template_addon` (`entry`,`bytes1`,`bytes2`) VALUES (26073,1,1);
+-- SAI for High Priest Talet-Kha
+UPDATE `creature_template` SET `speed_run`=1,`faction_H`=21,`InhabitType`=7,`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,1,0,0,0,0,8,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'High Priest Talet-Kha - On spawn - Set React State civilian'),
+(@ENTRY,0,1,2,1,0,100,1,1000,1000,1000,1000,70,0,0,0,0,0,0,10,85098,25422,0,0,0,0,0, 'High Priest Talet-Kha - OOC - Respawn Mystical Webbing'),
+(@ENTRY,0,2,3,61,0,100,0,0,0,0,0,45,0,1,0,0,0,0,10,85098,25422,0,0,0,0,0, 'High Priest Talet-Kha - OOC - Set data Mystical Webbing'),
+(@ENTRY,0,3,4,61,0,100,0,0,0,0,0,70,0,0,0,0,0,0,10,85118,25422,0,0,0,0,0, 'High Priest Talet-Kha - OOC - Respawn Mystical Webbing'),
+(@ENTRY,0,4,5,61,0,100,0,0,0,0,0,45,0,1,0,0,0,0,10,85118,25422,0,0,0,0,0, 'High Priest Talet-Kha - OOC - Set data Mystical Webbing'),
+(@ENTRY,0,5,6,61,0,100,0,0,0,0,0,45,0,1,0,0,0,0,10,85175,23033,0,0,0,0,0, 'High Priest Talet-Kha - OOC - Set data Invisible Stalker'),
+(@ENTRY,0,6,0,61,0,100,0,0,0,0,0,45,0,1,0,0,0,0,10,85176,23033,0,0,0,0,0, 'High Priest Talet-Kha - OOC - Set data Invisible Stalker'),
+(@ENTRY,0,7,0,1,0,100,0,3000,3000,3000,3000,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'High Priest Talet-Kha - OOC - Set phase 1'),
+(@ENTRY,0,8,0,23,1,100,1,45497,0,0,0,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0, 'High Priest Talet-Kha - On Aura missing - Run Script (Phase 1)'),
+(@ENTRY,0,9,10,2,1,100,0,0,45,0,0,11,11640,1,0,0,0,0,1,0,0,0,0,0,0,0, 'High Priest Talet-Kha - Health 45% - Cast Renew on self'),
+(@ENTRY,0,10,0,61,1,100,0,0,0,0,0,22,2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'High Priest Talet-Kha - OOC - Set phase 2'),
+(@ENTRY,0,11,0,0,2,100,0,1500,1500,1500,1500,11,15587,0,0,0,0,0,2,0,0,0,0,0,0,0, 'High Priest Talet-Kha - Combat - Cast Mind Blast on victim (Phase 2)'),
+(@ENTRY*100,9,0,0,0,0,100,0,3000,3000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'High Priest Talet-Kha - script - Text 0'),
+(@ENTRY*100,9,1,0,0,0,100,0,500,500,0,0,69,0,0,0,0,0,0,1,0,0,0,3788.444,3418.249,85.05618,0, 'High Priest Talet-Kha - script - Move to'),
+(@ENTRY*100,9,2,0,0,0,100,0,500,500,0,0,66,0,0,0,0,0,0,1,0,0,0,0,0,0,1.1672, 'High Priest Talet-Kha - script - turn to'),
+(@ENTRY*100,9,3,0,0,0,100,0,1500,1500,0,0,91,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'High Priest Talet-Kha - script - Bytes1 set to 0'),
+(@ENTRY*100,9,4,0,0,0,100,0,100,100,0,0,19,33555200,0,0,0,0,0,1,0,0,0,0,0,0,0, 'High Priest Talet-Kha - script - Remove unitflags'),
+(@ENTRY*100,9,5,0,0,0,100,0,100,100,0,0,8,2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'High Priest Talet-Kha - script - Set React State Hostile'),
+(@ENTRY*100,9,6,0,0,0,100,0,100,100,0,0,11,@SPELL1,1,0,0,0,0,1,0,0,0,0,0,0,0, 'High Priest Talet-Kha - script - Aura self');
+-- NPC talk text insert from sniff
+DELETE FROM `creature_text` WHERE `entry` IN (26073);
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(26073,0,0, 'Who disturbs my meditation?!',1,7,100,15,0,0, 'High Priest Talet-Kha');
+-- SAI for Mystical Webbing
+SET @ENTRY := 25422; -- NPC entry
+SET @CHANNEL := 45497; -- Web Beam
+SET @TARGET  := 26073; -- High Priest Talet-Kha
+UPDATE `creature_template` SET `faction_H`=21,`AIName`= 'SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid` IN (-85098,-85118);
+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
+(-85098,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, 'Mystical Webbing - On spawn - Set React State civilian'),
+(-85098,0,1,0,1,0,100,1,1000,1000,1000,1000,11,@CHANNEL,2,0,0,0,0,11,@TARGET,40,0,0,0,0,0, 'Mystical Webbing - On spawn & reset - Web Beam'),
+(-85098,0,2,0,6,0,100,1,0,0,0,0,45,0,2,0,0,0,0,10,85176,23033,0,0,0,0,0, 'Mystical Webbing - On death - set data 0 2 Invisible Stalker'),
+(-85098,0,3,4,38,0,100,0,0,1,0,0,45,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Invisible Stalker (Floating) - On dataset 0 1 - set data 0 0'),
+(-85098,0,4,0,61,0,100,0,0,0,0,0,70,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Invisible Stalker (Floating) - On dataset 0 1 - reset AI'),
+(-85118,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, 'Mystical Webbing - On spawn - Set React State civilian'),
+(-85118,0,1,0,1,0,100,1,1000,1000,1000,1000,11,@CHANNEL,2,0,0,0,0,11,@TARGET,40,0,0,0,0,0, 'Mystical Webbing - On spawn & reset - Web Beam'),
+(-85118,0,2,0,6,0,100,1,0,0,0,0,45,0,2,0,0,0,0,10,85175,23033,0,0,0,0,0, 'Mystical Webbing - On death - set data 0 2 Invisible Stalker'),
+(-85118,0,3,4,38,0,100,0,0,1,0,0,45,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Invisible Stalker (Floating) - On dataset 0 1 - set data 0 0'),
+(-85118,0,4,0,61,0,100,0,0,0,0,0,70,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Invisible Stalker (Floating) - On dataset 0 1 - reset AI');
+-- SAI for Invisible Stalker (Floating)
+SET @ENTRY := 23033; -- NPC entry
+SET @CHANNEL := 45497; -- Web Beam
+SET @TARGET  := 26073; -- High Priest Talet-Kha
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid` IN (-85175,-85176);
+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
+-- Invisible Stalker (Floating)
+(-85175,0,0,0,38,0,100,0,0,1,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Invisible Stalker (Floating) - On dataset 0 1 - Set Phase 1'),
+(-85175,0,1,0,38,0,100,0,0,2,0,0,22,2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Invisible Stalker (Floating) - On dataset 0 2 - Set Phase 2'),
+(-85175,0,2,3,1,1,100,0,0,0,0,0,11,@CHANNEL,2,0,0,0,0,11,@TARGET,40,0,0,0,0,0, 'Invisible Stalker (Floating) - OOC - Cast Web Beam on target (Phase 1)'),
+(-85175,0,3,4,61,1,100,0,0,0,0,0,45,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Invisible Stalker (Floating) - OOC - Set data 0 0 (Phase 1)'),
+(-85175,0,4,0,61,1,100,0,0,0,0,0,22,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Invisible Stalker (Floating) - OOC - Set Phase 0 (Phase 1)'),
+(-85175,0,5,6,1,2,100,0,0,0,0,0,92,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Invisible Stalker (Floating) - OOC - Stop casting (Phase 2)'),
+(-85175,0,6,0,61,2,100,0,0,0,0,0,22,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Invisible Stalker (Floating) - OOC - Set Phase 0 (Phase 2)'),
+-- Invisible Stalker (Floating)
+(-85176,0,0,0,38,0,100,0,0,1,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Invisible Stalker (Floating) - On dataset 0 1 - Set Phase 1'),
+(-85176,0,1,0,38,0,100,0,0,2,0,0,22,2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Invisible Stalker (Floating) - On dataset 0 2 - Set Phase 2'),
+(-85176,0,2,3,1,1,100,0,0,0,0,0,11,@CHANNEL,2,0,0,0,0,11,@TARGET,40,0,0,0,0,0, 'Invisible Stalker (Floating) - OOC - Cast Web Beam on target (Phase 1)'),
+(-85176,0,3,4,61,1,100,0,0,0,0,0,45,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Invisible Stalker (Floating) - OOC - Set data 0 0 (Phase 1)'),
+(-85176,0,4,0,61,1,100,0,0,0,0,0,22,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Invisible Stalker (Floating) - OOC - Set Phase 0 (Phase 1)'),
+(-85176,0,5,6,1,2,100,0,0,0,0,0,92,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Invisible Stalker (Floating) - OOC - Stop casting (Phase 2)'),
+(-85176,0,6,0,61,2,100,0,0,0,0,0,22,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Invisible Stalker (Floating) - OOC - Set Phase 0 (Phase 2)');
diff --git a/sql/updates/world/2011_03_22_02_world_sai.sql b/sql/updates/world/2011_03_22_02_world_sai.sql
new file mode 100644
index 00000000000..9f01eb83583
--- /dev/null
+++ b/sql/updates/world/2011_03_22_02_world_sai.sql
@@ -0,0 +1,121 @@
+-- Pathing for Stormfleet Deckhand SAI
+SET @ENTRY := 25234;
+SET @PATH1 := @ENTRY*100;
+SET @PATH2 := @ENTRY*100+1;
+SET @PATH3 := @ENTRY*100+2;
+SET @PATH4 := @ENTRY*100+3;
+-- Remove old waypoint data and scripts
+UPDATE `creature` SET `spawndist`=0,`MovementType`=0,`position_x`=2265.704,`position_y`=5314.686,`position_z`=22.43809 WHERE `guid`=109653;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=0,`position_x`=2253.791,`position_y`=5252.389,`position_z`=35.69936 WHERE `guid`=109654;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=0,`position_x`=2220.033,`position_y`=5292.010,`position_z`=10.70095 WHERE `guid`=109652;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=0,`position_x`=2233.497,`position_y`=5291.667,`position_z`=11.21773 WHERE `guid`=109655;
+UPDATE `creature_addon` SET `path_id`=0 WHERE `guid` IN (109653,109654,109652,109655);
+DELETE FROM `waypoint_data` WHERE `id` IN (1096530,1096540,1096520,1096550);
+DELETE FROM `waypoint_scripts` WHERE `id` IN (1057,1058,1059,1060,1061,1130,1131,1132,1133);
+-- SAI for Stormfleet Deckhand
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid` IN (-109653,-109654,-109652,-109655);
+DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid` IN (@ENTRY*100,@ENTRY*100+1,@ENTRY*100+2);
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(-109653,0,0,0,11,0,100,0,0,0,0,0,53,0,@PATH1,1,0,0,0,1,0,0,0,0,0,0,0, 'Stormfleet Deckhand - On spawn - Start WP movement'),
+(-109653,0,1,2,40,0,100,0,4,@PATH1,0,0,54,10000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Stormfleet Deckhand - Reach wp 4 - pause wp'),
+(-109653,0,2,0,61,0,100,0,0,0,0,0,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Stormfleet Deckhand - Reach wp 4 - run script'),
+(-109653,0,3,4,40,0,100,0,8,@PATH1,0,0,54,21000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Stormfleet Deckhand - Reach wp 8 - pause wp'),
+(-109653,0,4,5,61,0,100,0,0,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,5.794493, 'Stormfleet Deckhand - Reach wp 8 - turn to'),
+(-109653,0,5,0,61,0,100,0,0,0,0,0,80,@ENTRY*100+1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Stormfleet Deckhand - Reach wp 8 - run script'),
+(-109654,0,0,0,11,0,100,0,0,0,0,0,53,0,@PATH2,1,0,0,0,1,0,0,0,0,0,0,0, 'Stormfleet Deckhand - On spawn - Start WP movement'),
+(-109654,0,1,2,40,0,100,0,6,@PATH2,0,0,54,10000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Stormfleet Deckhand - Reach wp 6 - pause wp'),
+(-109654,0,2,0,61,0,100,0,0,0,0,0,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Stormfleet Deckhand - Reach wp 6 - run script'),
+(-109654,0,3,4,40,0,100,0,13,@PATH2,0,0,54,21000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Stormfleet Deckhand - Reach wp 13 - pause wp'),
+(-109654,0,4,0,61,0,100,0,0,0,0,0,80,@ENTRY*100+1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Stormfleet Deckhand - Reach wp 13 - run script'),
+(-109652,0,0,0,11,0,100,0,0,0,0,0,53,0,@PATH3,1,0,0,0,1,0,0,0,0,0,0,0, 'Stormfleet Deckhand - On spawn - Start WP movement'),
+(-109652,0,1,2,40,0,100,0,17,@PATH3,0,0,54,10000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Stormfleet Deckhand - Reach wp 17 - pause wp'),
+(-109652,0,2,0,61,0,100,0,0,0,0,0,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Stormfleet Deckhand - Reach wp 17 - run script'),
+(-109652,0,3,4,40,0,100,0,9,@PATH3,0,0,54,21000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Stormfleet Deckhand - Reach wp 9 - pause wp'),
+(-109652,0,4,0,61,0,100,0,0,0,0,0,80,@ENTRY*100+1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Stormfleet Deckhand - Reach wp 9 - run script'),
+(-109655,0,0,0,11,0,100,0,0,0,0,0,53,0,@PATH4,1,0,0,0,1,0,0,0,0,0,0,0, 'Stormfleet Deckhand - On spawn - Start WP movement'),
+(-109655,0,1,2,40,0,100,0,3,@PATH4,0,0,54,11000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Stormfleet Deckhand - Reach wp 3 - pause wp'),
+(-109655,0,2,0,61,0,100,0,0,0,0,0,80,@ENTRY*100+2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Stormfleet Deckhand - Reach wp 3 - run script'),
+(-109655,0,3,4,40,0,100,0,13,@PATH4,0,0,54,11000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Stormfleet Deckhand - Reach wp 13 - pause wp'),
+(-109655,0,4,0,61,0,100,0,0,0,0,0,80,@ENTRY*100+2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Stormfleet Deckhand - Reach wp 13 - run script'),
+(-109655,0,5,6,40,0,100,0,16,@PATH4,0,0,54,11000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Stormfleet Deckhand - Reach wp 16 - pause wp'),
+(-109655,0,6,0,61,0,100,0,0,0,0,0,80,@ENTRY*100+2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Stormfleet Deckhand - Reach wp 16 - run script'),
+(-109655,0,7,8,40,0,100,0,25,@PATH4,0,0,54,11000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Stormfleet Deckhand - Reach wp 25 - pause wp'),
+(-109655,0,8,9,61,0,100,0,0,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,5.969026, 'Stormfleet Deckhand - Reach wp 25 - turn to'),
+(-109655,0,9,0,61,0,100,0,0,0,0,0,80,@ENTRY*100+2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Stormfleet Deckhand - Reach wp 25 - run script'),
+(@ENTRY*100,9,0,0,0,0,100,0,0,0,0,0,90,8,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Stormfleet Deckhand - script - set bytes1'),
+(@ENTRY*100,9,1,0,0,0,100,0,10000,10000,0,0,91,8,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Stormfleet Deckhand - script - remove bytes1'),
+(@ENTRY*100+1,9,0,0,0,0,100,0,3000,3000,0,0,5,22,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Stormfleet Deckhand - script - emote'),
+(@ENTRY*100+1,9,1,0,0,0,100,0,6000,6000,0,0,5,70,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Stormfleet Deckhand - script - emote'),
+(@ENTRY*100+1,9,2,0,0,0,100,0,6000,6000,0,0,5,22,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Stormfleet Deckhand - script - emote'),
+(@ENTRY*100+2,9,0,0,0,0,100,0,1000,1000,0,0,17,69,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Stormfleet Deckhand - script - set state STATE_USESTANDING'),
+(@ENTRY*100+2,9,1,0,0,0,100,0,8000,8000,0,0,17,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Stormfleet Deckhand - script - set state NONE'),
+(@ENTRY*100+2,9,2,0,0,0,100,0,0,0,0,0,90,2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Stormfleet Deckhand - script - set bytes1'),
+(@ENTRY*100+2,9,3,0,0,0,100,0,2000,2000,0,0,91,2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Stormfleet Deckhand - script - remove bytes1');
+-- Waypoints for Stormfleet Deckhand from sniff
+DELETE FROM `waypoints` WHERE `entry` IN (@PATH1,@PATH2,@PATH3,@PATH4);
+INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
+(@PATH1,1,2261.388,5305.248,21.68184, 'Stormfleet Deckhand'),
+(@PATH1,2,2259.963,5295.583,20.08975, 'Stormfleet Deckhand'),
+(@PATH1,3,2260.002,5286.996,15.49093, 'Stormfleet Deckhand'),
+(@PATH1,4,2257.711,5281.927,12.09341, 'Stormfleet Deckhand'),
+(@PATH1,5,2261.763,5286.725,15.76729, 'Stormfleet Deckhand'),
+(@PATH1,6,2260.902,5294.649,19.95268, 'Stormfleet Deckhand'),
+(@PATH1,7,2263.460,5304.816,21.72922, 'Stormfleet Deckhand'),
+(@PATH1,8,2265.704,5314.686,22.43809, 'Stormfleet Deckhand'),
+(@PATH2,1,2248.875,5255.391,36.45885, 'Stormfleet Deckhand'),
+(@PATH2,2,2246.625,5256.641,37.20885, 'Stormfleet Deckhand'),
+(@PATH2,3,2244.625,5258.641,36.45885, 'Stormfleet Deckhand'),
+(@PATH2,4,2241.625,5258.391,37.20885, 'Stormfleet Deckhand'),
+(@PATH2,5,2238.625,5259.391,36.45885, 'Stormfleet Deckhand'),
+(@PATH2,6,2232.960,5260.392,35.71835, 'Stormfleet Deckhand'),
+(@PATH2,7,2235.375,5260.141,36.20885, 'Stormfleet Deckhand'),
+(@PATH2,8,2239.375,5259.141,36.45885, 'Stormfleet Deckhand'),
+(@PATH2,9,2241.625,5258.641,37.20885, 'Stormfleet Deckhand'),
+(@PATH2,10,2244.625,5258.641,36.45885, 'Stormfleet Deckhand'),
+(@PATH2,11,2247.125,5256.391,37.20885, 'Stormfleet Deckhand'),
+(@PATH2,12,2249.125,5255.391,36.45885, 'Stormfleet Deckhand'),
+(@PATH2,13,2253.791,5252.389,35.69936, 'Stormfleet Deckhand'),
+(@PATH3,1,2212.298,5281.927,10.82595, 'Stormfleet Deckhand'),
+(@PATH3,2,2211.701,5275.361,10.82595, 'Stormfleet Deckhand'),
+(@PATH3,3,2224.383,5268.124,7.166187, 'Stormfleet Deckhand'),
+(@PATH3,4,2235.353,5264.704,8.606246, 'Stormfleet Deckhand'),
+(@PATH3,5,2244.243,5262.414,11.81635, 'Stormfleet Deckhand'),
+(@PATH3,6,2248.373,5259.464,11.78494, 'Stormfleet Deckhand'),
+(@PATH3,7,2247.781,5252.418,11.96684, 'Stormfleet Deckhand'),
+(@PATH3,8,2246.383,5249.14,15.53435, 'Stormfleet Deckhand'),
+(@PATH3,9,2243.871,5243.415,21.4974, 'Stormfleet Deckhand'),
+(@PATH3,10,2245.975,5248.252,16.51618, 'Stormfleet Deckhand'),
+(@PATH3,11,2248.437,5255.79,11.86939, 'Stormfleet Deckhand'),
+(@PATH3,12,2248.403,5261.318,11.747, 'Stormfleet Deckhand'),
+(@PATH3,13,2228.012,5267.475,7.16457, 'Stormfleet Deckhand'),
+(@PATH3,14,2215.574,5274.178,11.13563, 'Stormfleet Deckhand'),
+(@PATH3,15,2213.556,5283.097,10.82595, 'Stormfleet Deckhand'),
+(@PATH3,16,2218.244,5291.424,10.70095, 'Stormfleet Deckhand'),
+(@PATH3,17,2224.214,5293.65,10.82595, 'Stormfleet Deckhand'),
+(@PATH3,18,2220.033,5292.01,10.70095, 'Stormfleet Deckhand'),
+(@PATH4,1,2232.031,5289.312,11.11433, 'Stormfleet Deckhand'),
+(@PATH4,2,2229.514,5285.923,11.22073, 'Stormfleet Deckhand'),
+(@PATH4,3,2231.239,5285.13,11.22661, 'Stormfleet Deckhand'),
+(@PATH4,4,2229.854,5285.705,11.22414, 'Stormfleet Deckhand'),
+(@PATH4,5,2228.48,5291.178,11.13671, 'Stormfleet Deckhand'),
+(@PATH4,6,2226.165,5291.41,10.95095, 'Stormfleet Deckhand'),
+(@PATH4,7,2223.731,5291.465,10.82595, 'Stormfleet Deckhand'),
+(@PATH4,8,2218.564,5293.642,10.70095, 'Stormfleet Deckhand'),
+(@PATH4,9,2213.531,5285.789,10.70095, 'Stormfleet Deckhand'),
+(@PATH4,10,2208.855,5275.448,10.82595, 'Stormfleet Deckhand'),
+(@PATH4,11,2206.379,5260.244,10.58918, 'Stormfleet Deckhand'),
+(@PATH4,12,2211.11,5256.537,10.71418, 'Stormfleet Deckhand'),
+(@PATH4,13,2219.187,5252.958,11.33607, 'Stormfleet Deckhand'),
+(@PATH4,14,2216.945,5251.284,11.26102, 'Stormfleet Deckhand'),
+(@PATH4,15,2215.487,5248.678,11.44615, 'Stormfleet Deckhand'),
+(@PATH4,16,2217.447,5248.063,11.4383, 'Stormfleet Deckhand'),
+(@PATH4,17,2213.407,5251.713,10.96418, 'Stormfleet Deckhand'),
+(@PATH4,18,2207.356,5257.069,10.71418, 'Stormfleet Deckhand'),
+(@PATH4,19,2205.434,5262.277,10.58918, 'Stormfleet Deckhand'),
+(@PATH4,20,2208.177,5274.885,10.82595, 'Stormfleet Deckhand'),
+(@PATH4,21,2214.61,5286.973,10.82595, 'Stormfleet Deckhand'),
+(@PATH4,22,2219.416,5292.909,10.70095, 'Stormfleet Deckhand'),
+(@PATH4,23,2224.719,5291.44,10.82595, 'Stormfleet Deckhand'),
+(@PATH4,24,2228.346,5291.136,10.95095, 'Stormfleet Deckhand'),
+(@PATH4,25,2233.497,5291.667,11.21773, 'Stormfleet Deckhand');
diff --git a/sql/updates/world/2011_03_22_03_world_creature_template.sql b/sql/updates/world/2011_03_22_03_world_creature_template.sql
new file mode 100644
index 00000000000..5769c93c1d8
--- /dev/null
+++ b/sql/updates/world/2011_03_22_03_world_creature_template.sql
@@ -0,0 +1,8 @@
+-- Template updates for creature 33778 (Tournament Hippogryph)
+UPDATE `creature_template` SET `vehicleid`=108,`InhabitType`=4 WHERE `entry`=33778; -- Tournament Hippogryph
+-- Model data 22471 (creature 33778 (Tournament Hippogryph))
+UPDATE `creature_model_info` SET `bounding_radius`=0,`combat_reach`=0,`gender`=2 WHERE `modelid`=22471; -- Tournament Hippogryph
+-- Addon data for creature 33778 (Tournament Hippogryph)
+DELETE FROM `creature_template_addon` WHERE `entry`=33778;
+INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
+(33778,0,1,1,0, NULL); -- Tournament Hippogryph
diff --git a/sql/updates/world/2011_03_22_0_world_sai.sql b/sql/updates/world/2011_03_22_0_world_sai.sql
deleted file mode 100644
index 8b6ac8d9fe9..00000000000
--- a/sql/updates/world/2011_03_22_0_world_sai.sql
+++ /dev/null
@@ -1,22 +0,0 @@
--- Necro Overlord Mezhen SAI
-SET @GUID   := 95036; -- 1 Required for ELM General Purpose Bunny
-SET @ENTRY   := 24018; -- NPC entry
-SET @CHANNEL := 43151; -- Necrolord: Purple Beam
-SET @TARGET  := 24021; -- ELM General Purpose Bunny (scale x0.01)
-SET @SPELL1  := 32862; -- Drain Soul
-SET @SPELL2  := 43559; -- Raise Dead
-UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
-DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
-(@ENTRY,0,0,0,1,0,100,1,1000,1000,1000,1000,11,@CHANNEL,2,0,0,0,0,11,@TARGET,30,0,0,0,0,0, 'Necro Overlord Mezhen - On spawn & reset - Channel Necrolord: Purple Beam');
-
--- Fix Spell condition for Spell 43151 to only target ELM General Purpose Bunny (scale x0.01)
-DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=43151;
-INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
-(13,0,43151,0,18,1,24021,0,0,'','Spell 43151 targets only ELM General Purpose Bunny (scale x0.01)');
--- Add missing ELM General Purpose Bunny (scale x0.01)
-DELETE FROM `creature` WHERE `guid`=@GUID; 
-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,24021,571,1,1,0,0,2597.148,-3735.499,261.9468,0.2094395,120,0,0,1,0,0,0);
--- ELM General Purpose Bunny (scale x0.01) fix InhabitType
-UPDATE `creature_template` SET `InhabitType`=7 WHERE entry=24021;
diff --git a/sql/updates/world/2011_03_22_1_world_sai.sql b/sql/updates/world/2011_03_22_1_world_sai.sql
deleted file mode 100644
index 974b24f8cbd..00000000000
--- a/sql/updates/world/2011_03_22_1_world_sai.sql
+++ /dev/null
@@ -1,83 +0,0 @@
--- Add missing Invisible Stalker (Floating)
-SET @GUID := 85175; -- 2 Required
-DELETE FROM `creature` WHERE `guid` BETWEEN @GUID AND @GUID+1; 
-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,23033,571,1,1,0,0,3799.331,3428.748,92.80447,3.804818,120,0,0,1,0,0,0),
-(@GUID+1,23033,571,1,1,0,0,3789.681,3434.306,92.37619,4.764749,120,0,0,1,0,0,0);
--- High Priest Talet-Kha Fixup
-SET @ENTRY  := 26073; -- NPC entry
-SET @SPELL1 := 45492; -- Shadow Nova
-SET @SPELL2 := 11640; -- Renew         cast once below 45%
-SET @SPELL3 := 15587; -- Mind Blast    cast below 45% after renew 
-UPDATE `creature` SET `modelid`=0,`spawndist`=0,`MovementType`=0 WHERE `id`=@ENTRY;
-DELETE FROM `creature_addon` WHERE `guid`=85240;
-DELETE FROM `creature_template_addon` WHERE `entry`=26073;
-INSERT INTO `creature_template_addon` (`entry`,`bytes1`,`bytes2`) VALUES (26073,1,1);
--- SAI for High Priest Talet-Kha
-UPDATE `creature_template` SET `speed_run`=1,`faction_H`=21,`InhabitType`=7,`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,1,0,0,0,0,8,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'High Priest Talet-Kha - On spawn - Set React State civilian'),
-(@ENTRY,0,1,2,1,0,100,1,1000,1000,1000,1000,70,0,0,0,0,0,0,10,85098,25422,0,0,0,0,0, 'High Priest Talet-Kha - OOC - Respawn Mystical Webbing'),
-(@ENTRY,0,2,3,61,0,100,0,0,0,0,0,45,0,1,0,0,0,0,10,85098,25422,0,0,0,0,0, 'High Priest Talet-Kha - OOC - Set data Mystical Webbing'),
-(@ENTRY,0,3,4,61,0,100,0,0,0,0,0,70,0,0,0,0,0,0,10,85118,25422,0,0,0,0,0, 'High Priest Talet-Kha - OOC - Respawn Mystical Webbing'),
-(@ENTRY,0,4,5,61,0,100,0,0,0,0,0,45,0,1,0,0,0,0,10,85118,25422,0,0,0,0,0, 'High Priest Talet-Kha - OOC - Set data Mystical Webbing'),
-(@ENTRY,0,5,6,61,0,100,0,0,0,0,0,45,0,1,0,0,0,0,10,85175,23033,0,0,0,0,0, 'High Priest Talet-Kha - OOC - Set data Invisible Stalker'),
-(@ENTRY,0,6,0,61,0,100,0,0,0,0,0,45,0,1,0,0,0,0,10,85176,23033,0,0,0,0,0, 'High Priest Talet-Kha - OOC - Set data Invisible Stalker'),
-(@ENTRY,0,7,0,1,0,100,0,3000,3000,3000,3000,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'High Priest Talet-Kha - OOC - Set phase 1'),
-(@ENTRY,0,8,0,23,1,100,1,45497,0,0,0,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0, 'High Priest Talet-Kha - On Aura missing - Run Script (Phase 1)'),
-(@ENTRY,0,9,10,2,1,100,0,0,45,0,0,11,11640,1,0,0,0,0,1,0,0,0,0,0,0,0, 'High Priest Talet-Kha - Health 45% - Cast Renew on self'),
-(@ENTRY,0,10,0,61,1,100,0,0,0,0,0,22,2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'High Priest Talet-Kha - OOC - Set phase 2'),
-(@ENTRY,0,11,0,0,2,100,0,1500,1500,1500,1500,11,15587,0,0,0,0,0,2,0,0,0,0,0,0,0, 'High Priest Talet-Kha - Combat - Cast Mind Blast on victim (Phase 2)'),
-(@ENTRY*100,9,0,0,0,0,100,0,3000,3000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'High Priest Talet-Kha - script - Text 0'),
-(@ENTRY*100,9,1,0,0,0,100,0,500,500,0,0,69,0,0,0,0,0,0,1,0,0,0,3788.444,3418.249,85.05618,0, 'High Priest Talet-Kha - script - Move to'),
-(@ENTRY*100,9,2,0,0,0,100,0,500,500,0,0,66,0,0,0,0,0,0,1,0,0,0,0,0,0,1.1672, 'High Priest Talet-Kha - script - turn to'),
-(@ENTRY*100,9,3,0,0,0,100,0,1500,1500,0,0,91,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'High Priest Talet-Kha - script - Bytes1 set to 0'),
-(@ENTRY*100,9,4,0,0,0,100,0,100,100,0,0,19,33555200,0,0,0,0,0,1,0,0,0,0,0,0,0, 'High Priest Talet-Kha - script - Remove unitflags'),
-(@ENTRY*100,9,5,0,0,0,100,0,100,100,0,0,8,2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'High Priest Talet-Kha - script - Set React State Hostile'),
-(@ENTRY*100,9,6,0,0,0,100,0,100,100,0,0,11,@SPELL1,1,0,0,0,0,1,0,0,0,0,0,0,0, 'High Priest Talet-Kha - script - Aura self');
--- NPC talk text insert from sniff
-DELETE FROM `creature_text` WHERE `entry` IN (26073);
-INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
-(26073,0,0, 'Who disturbs my meditation?!',1,7,100,15,0,0, 'High Priest Talet-Kha');
--- SAI for Mystical Webbing
-SET @ENTRY := 25422; -- NPC entry
-SET @CHANNEL := 45497; -- Web Beam
-SET @TARGET  := 26073; -- High Priest Talet-Kha
-UPDATE `creature_template` SET `faction_H`=21,`AIName`= 'SmartAI' WHERE `entry`=@ENTRY;
-DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid` IN (-85098,-85118);
-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
-(-85098,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, 'Mystical Webbing - On spawn - Set React State civilian'),
-(-85098,0,1,0,1,0,100,1,1000,1000,1000,1000,11,@CHANNEL,2,0,0,0,0,11,@TARGET,40,0,0,0,0,0, 'Mystical Webbing - On spawn & reset - Web Beam'),
-(-85098,0,2,0,6,0,100,1,0,0,0,0,45,0,2,0,0,0,0,10,85176,23033,0,0,0,0,0, 'Mystical Webbing - On death - set data 0 2 Invisible Stalker'),
-(-85098,0,3,4,38,0,100,0,0,1,0,0,45,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Invisible Stalker (Floating) - On dataset 0 1 - set data 0 0'),
-(-85098,0,4,0,61,0,100,0,0,0,0,0,70,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Invisible Stalker (Floating) - On dataset 0 1 - reset AI'),
-(-85118,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, 'Mystical Webbing - On spawn - Set React State civilian'),
-(-85118,0,1,0,1,0,100,1,1000,1000,1000,1000,11,@CHANNEL,2,0,0,0,0,11,@TARGET,40,0,0,0,0,0, 'Mystical Webbing - On spawn & reset - Web Beam'),
-(-85118,0,2,0,6,0,100,1,0,0,0,0,45,0,2,0,0,0,0,10,85175,23033,0,0,0,0,0, 'Mystical Webbing - On death - set data 0 2 Invisible Stalker'),
-(-85118,0,3,4,38,0,100,0,0,1,0,0,45,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Invisible Stalker (Floating) - On dataset 0 1 - set data 0 0'),
-(-85118,0,4,0,61,0,100,0,0,0,0,0,70,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Invisible Stalker (Floating) - On dataset 0 1 - reset AI');
--- SAI for Invisible Stalker (Floating)
-SET @ENTRY := 23033; -- NPC entry
-SET @CHANNEL := 45497; -- Web Beam
-SET @TARGET  := 26073; -- High Priest Talet-Kha
-UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY;
-DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid` IN (-85175,-85176);
-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
--- Invisible Stalker (Floating)
-(-85175,0,0,0,38,0,100,0,0,1,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Invisible Stalker (Floating) - On dataset 0 1 - Set Phase 1'),
-(-85175,0,1,0,38,0,100,0,0,2,0,0,22,2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Invisible Stalker (Floating) - On dataset 0 2 - Set Phase 2'),
-(-85175,0,2,3,1,1,100,0,0,0,0,0,11,@CHANNEL,2,0,0,0,0,11,@TARGET,40,0,0,0,0,0, 'Invisible Stalker (Floating) - OOC - Cast Web Beam on target (Phase 1)'),
-(-85175,0,3,4,61,1,100,0,0,0,0,0,45,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Invisible Stalker (Floating) - OOC - Set data 0 0 (Phase 1)'),
-(-85175,0,4,0,61,1,100,0,0,0,0,0,22,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Invisible Stalker (Floating) - OOC - Set Phase 0 (Phase 1)'),
-(-85175,0,5,6,1,2,100,0,0,0,0,0,92,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Invisible Stalker (Floating) - OOC - Stop casting (Phase 2)'),
-(-85175,0,6,0,61,2,100,0,0,0,0,0,22,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Invisible Stalker (Floating) - OOC - Set Phase 0 (Phase 2)'),
--- Invisible Stalker (Floating)
-(-85176,0,0,0,38,0,100,0,0,1,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Invisible Stalker (Floating) - On dataset 0 1 - Set Phase 1'),
-(-85176,0,1,0,38,0,100,0,0,2,0,0,22,2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Invisible Stalker (Floating) - On dataset 0 2 - Set Phase 2'),
-(-85176,0,2,3,1,1,100,0,0,0,0,0,11,@CHANNEL,2,0,0,0,0,11,@TARGET,40,0,0,0,0,0, 'Invisible Stalker (Floating) - OOC - Cast Web Beam on target (Phase 1)'),
-(-85176,0,3,4,61,1,100,0,0,0,0,0,45,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Invisible Stalker (Floating) - OOC - Set data 0 0 (Phase 1)'),
-(-85176,0,4,0,61,1,100,0,0,0,0,0,22,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Invisible Stalker (Floating) - OOC - Set Phase 0 (Phase 1)'),
-(-85176,0,5,6,1,2,100,0,0,0,0,0,92,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Invisible Stalker (Floating) - OOC - Stop casting (Phase 2)'),
-(-85176,0,6,0,61,2,100,0,0,0,0,0,22,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Invisible Stalker (Floating) - OOC - Set Phase 0 (Phase 2)');
diff --git a/sql/updates/world/2011_03_22_2_world_sai.sql b/sql/updates/world/2011_03_22_2_world_sai.sql
deleted file mode 100644
index 9f01eb83583..00000000000
--- a/sql/updates/world/2011_03_22_2_world_sai.sql
+++ /dev/null
@@ -1,121 +0,0 @@
--- Pathing for Stormfleet Deckhand SAI
-SET @ENTRY := 25234;
-SET @PATH1 := @ENTRY*100;
-SET @PATH2 := @ENTRY*100+1;
-SET @PATH3 := @ENTRY*100+2;
-SET @PATH4 := @ENTRY*100+3;
--- Remove old waypoint data and scripts
-UPDATE `creature` SET `spawndist`=0,`MovementType`=0,`position_x`=2265.704,`position_y`=5314.686,`position_z`=22.43809 WHERE `guid`=109653;
-UPDATE `creature` SET `spawndist`=0,`MovementType`=0,`position_x`=2253.791,`position_y`=5252.389,`position_z`=35.69936 WHERE `guid`=109654;
-UPDATE `creature` SET `spawndist`=0,`MovementType`=0,`position_x`=2220.033,`position_y`=5292.010,`position_z`=10.70095 WHERE `guid`=109652;
-UPDATE `creature` SET `spawndist`=0,`MovementType`=0,`position_x`=2233.497,`position_y`=5291.667,`position_z`=11.21773 WHERE `guid`=109655;
-UPDATE `creature_addon` SET `path_id`=0 WHERE `guid` IN (109653,109654,109652,109655);
-DELETE FROM `waypoint_data` WHERE `id` IN (1096530,1096540,1096520,1096550);
-DELETE FROM `waypoint_scripts` WHERE `id` IN (1057,1058,1059,1060,1061,1130,1131,1132,1133);
--- SAI for Stormfleet Deckhand
-UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
-DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid` IN (-109653,-109654,-109652,-109655);
-DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid` IN (@ENTRY*100,@ENTRY*100+1,@ENTRY*100+2);
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
-(-109653,0,0,0,11,0,100,0,0,0,0,0,53,0,@PATH1,1,0,0,0,1,0,0,0,0,0,0,0, 'Stormfleet Deckhand - On spawn - Start WP movement'),
-(-109653,0,1,2,40,0,100,0,4,@PATH1,0,0,54,10000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Stormfleet Deckhand - Reach wp 4 - pause wp'),
-(-109653,0,2,0,61,0,100,0,0,0,0,0,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Stormfleet Deckhand - Reach wp 4 - run script'),
-(-109653,0,3,4,40,0,100,0,8,@PATH1,0,0,54,21000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Stormfleet Deckhand - Reach wp 8 - pause wp'),
-(-109653,0,4,5,61,0,100,0,0,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,5.794493, 'Stormfleet Deckhand - Reach wp 8 - turn to'),
-(-109653,0,5,0,61,0,100,0,0,0,0,0,80,@ENTRY*100+1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Stormfleet Deckhand - Reach wp 8 - run script'),
-(-109654,0,0,0,11,0,100,0,0,0,0,0,53,0,@PATH2,1,0,0,0,1,0,0,0,0,0,0,0, 'Stormfleet Deckhand - On spawn - Start WP movement'),
-(-109654,0,1,2,40,0,100,0,6,@PATH2,0,0,54,10000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Stormfleet Deckhand - Reach wp 6 - pause wp'),
-(-109654,0,2,0,61,0,100,0,0,0,0,0,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Stormfleet Deckhand - Reach wp 6 - run script'),
-(-109654,0,3,4,40,0,100,0,13,@PATH2,0,0,54,21000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Stormfleet Deckhand - Reach wp 13 - pause wp'),
-(-109654,0,4,0,61,0,100,0,0,0,0,0,80,@ENTRY*100+1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Stormfleet Deckhand - Reach wp 13 - run script'),
-(-109652,0,0,0,11,0,100,0,0,0,0,0,53,0,@PATH3,1,0,0,0,1,0,0,0,0,0,0,0, 'Stormfleet Deckhand - On spawn - Start WP movement'),
-(-109652,0,1,2,40,0,100,0,17,@PATH3,0,0,54,10000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Stormfleet Deckhand - Reach wp 17 - pause wp'),
-(-109652,0,2,0,61,0,100,0,0,0,0,0,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Stormfleet Deckhand - Reach wp 17 - run script'),
-(-109652,0,3,4,40,0,100,0,9,@PATH3,0,0,54,21000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Stormfleet Deckhand - Reach wp 9 - pause wp'),
-(-109652,0,4,0,61,0,100,0,0,0,0,0,80,@ENTRY*100+1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Stormfleet Deckhand - Reach wp 9 - run script'),
-(-109655,0,0,0,11,0,100,0,0,0,0,0,53,0,@PATH4,1,0,0,0,1,0,0,0,0,0,0,0, 'Stormfleet Deckhand - On spawn - Start WP movement'),
-(-109655,0,1,2,40,0,100,0,3,@PATH4,0,0,54,11000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Stormfleet Deckhand - Reach wp 3 - pause wp'),
-(-109655,0,2,0,61,0,100,0,0,0,0,0,80,@ENTRY*100+2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Stormfleet Deckhand - Reach wp 3 - run script'),
-(-109655,0,3,4,40,0,100,0,13,@PATH4,0,0,54,11000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Stormfleet Deckhand - Reach wp 13 - pause wp'),
-(-109655,0,4,0,61,0,100,0,0,0,0,0,80,@ENTRY*100+2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Stormfleet Deckhand - Reach wp 13 - run script'),
-(-109655,0,5,6,40,0,100,0,16,@PATH4,0,0,54,11000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Stormfleet Deckhand - Reach wp 16 - pause wp'),
-(-109655,0,6,0,61,0,100,0,0,0,0,0,80,@ENTRY*100+2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Stormfleet Deckhand - Reach wp 16 - run script'),
-(-109655,0,7,8,40,0,100,0,25,@PATH4,0,0,54,11000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Stormfleet Deckhand - Reach wp 25 - pause wp'),
-(-109655,0,8,9,61,0,100,0,0,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,5.969026, 'Stormfleet Deckhand - Reach wp 25 - turn to'),
-(-109655,0,9,0,61,0,100,0,0,0,0,0,80,@ENTRY*100+2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Stormfleet Deckhand - Reach wp 25 - run script'),
-(@ENTRY*100,9,0,0,0,0,100,0,0,0,0,0,90,8,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Stormfleet Deckhand - script - set bytes1'),
-(@ENTRY*100,9,1,0,0,0,100,0,10000,10000,0,0,91,8,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Stormfleet Deckhand - script - remove bytes1'),
-(@ENTRY*100+1,9,0,0,0,0,100,0,3000,3000,0,0,5,22,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Stormfleet Deckhand - script - emote'),
-(@ENTRY*100+1,9,1,0,0,0,100,0,6000,6000,0,0,5,70,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Stormfleet Deckhand - script - emote'),
-(@ENTRY*100+1,9,2,0,0,0,100,0,6000,6000,0,0,5,22,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Stormfleet Deckhand - script - emote'),
-(@ENTRY*100+2,9,0,0,0,0,100,0,1000,1000,0,0,17,69,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Stormfleet Deckhand - script - set state STATE_USESTANDING'),
-(@ENTRY*100+2,9,1,0,0,0,100,0,8000,8000,0,0,17,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Stormfleet Deckhand - script - set state NONE'),
-(@ENTRY*100+2,9,2,0,0,0,100,0,0,0,0,0,90,2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Stormfleet Deckhand - script - set bytes1'),
-(@ENTRY*100+2,9,3,0,0,0,100,0,2000,2000,0,0,91,2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Stormfleet Deckhand - script - remove bytes1');
--- Waypoints for Stormfleet Deckhand from sniff
-DELETE FROM `waypoints` WHERE `entry` IN (@PATH1,@PATH2,@PATH3,@PATH4);
-INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
-(@PATH1,1,2261.388,5305.248,21.68184, 'Stormfleet Deckhand'),
-(@PATH1,2,2259.963,5295.583,20.08975, 'Stormfleet Deckhand'),
-(@PATH1,3,2260.002,5286.996,15.49093, 'Stormfleet Deckhand'),
-(@PATH1,4,2257.711,5281.927,12.09341, 'Stormfleet Deckhand'),
-(@PATH1,5,2261.763,5286.725,15.76729, 'Stormfleet Deckhand'),
-(@PATH1,6,2260.902,5294.649,19.95268, 'Stormfleet Deckhand'),
-(@PATH1,7,2263.460,5304.816,21.72922, 'Stormfleet Deckhand'),
-(@PATH1,8,2265.704,5314.686,22.43809, 'Stormfleet Deckhand'),
-(@PATH2,1,2248.875,5255.391,36.45885, 'Stormfleet Deckhand'),
-(@PATH2,2,2246.625,5256.641,37.20885, 'Stormfleet Deckhand'),
-(@PATH2,3,2244.625,5258.641,36.45885, 'Stormfleet Deckhand'),
-(@PATH2,4,2241.625,5258.391,37.20885, 'Stormfleet Deckhand'),
-(@PATH2,5,2238.625,5259.391,36.45885, 'Stormfleet Deckhand'),
-(@PATH2,6,2232.960,5260.392,35.71835, 'Stormfleet Deckhand'),
-(@PATH2,7,2235.375,5260.141,36.20885, 'Stormfleet Deckhand'),
-(@PATH2,8,2239.375,5259.141,36.45885, 'Stormfleet Deckhand'),
-(@PATH2,9,2241.625,5258.641,37.20885, 'Stormfleet Deckhand'),
-(@PATH2,10,2244.625,5258.641,36.45885, 'Stormfleet Deckhand'),
-(@PATH2,11,2247.125,5256.391,37.20885, 'Stormfleet Deckhand'),
-(@PATH2,12,2249.125,5255.391,36.45885, 'Stormfleet Deckhand'),
-(@PATH2,13,2253.791,5252.389,35.69936, 'Stormfleet Deckhand'),
-(@PATH3,1,2212.298,5281.927,10.82595, 'Stormfleet Deckhand'),
-(@PATH3,2,2211.701,5275.361,10.82595, 'Stormfleet Deckhand'),
-(@PATH3,3,2224.383,5268.124,7.166187, 'Stormfleet Deckhand'),
-(@PATH3,4,2235.353,5264.704,8.606246, 'Stormfleet Deckhand'),
-(@PATH3,5,2244.243,5262.414,11.81635, 'Stormfleet Deckhand'),
-(@PATH3,6,2248.373,5259.464,11.78494, 'Stormfleet Deckhand'),
-(@PATH3,7,2247.781,5252.418,11.96684, 'Stormfleet Deckhand'),
-(@PATH3,8,2246.383,5249.14,15.53435, 'Stormfleet Deckhand'),
-(@PATH3,9,2243.871,5243.415,21.4974, 'Stormfleet Deckhand'),
-(@PATH3,10,2245.975,5248.252,16.51618, 'Stormfleet Deckhand'),
-(@PATH3,11,2248.437,5255.79,11.86939, 'Stormfleet Deckhand'),
-(@PATH3,12,2248.403,5261.318,11.747, 'Stormfleet Deckhand'),
-(@PATH3,13,2228.012,5267.475,7.16457, 'Stormfleet Deckhand'),
-(@PATH3,14,2215.574,5274.178,11.13563, 'Stormfleet Deckhand'),
-(@PATH3,15,2213.556,5283.097,10.82595, 'Stormfleet Deckhand'),
-(@PATH3,16,2218.244,5291.424,10.70095, 'Stormfleet Deckhand'),
-(@PATH3,17,2224.214,5293.65,10.82595, 'Stormfleet Deckhand'),
-(@PATH3,18,2220.033,5292.01,10.70095, 'Stormfleet Deckhand'),
-(@PATH4,1,2232.031,5289.312,11.11433, 'Stormfleet Deckhand'),
-(@PATH4,2,2229.514,5285.923,11.22073, 'Stormfleet Deckhand'),
-(@PATH4,3,2231.239,5285.13,11.22661, 'Stormfleet Deckhand'),
-(@PATH4,4,2229.854,5285.705,11.22414, 'Stormfleet Deckhand'),
-(@PATH4,5,2228.48,5291.178,11.13671, 'Stormfleet Deckhand'),
-(@PATH4,6,2226.165,5291.41,10.95095, 'Stormfleet Deckhand'),
-(@PATH4,7,2223.731,5291.465,10.82595, 'Stormfleet Deckhand'),
-(@PATH4,8,2218.564,5293.642,10.70095, 'Stormfleet Deckhand'),
-(@PATH4,9,2213.531,5285.789,10.70095, 'Stormfleet Deckhand'),
-(@PATH4,10,2208.855,5275.448,10.82595, 'Stormfleet Deckhand'),
-(@PATH4,11,2206.379,5260.244,10.58918, 'Stormfleet Deckhand'),
-(@PATH4,12,2211.11,5256.537,10.71418, 'Stormfleet Deckhand'),
-(@PATH4,13,2219.187,5252.958,11.33607, 'Stormfleet Deckhand'),
-(@PATH4,14,2216.945,5251.284,11.26102, 'Stormfleet Deckhand'),
-(@PATH4,15,2215.487,5248.678,11.44615, 'Stormfleet Deckhand'),
-(@PATH4,16,2217.447,5248.063,11.4383, 'Stormfleet Deckhand'),
-(@PATH4,17,2213.407,5251.713,10.96418, 'Stormfleet Deckhand'),
-(@PATH4,18,2207.356,5257.069,10.71418, 'Stormfleet Deckhand'),
-(@PATH4,19,2205.434,5262.277,10.58918, 'Stormfleet Deckhand'),
-(@PATH4,20,2208.177,5274.885,10.82595, 'Stormfleet Deckhand'),
-(@PATH4,21,2214.61,5286.973,10.82595, 'Stormfleet Deckhand'),
-(@PATH4,22,2219.416,5292.909,10.70095, 'Stormfleet Deckhand'),
-(@PATH4,23,2224.719,5291.44,10.82595, 'Stormfleet Deckhand'),
-(@PATH4,24,2228.346,5291.136,10.95095, 'Stormfleet Deckhand'),
-(@PATH4,25,2233.497,5291.667,11.21773, 'Stormfleet Deckhand');
diff --git a/sql/updates/world/2011_03_22_3_world_creature_template.sql b/sql/updates/world/2011_03_22_3_world_creature_template.sql
deleted file mode 100644
index 5769c93c1d8..00000000000
--- a/sql/updates/world/2011_03_22_3_world_creature_template.sql
+++ /dev/null
@@ -1,8 +0,0 @@
--- Template updates for creature 33778 (Tournament Hippogryph)
-UPDATE `creature_template` SET `vehicleid`=108,`InhabitType`=4 WHERE `entry`=33778; -- Tournament Hippogryph
--- Model data 22471 (creature 33778 (Tournament Hippogryph))
-UPDATE `creature_model_info` SET `bounding_radius`=0,`combat_reach`=0,`gender`=2 WHERE `modelid`=22471; -- Tournament Hippogryph
--- Addon data for creature 33778 (Tournament Hippogryph)
-DELETE FROM `creature_template_addon` WHERE `entry`=33778;
-INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
-(33778,0,1,1,0, NULL); -- Tournament Hippogryph
diff --git a/sql/updates/world/2011_03_23_00_world_conditions.sql b/sql/updates/world/2011_03_23_00_world_conditions.sql
new file mode 100644
index 00000000000..e8817974939
--- /dev/null
+++ b/sql/updates/world/2011_03_23_00_world_conditions.sql
@@ -0,0 +1,3 @@
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=18 AND `SourceEntry`=33581;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceEntry`,`ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `Comment`) VALUES 
+(18,33581,24,1,24238, 'Only use Insult on Bjorn Halgurdsson');
diff --git a/sql/updates/world/2011_03_23_01_world_creature_template.sql b/sql/updates/world/2011_03_23_01_world_creature_template.sql
new file mode 100644
index 00000000000..ddc7e9c4cbc
--- /dev/null
+++ b/sql/updates/world/2011_03_23_01_world_creature_template.sql
@@ -0,0 +1,874 @@
+-- Updates for (mostly) HoR creatures/GOs
+-- Gameobject updates
+UPDATE `gameobject_template` SET `flags`=`flags`|32 WHERE `entry`=202443; -- Dedication of Honor
+UPDATE `gameobject_template` SET `flags`=`flags`|32 WHERE `entry`=201761; -- The Pit of Saron Portcullis
+UPDATE `gameobject_template` SET `flags`=`flags`|32 WHERE `entry`=201759; -- The Forge of Souls Portcullis
+UPDATE `gameobject_template` SET `flags`=`flags`|32 WHERE `entry`=201760; -- The Halls of Reflection Gate
+UPDATE `gameobject_template` SET `flags`=`flags`|32,`faction`=114 WHERE `entry`=201976; -- Doodad_IceCrown_Door_04
+UPDATE `gameobject_template` SET `flags`=`flags`|32,`faction`=114 WHERE `entry`=202236; -- Frostmourne Altar
+UPDATE `gameobject_template` SET `flags`=`flags`|32,`faction`=114 WHERE `entry`=202302; -- Frostmourne
+UPDATE `gameobject_template` SET `flags`=`flags`|32,`faction`=1375 WHERE `entry`=197341; -- Impenetrable Door
+UPDATE `gameobject_template` SET `flags`=`flags`|32,`faction`=1375 WHERE `entry`=197343; -- Doodad_IceCrown_Door_03
+UPDATE `gameobject_template` SET `flags`=`flags`|32,`faction`=1375 WHERE `entry`=197342; -- Doodad_IceCrown_Door_02
+UPDATE `gameobject_template` SET `faction`=16 WHERE `entry`=164639; -- Frost Trap
+
+SET @Equip=10137; -- equipment_id
+-- Template updates
+UPDATE `creature_template` SET `equipment_id`=@Equip+0 WHERE `entry`=17252; -- Felguard
+UPDATE `creature_template` SET `baseattacktime`=1800 WHERE `entry`=38112; -- Falric
+UPDATE `creature_template` SET `baseattacktime`=2000 WHERE `entry`=14881; -- Spider
+UPDATE `creature_template` SET `dynamicflags`=`dynamicflags`|4 WHERE `entry`=1412; -- Squirrel
+UPDATE `creature_template` SET `dynamicflags`=`dynamicflags`|4 WHERE `entry`=32428; -- Underbelly Rat
+UPDATE `creature_template` SET `dynamicflags`=`dynamicflags`|4,`unit_class`=4 WHERE `entry`=36774; -- Silver Covenant Agent
+UPDATE `creature_template` SET `equipment_id`=1221 WHERE `entry`=37221; -- Lady Jaina Proudmoore
+UPDATE `creature_template` SET `equipment_id`=637 WHERE `entry`=37582; -- Archmage Koreln
+UPDATE `creature_template` SET `exp`=0 WHERE `entry`=32206; -- Armored Brown Bear
+UPDATE `creature_template` SET `exp`=0 WHERE `entry`=32322; -- Gold Warrior
+UPDATE `creature_template` SET `exp`=0 WHERE `entry`=32328; -- [DND] Dalaran Sewer Arena - Controller - Death
+UPDATE `creature_template` SET `exp`=0 WHERE `entry`=32339; -- [DND] Dalaran Sewer Arena - Controller
+UPDATE `creature_template` SET `exp`=0 WHERE `entry`=32425; -- Galkara the Assassin
+UPDATE `creature_template` SET `exp`=0 WHERE `entry`=32435; -- Vern
+UPDATE `creature_template` SET `exp`=0 WHERE `entry`=32441; -- Underbelly Croc
+UPDATE `creature_template` SET `exp`=0 WHERE `entry`=32664; -- Segacedi
+UPDATE `creature_template` SET `exp`=0,`npcflag`=`npcflag`|130 WHERE `entry`=31032; -- Derek Odds
+UPDATE `creature_template` SET `exp`=0,`npcflag`=`npcflag`|3 WHERE `entry`=31081; -- Officer Van Rossem
+UPDATE `creature_template` SET `exp`=0,`npcflag`=`npcflag`|640 WHERE `entry`=32416; -- Stefen Cotter
+UPDATE `creature_template` SET `exp`=0,`unit_flags`=`unit_flags`|526592 WHERE `entry`=32321; -- Green Warrior
+UPDATE `creature_template` SET `exp`=0,`unit_flags`=`unit_flags`|526592 WHERE `entry`=32340; -- Gold Shaman
+UPDATE `creature_template` SET `exp`=0,`unit_flags`=`unit_flags`|526592 WHERE `entry`=32342; -- Green Paladin
+UPDATE `creature_template` SET `exp`=2 WHERE `entry`=37704; -- Frostmourne Altar Bunny (Quel'Delar)
+UPDATE `creature_template` SET `exp`=2,`minlevel`=82,`maxlevel`=82,`unit_flags`=`unit_flags`|33555200 WHERE `entry`=37849; -- Sartharion Image
+UPDATE `creature_template` SET `exp`=0,`unit_flags`=`unit_flags`|32768 WHERE `entry`=30755; -- Kor'kron Reaver
+UPDATE `creature_template` SET `minlevel`=60,`maxlevel`=60,`unit_flags`=`unit_flags`|33555200 WHERE `entry`=34984; -- World Trigger (Not Floating)
+UPDATE `creature_template` SET `minlevel`=75,`maxlevel`=75,`npcflag`=`npcflag`|4224,`unit_flags`=`unit_flags`|512 WHERE `entry`=33936; -- Nargle Lashcord
+UPDATE `creature_template` SET `minlevel`=75,`maxlevel`=75,`npcflag`=`npcflag`|4224,`unit_flags`=`unit_flags`|768 WHERE `entry`=33937; -- Xazi Smolderpipe
+UPDATE `creature_template` SET `minlevel`=75,`maxlevel`=75,`npcflag`=`npcflag`|4224,`unit_flags`=`unit_flags`|768 WHERE `entry`=33938; -- Zom Bocom
+UPDATE `creature_template` SET `unit_class`=4 WHERE `entry`=26125; -- Risen Ghoul
+UPDATE `creature_template` SET `unit_class`=8 WHERE `entry`=416; -- Imp
+UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=28690; -- Tassia Whisperglen
+UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=28708; -- Kizi Copperclip
+UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=28956; -- Warcaster Fanoraithe
+UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=28958; -- Jessa Weaver
+UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=29660; -- Grand Marauder Sai
+UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=29665; -- Pazik "The Pick" Prylock
+UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=30104; -- Adamman the Trader
+UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=30726; -- Archivist Betha
+UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=31136; -- High Warlord Uro
+UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=32169; -- Arcanist Braedin
+UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=32170; -- Magister Surdiel
+UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=32676; -- Grindle Firespark
+UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=32677; -- Whirt the All-Knowing
+UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=32678; -- Emeline Fizzlefry
+UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=32679; -- Darthalia Ebonscorch
+UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=32680; -- Fabioso the Fabulous
+UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=32681; -- The Magnificent Merleaux
+UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=32683; -- Grezla the Hag
+UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=32684; -- Mona Everspring
+UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=32685; -- Kitz Proudbreeze
+UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=32686; -- Crafticus Mindbender
+UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=32687; -- Linda Ann Kastinglow
+UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=32688; -- Archmage Tenaj
+UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=32689; -- Adorean Lew
+UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=32690; -- Bitty Frostflinger
+UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=32691; -- Magus Fansy Goodbringer
+UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=32692; -- Arcanist Alec
+UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=32693; -- Sabriana Sorrowgaze
+UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=32726; -- The Chooch
+UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=32727; -- Natalie Tootiblare
+UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=32728; -- Illusionist Karina
+UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=32729; -- Lofwyr Le'Fleur
+UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=32730; -- Goldlilly Gleamingfell
+UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=32731; -- Metopious Loreseeker
+UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=32732; -- Dorfus Alphamage
+UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=32733; -- Joboba Mezbreaker
+UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=33031; -- Sebastian Bower
+UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=36856; -- Shandy Glossgleam
+UPDATE `creature_template` SET `npcflag`=`npcflag`|1,`unit_flags`=`unit_flags`|768 WHERE `entry`=35594; -- Brassbolt Mechawrench
+UPDATE `creature_template` SET `npcflag`=`npcflag`|1048577 WHERE `entry`=14990; -- Defilers Emissary
+UPDATE `creature_template` SET `npcflag`=`npcflag`|1048577 WHERE `entry`=14991; -- League of Arathor Emissary
+UPDATE `creature_template` SET `npcflag`=`npcflag`|1048577 WHERE `entry`=29533; -- Schembari "Uncle Sal" Shearbolt
+UPDATE `creature_template` SET `npcflag`=`npcflag`|1048577 WHERE `entry`=29568; -- "Techs" Rickard Rustbolt
+UPDATE `creature_template` SET `npcflag`=`npcflag`|1048577 WHERE `entry`=29667; -- Warsong Gulch Portal
+UPDATE `creature_template` SET `npcflag`=`npcflag`|1048577 WHERE `entry`=29668; -- Arathi Basin Portal
+UPDATE `creature_template` SET `npcflag`=`npcflag`|1048577 WHERE `entry`=29669; -- Alterac Valley Portal
+UPDATE `creature_template` SET `npcflag`=`npcflag`|1048577 WHERE `entry`=29670; -- Eye of the Storm Portal
+UPDATE `creature_template` SET `npcflag`=`npcflag`|1048577 WHERE `entry`=29671; -- Strand of the Ancients Portal
+UPDATE `creature_template` SET `npcflag`=`npcflag`|1048577 WHERE `entry`=29673; -- Arathi Basin Portal
+UPDATE `creature_template` SET `npcflag`=`npcflag`|1048577 WHERE `entry`=29675; -- Eye of the Storm Portal
+UPDATE `creature_template` SET `npcflag`=`npcflag`|1048577 WHERE `entry`=32330; -- Minzi the Minx
+UPDATE `creature_template` SET `npcflag`=`npcflag`|1048577 WHERE `entry`=32332; -- Ramik Slamwrench
+UPDATE `creature_template` SET `npcflag`=`npcflag`|1048577 WHERE `entry`=32333; -- "Dapper" Danik Blackshaft
+UPDATE `creature_template` SET `npcflag`=`npcflag`|1048577 WHERE `entry`=34952; -- Isle of Conquest Portal
+UPDATE `creature_template` SET `npcflag`=`npcflag`|1048577 WHERE `entry`=34953; -- Isle of Conquest Portal
+UPDATE `creature_template` SET `npcflag`=`npcflag`|1154 WHERE `entry`=29535; -- Alchemist Cinesra
+UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=28692; -- "Red" Jack Findle
+UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=28707; -- Angelo Pescatore
+UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=28715; -- Endora Moorehead
+UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=28721; -- Tiffany Cartier
+UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=28723; -- Larana Drome
+UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=28725; -- Patricia Egan
+UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=28726; -- Dominique Stefano
+UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=28727; -- Edward Egan
+UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=28728; -- Dorian Fines
+UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=28951; -- Breanni
+UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=28993; -- Aerith Primrose
+UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=28994; -- Abra Cadabra
+UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=29491; -- Karandonna
+UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=29495; -- Norvin Alderman
+UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=29510; -- Linna Bruder
+UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=29511; -- Lalla Brightweave
+UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=29512; -- Ainderu Summerleaf
+UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=29528; -- Debbi Moore
+UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=29529; -- Ninsianna
+UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=29548; -- Aimee
+UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=29628; -- Angelique Butler
+UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=29702; -- Chameli Banaphash
+UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=29703; -- Sheddle Glossgleam
+UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=29716; -- Clockwork Assistant
+UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=30885; -- Blazik Fireclaw
+UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=31579; -- Arcanist Adurin
+UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=31580; -- Arcanist Ivrenne
+UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=32172; -- Harold Winston
+UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=32216; -- Mei Francis
+UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=32334; -- Nixi Fireclaw
+UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=32509; -- Brammold Deepmine
+UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=32514; -- Vanessa Sellers
+UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=33027; -- Jessica Sellers
+UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=33964; -- Arcanist Firael
+UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=37942; -- Arcanist Uovril
+UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=40160; -- Frozo the Renowned
+UPDATE `creature_template` SET `npcflag`=`npcflag`|128,`unit_flags`=`unit_flags`|32768 WHERE `entry`=35790; -- Usuri Brightcoin
+UPDATE `creature_template` SET `npcflag`=`npcflag`|128,`unit_flags`=`unit_flags`|768 WHERE `entry`=35494; -- Arcanist Miluria
+UPDATE `creature_template` SET `npcflag`=`npcflag`|128,`unit_flags`=`unit_flags`|768 WHERE `entry`=35507; -- Enchanter Isian
+UPDATE `creature_template` SET `npcflag`=`npcflag`|129 WHERE `entry`=28776; -- Elizabeth Ross
+UPDATE `creature_template` SET `npcflag`=`npcflag`|129 WHERE `entry`=29478; -- Jepetto Joybuzz
+UPDATE `creature_template` SET `npcflag`=`npcflag`|130 WHERE `entry`=28718; -- Ranid Glowergold
+UPDATE `creature_template` SET `npcflag`=`npcflag`|130 WHERE `entry`=29527; -- Orton Bennet
+UPDATE `creature_template` SET `npcflag`=`npcflag`|130 WHERE `entry`=32337; -- Christi Stockton
+UPDATE `creature_template` SET `npcflag`=`npcflag`|130 WHERE `entry`=32515; -- Braeg Stoutbeard
+UPDATE `creature_template` SET `npcflag`=`npcflag`|131,`unit_flags`=`unit_flags`|320 WHERE `entry`=15351; -- Alliance Brigadier General
+UPDATE `creature_template` SET `npcflag`=`npcflag`|131072 WHERE `entry`=29530; -- Binzik Goldbook
+UPDATE `creature_template` SET `npcflag`=`npcflag`|131072 WHERE `entry`=30604; -- Teller Almeida
+UPDATE `creature_template` SET `npcflag`=`npcflag`|131072 WHERE `entry`=30605; -- Teller Gee
+UPDATE `creature_template` SET `npcflag`=`npcflag`|131072 WHERE `entry`=30607; -- Teller Plushner
+UPDATE `creature_template` SET `npcflag`=`npcflag`|147 WHERE `entry`=28701; -- Timothy Jones
+UPDATE `creature_template` SET `npcflag`=`npcflag`|16 WHERE `entry`=28693; -- Enchanter Nalthanis
+UPDATE `creature_template` SET `npcflag`=`npcflag`|16 WHERE `entry`=28697; -- Timofey Oshenko
+UPDATE `creature_template` SET `npcflag`=`npcflag`|16 WHERE `entry`=28702; -- Professor Pallin
+UPDATE `creature_template` SET `npcflag`=`npcflag`|16 WHERE `entry`=28704; -- Dorothy Egan
+UPDATE `creature_template` SET `npcflag`=`npcflag`|16 WHERE `entry`=29509; -- Namha Moonwater
+UPDATE `creature_template` SET `npcflag`=`npcflag`|16 WHERE `entry`=29513; -- Didi the Wrench
+UPDATE `creature_template` SET `npcflag`=`npcflag`|16 WHERE `entry`=29514; -- Findle Whistlesteam
+UPDATE `creature_template` SET `npcflag`=`npcflag`|19 WHERE `entry`=28699; -- Charles Worth
+UPDATE `creature_template` SET `npcflag`=`npcflag`|19 WHERE `entry`=28703; -- Linzy Blackbolt
+UPDATE `creature_template` SET `npcflag`=`npcflag`|2 WHERE `entry`=30115; -- Vereesa Windrunner
+UPDATE `creature_template` SET `npcflag`=`npcflag`|2 WHERE `entry`=30116; -- Archmage Aethas Sunreaver
+UPDATE `creature_template` SET `npcflag`=`npcflag`|2 WHERE `entry`=30137; -- Shifty Vickers
+UPDATE `creature_template` SET `npcflag`=`npcflag`|2 WHERE `entry`=30490; -- Rin Duoctane
+UPDATE `creature_template` SET `npcflag`=`npcflag`|2 WHERE `entry`=31080; -- Warden Alturas
+UPDATE `creature_template` SET `npcflag`=`npcflag`|2 WHERE `entry`=32516; -- Washed-Up Mage
+UPDATE `creature_template` SET `npcflag`=`npcflag`|2 WHERE `entry`=36506; -- Daros Moonlance
+UPDATE `creature_template` SET `npcflag`=`npcflag`|2 WHERE `entry`=37776; -- Apprentice Nelphi
+UPDATE `creature_template` SET `npcflag`=`npcflag`|2 WHERE `entry`=37780; -- Dark Ranger Vorel
+UPDATE `creature_template` SET `npcflag`=`npcflag`|2,`unit_flags`=`unit_flags`|768 WHERE `entry`=35471; -- Sorn Proudmane
+UPDATE `creature_template` SET `npcflag`=`npcflag`|2176 WHERE `entry`=28714; -- Ildine Sorrowspear
+UPDATE `creature_template` SET `npcflag`=`npcflag`|2176 WHERE `entry`=29537; -- Darahir
+UPDATE `creature_template` SET `npcflag`=`npcflag`|2176 WHERE `entry`=29636; -- Hagatha Moorehead
+UPDATE `creature_template` SET `npcflag`=`npcflag`|262145 WHERE `entry`=29534; -- "Baroness" Llana
+UPDATE `creature_template` SET `npcflag`=`npcflag`|262145 WHERE `entry`=32329; -- Kanika Goldwell
+UPDATE `creature_template` SET `npcflag`=`npcflag`|3 WHERE `entry`=16128; -- Rhonin
+UPDATE `creature_template` SET `npcflag`=`npcflag`|3 WHERE `entry`=20735; -- Archmage Lan'dalock
+UPDATE `creature_template` SET `npcflag`=`npcflag`|3 WHERE `entry`=28160; -- Archmage Pentarus
+UPDATE `creature_template` SET `npcflag`=`npcflag`|3 WHERE `entry`=29156; -- Archmage Celindra
+UPDATE `creature_template` SET `npcflag`=`npcflag`|3 WHERE `entry`=31439; -- Archmage Timear
+UPDATE `creature_template` SET `npcflag`=`npcflag`|3 WHERE `entry`=36669; -- Arcanist Tybalin
+UPDATE `creature_template` SET `npcflag`=`npcflag`|384 WHERE `entry`=28691; -- Susana Averoy
+UPDATE `creature_template` SET `npcflag`=`npcflag`|384 WHERE `entry`=29493; -- Jarold Puller
+UPDATE `creature_template` SET `npcflag`=`npcflag`|4224 WHERE `entry`=28716; -- Palja Amboss
+UPDATE `creature_template` SET `npcflag`=`npcflag`|4224 WHERE `entry`=28722; -- Bryan Landers
+UPDATE `creature_template` SET `npcflag`=`npcflag`|4224 WHERE `entry`=28989; -- Aemara
+UPDATE `creature_template` SET `npcflag`=`npcflag`|4224 WHERE `entry`=28990; -- Anthony Durain
+UPDATE `creature_template` SET `npcflag`=`npcflag`|4224 WHERE `entry`=28991; -- Valaden Silverblade
+UPDATE `creature_template` SET `npcflag`=`npcflag`|4224 WHERE `entry`=28992; -- Valerie Langrom
+UPDATE `creature_template` SET `npcflag`=`npcflag`|4224 WHERE `entry`=28995; -- Paldesse
+UPDATE `creature_template` SET `npcflag`=`npcflag`|4224 WHERE `entry`=28997; -- Griselda Hunderland
+UPDATE `creature_template` SET `npcflag`=`npcflag`|4224 WHERE `entry`=29476; -- Dagna Flintlock
+UPDATE `creature_template` SET `npcflag`=`npcflag`|4224 WHERE `entry`=29494; -- Shen Kang Cheng
+UPDATE `creature_template` SET `npcflag`=`npcflag`|4224 WHERE `entry`=29496; -- Kerta the Bold
+UPDATE `creature_template` SET `npcflag`=`npcflag`|4224 WHERE `entry`=29497; -- Walther Whiteford
+UPDATE `creature_template` SET `npcflag`=`npcflag`|4224 WHERE `entry`=29499; -- Bartram Haller
+UPDATE `creature_template` SET `npcflag`=`npcflag`|4224 WHERE `entry`=29523; -- Bragund Brightlink
+UPDATE `creature_template` SET `npcflag`=`npcflag`|4224 WHERE `entry`=29538; -- Hexil Garrot
+UPDATE `creature_template` SET `npcflag`=`npcflag`|4224 WHERE `entry`=34252; -- Dubin Clay
+UPDATE `creature_template` SET `npcflag`=`npcflag`|4224 WHERE `entry`=35497; -- Rafael Langrom
+UPDATE `creature_template` SET `npcflag`=`npcflag`|4224 WHERE `entry`=35500; -- Matilda Brightlink
+UPDATE `creature_template` SET `npcflag`=`npcflag`|4224,`unit_flags`=`unit_flags`|512 WHERE `entry`=34095; -- Trapjaw Rix
+UPDATE `creature_template` SET `npcflag`=`npcflag`|4224,`unit_flags`=`unit_flags`|512 WHERE `entry`=35496; -- Rueben Lauren
+UPDATE `creature_template` SET `npcflag`=`npcflag`|4224,`unit_flags`=`unit_flags`|512 WHERE `entry`=35498; -- Horace Hunderland
+UPDATE `creature_template` SET `npcflag`=`npcflag`|640 WHERE `entry`=28682; -- Inzi Charmlight
+UPDATE `creature_template` SET `npcflag`=`npcflag`|640 WHERE `entry`=28685; -- Narisa Redgold
+UPDATE `creature_template` SET `npcflag`=`npcflag`|640 WHERE `entry`=29547; -- Applebough
+UPDATE `creature_template` SET `npcflag`=`npcflag`|640 WHERE `entry`=29714; -- Lucian Trias
+UPDATE `creature_template` SET `npcflag`=`npcflag`|640 WHERE `entry`=29715; -- Fialla Sweetberry
+UPDATE `creature_template` SET `npcflag`=`npcflag`|640 WHERE `entry`=32403; -- Sandra Bartan
+UPDATE `creature_template` SET `npcflag`=`npcflag`|640 WHERE `entry`=32421; -- Marcella Bloom
+UPDATE `creature_template` SET `npcflag`=`npcflag`|640 WHERE `entry`=32424; -- Laire Brewgold
+UPDATE `creature_template` SET `npcflag`=`npcflag`|640 WHERE `entry`=32426; -- Coira Longrifle
+UPDATE `creature_template` SET `npcflag`=`npcflag`|640 WHERE `entry`=33026; -- Sarah Brady
+UPDATE `creature_template` SET `npcflag`=`npcflag`|642 WHERE `entry`=29049; -- Arille Azuregaze
+UPDATE `creature_template` SET `npcflag`=`npcflag`|65536 WHERE `entry`=28686; -- Caliel Brightwillow
+UPDATE `creature_template` SET `npcflag`=`npcflag`|65536 WHERE `entry`=32411; -- Afsaneh Asrar
+UPDATE `creature_template` SET `npcflag`=`npcflag`|66177 WHERE `entry`=28687; -- Amisi Azuregaze
+UPDATE `creature_template` SET `npcflag`=`npcflag`|66177 WHERE `entry`=31557; -- Uda the Beast
+UPDATE `creature_template` SET `npcflag`=`npcflag`|66177 WHERE `entry`=32413; -- Isirami Fairwind
+UPDATE `creature_template` SET `npcflag`=`npcflag`|66179 WHERE `entry`=29532; -- Ajay Green
+UPDATE `creature_template` SET `npcflag`=`npcflag`|723 WHERE `entry`=28742; -- Marcia Chase
+UPDATE `creature_template` SET `npcflag`=`npcflag`|7296 WHERE `entry`=32641; -- Drix Blackwrench
+UPDATE `creature_template` SET `npcflag`=`npcflag`|786433 WHERE `entry`=28774; -- Andrew Matthews
+UPDATE `creature_template` SET `npcflag`=`npcflag`|80 WHERE `entry`=28694; -- Alard Schmied
+UPDATE `creature_template` SET `npcflag`=`npcflag`|80 WHERE `entry`=28698; -- Jedidiah Handers
+UPDATE `creature_template` SET `npcflag`=`npcflag`|80 WHERE `entry`=29505; -- Imindril Spearsong
+UPDATE `creature_template` SET `npcflag`=`npcflag`|80 WHERE `entry`=29506; -- Orland Schaeffer
+UPDATE `creature_template` SET `npcflag`=`npcflag`|82 WHERE `entry`=28706; -- Olisarra the Kind
+UPDATE `creature_template` SET `npcflag`=`npcflag`|83 WHERE `entry`=28705; -- Katherine Lee
+UPDATE `creature_template` SET `npcflag`=`npcflag`|896 WHERE `entry`=32642; -- Mojodishu
+UPDATE `creature_template` SET `unit_class`=4 WHERE `entry`=36774; -- Silver Covenant Agent
+UPDATE `creature_template` SET `unit_class`=4 WHERE `entry`=36776; -- Sunreaver Agent
+UPDATE `creature_template` SET `unit_flags`=`unit_flags`|32832,`equipment_id`=1819 WHERE `entry`=37225; -- Uther the Lightbringer
+UPDATE `creature_template` SET `unit_flags`=`unit_flags`|33555200 WHERE `entry`=35608; -- [DND] Dalaran Argent Tournament Herald Bunny
+UPDATE `creature_template` SET `unit_flags`=`unit_flags`|33555200 WHERE `entry`=37906; -- Imprisoned Soul
+UPDATE `creature_template` SET `unit_flags`=`unit_flags`|768 WHERE `entry`=34330; -- Jones
+UPDATE `creature_template` SET `unit_flags`=`unit_flags`|768 WHERE `entry`=35826; -- Kaye Toogie
+
+-- Equipments
+DELETE FROM `creature_equip_template` WHERE `entry` IN (@Equip,@Equip+1);
+INSERT INTO `creature_equip_template` (`entry`,`equipentry1`,`equipentry2`,`equipentry3`) VALUES
+(@Equip+0,22199,0,0),
+(@Equip+1,50771,50781,0);
+
+-- Creature addon updates
+DELETE FROM `creature_template_addon` WHERE `entry` IN (15351,16128,20735,23472,25171,26043,26119,27047,27870,28160,28332,28682,28685,28686,28687,28691,28692,28693,28694,28697,28698,28699,28701,28702,28703,28704,28705,28706,28707,28708,28714,28715,28716,28718,28721,28722,28723,28725,28726,28727,28728,28742,28774,28776,28956,28958,28989,28990,28991,28992,28993,28994,28995,28997,29049,29156,29238,29254,29255,29261,29325,29476,29478,29491,29493,29494,29495,29496,29497,29499,29505,29506,29509,29510,29511,29512,29513,29514,29523,29527,29528,29529,29530,29532,29533,29534,29535,29537,29538,29547,29548,29568,29628,29636,29640,29641,29660,29665,29667,29668,29669,29670,29671,29673,29675,29702,29703,29714,29715,29716,29763,29764,29765,29766,29777,29780,29781,29782,29783,29784,29785,29802,29807,29812,30094,30095,30104,30115,30116,30117,30137,30164,30352,30490,30604,30605,30607,30659,30726,30755,30885,31032,31080,31081,31228,31236,31439,31517,31557,31580,31643,31730,32169,32170,32172,32216,32249,32265,32321,32322,32328,32329,32330,32332,32333,32334,32337,32339,32340,32342,32403,32411,32413,32416,32421,32424,32425,32426,32428,32435,32441,32450,32451,32466,32470,32509,32514,32515,32516,32606,32641,32650,32651,32652,32653,32664,32668,32669,32675,32676,32677,32678,32679,32680,32681,32683,32684,32685,32686,32687,32688,32689,32690,32691,32692,32693,32709,32711,32721,32722,32723,32724,32725,32726,32727,32728,32729,32730,32731,32732,32733,32743,32744,32745,32746,32747,32749,32751,32843,32844,33026,33027,33422,33778,33936,33937,33938,33964,34095,34252,34330,34952,34953,34984,35471,35494,35496,35497,35498,35500,35507,35608,35790,35826,36506,36669,36774,36776,36851,36856,37221,37225,37226,37582,37704,37776,37780,37849,37906,37942,38112,38113,38172,38173,38175,38176,38177,38567,40160,7549);
+INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
+(15351,0,0,1,0, NULL), -- Alliance Brigadier General
+(16128,0,0,1,0, NULL), -- Rhonin
+(20735,0,0,1,0, NULL), -- Archmage Lan'dalock
+(23472,0,0,1,0, NULL), -- World Trigger (Large AOI, Not Immune PC/NPC)
+(25171,0,0,1,0, NULL), -- Invisible Stalker (Scale x0.5)
+(26043,0,0,1,0, NULL), -- Steam Burst
+(26119,0,0,1,0, NULL), -- Phoenix Hatchling
+(27047,0,0,1,0, NULL), -- Invisible Stalker (Floating Only)
+(27870,0,0,1,0, NULL), -- Wild Flower
+(28160,0,0,257,0, NULL), -- Archmage Pentarus
+(28332,0,0,1,0, NULL), -- Generic Trigger LAB (Large AOI)
+(28682,0,0,1,0, NULL), -- Inzi Charmlight
+(28685,0,0,1,0, NULL), -- Narisa Redgold
+(28686,0,0,1,0, NULL), -- Caliel Brightwillow
+(28687,0,0,257,0, NULL), -- Amisi Azuregaze
+(28691,0,0,257,0, NULL), -- Susana Averoy
+(28692,0,0,257,0, NULL), -- "Red" Jack Findle
+(28693,0,0,257,0, NULL), -- Enchanter Nalthanis
+(28694,0,0,257,0, NULL), -- Alard Schmied
+(28697,0,0,257,0, NULL), -- Timofey Oshenko
+(28698,0,0,257,0, NULL), -- Jedidiah Handers
+(28699,0,0,257,0, NULL), -- Charles Worth
+(28701,0,0,257,0, NULL), -- Timothy Jones
+(28702,0,0,257,0, NULL), -- Professor Pallin
+(28703,0,0,257,0, NULL), -- Linzy Blackbolt
+(28704,0,0,257,0, NULL), -- Dorothy Egan
+(28705,0,0,1,0, NULL), -- Katherine Lee
+(28706,0,0,257,0, NULL), -- Olisarra the Kind
+(28707,0,0,257,0, NULL), -- Angelo Pescatore
+(28708,0,0,257,0, NULL), -- Kizi Copperclip
+(28714,0,0,257,0, NULL), -- Ildine Sorrowspear
+(28715,0,0,257,0, NULL), -- Endora Moorehead
+(28716,0,0,257,0, NULL), -- Palja Amboss
+(28718,0,0,257,0, NULL), -- Ranid Glowergold
+(28721,0,0,257,0, NULL), -- Tiffany Cartier
+(28722,0,0,257,0, NULL), -- Bryan Landers
+(28723,0,0,257,0, NULL), -- Larana Drome
+(28725,0,0,257,0, NULL), -- Patricia Egan
+(28726,0,0,257,0, NULL), -- Dominique Stefano
+(28727,0,0,257,0, NULL), -- Edward Egan
+(28728,0,0,257,0, NULL), -- Dorian Fines
+(28742,0,0,257,0, NULL), -- Marcia Chase
+(28774,0,0,257,0, NULL), -- Andrew Matthews
+(28776,0,0,257,0, NULL), -- Elizabeth Ross
+(28956,0,0,257,0, NULL), -- Warcaster Fanoraithe
+(28958,0,0,257,0, NULL), -- Jessa Weaver
+(28989,0,0,258,0, NULL), -- Aemara
+(28990,0,0,257,0, NULL), -- Anthony Durain
+(28991,0,0,257,0, NULL), -- Valaden Silverblade
+(28992,0,0,257,0, NULL), -- Valerie Langrom
+(28993,0,0,1,0, NULL), -- Aerith Primrose
+(28994,0,0,257,0, NULL), -- Abra Cadabra
+(28995,0,0,257,0, NULL), -- Paldesse
+(28997,0,0,257,0, NULL), -- Griselda Hunderland
+(29049,0,0,1,0, NULL), -- Arille Azuregaze
+(29156,0,0,257,0, NULL), -- Archmage Celindra
+(29238,0,0,1,0, NULL), -- Scourge Haunt
+(29254,0,0,1,0, NULL), -- Silver Covenant Guardian Mage
+(29255,0,0,1,0, NULL), -- Sunreaver Guardian Mage
+(29261,0,0,2,0, NULL), -- Windle Sparkshine
+(29325,0,0,1,379, NULL), -- Torgo the Younger
+(29476,0,0,258,0, NULL), -- Dagna Flintlock
+(29478,0,0,257,0, NULL), -- Jepetto Joybuzz
+(29491,0,0,257,0, NULL), -- Karandonna
+(29493,0,0,257,0, NULL), -- Jarold Puller
+(29494,0,0,257,0, NULL), -- Shen Kang Cheng
+(29495,0,0,257,0, NULL), -- Norvin Alderman
+(29496,0,0,257,0, NULL), -- Kerta the Bold
+(29497,0,0,257,69, NULL), -- Walther Whiteford
+(29499,0,0,257,0, NULL), -- Bartram Haller
+(29505,0,0,257,233, NULL), -- Imindril Spearsong
+(29506,0,0,257,0, NULL), -- Orland Schaeffer
+(29509,0,0,257,0, NULL), -- Namha Moonwater
+(29510,0,0,257,0, NULL), -- Linna Bruder
+(29511,0,0,257,0, NULL), -- Lalla Brightweave
+(29512,0,0,257,69, NULL), -- Ainderu Summerleaf
+(29513,0,0,257,0, NULL), -- Didi the Wrench
+(29514,0,0,257,0, NULL), -- Findle Whistlesteam
+(29523,0,0,257,0, NULL), -- Bragund Brightlink
+(29527,0,0,257,0, NULL), -- Orton Bennet
+(29528,0,0,257,0, NULL), -- Debbi Moore
+(29529,0,0,257,0, NULL), -- Ninsianna
+(29530,0,0,257,0, NULL), -- Binzik Goldbook
+(29532,0,0,257,0, NULL), -- Ajay Green
+(29533,0,0,1,0, NULL), -- Schembari "Uncle Sal" Shearbolt
+(29534,0,0,1,0, NULL), -- "Baroness" Llana
+(29535,0,0,257,0, NULL), -- Alchemist Cinesra
+(29537,0,0,257,0, NULL), -- Darahir
+(29538,0,0,257,0, NULL), -- Hexil Garrot
+(29547,0,0,257,0, NULL), -- Applebough
+(29548,0,0,257,0, NULL), -- Aimee
+(29568,0,0,1,0, NULL), -- "Techs" Rickard Rustbolt
+(29628,0,0,257,0, NULL), -- Angelique Butler
+(29636,0,0,257,0, NULL), -- Hagatha Moorehead
+(29640,0,0,257,0, NULL), -- Josie Birch
+(29641,0,0,257,0, NULL), -- Theresa Wolf
+(29660,0,0,1,0, NULL), -- Grand Marauder Sai
+(29665,0,0,1,0, NULL), -- Pazik "The Pick" Prylock
+(29667,0,0,1,0, NULL), -- Warsong Gulch Portal
+(29668,0,0,1,0, NULL), -- Arathi Basin Portal
+(29669,0,0,1,0, NULL), -- Alterac Valley Portal
+(29670,0,0,1,0, NULL), -- Eye of the Storm Portal
+(29671,0,0,1,0, NULL), -- Strand of the Ancients Portal
+(29673,0,0,1,0, NULL), -- Arathi Basin Portal
+(29675,0,0,1,0, NULL), -- Eye of the Storm Portal
+(29702,0,0,257,0, NULL), -- Chameli Banaphash
+(29703,0,0,257,0, NULL), -- Sheddle Glossgleam
+(29714,0,0,1,0, NULL), -- Lucian Trias
+(29715,0,0,257,0, NULL), -- Fialla Sweetberry
+(29716,0,0,257,0, NULL), -- Clockwork Assistant
+(29763,0,0,1,0, NULL), -- Cosmetic Totem Alliance Air
+(29764,0,0,1,0, NULL), -- Cosmetic Totem Alliance Earth
+(29765,0,0,1,0, NULL), -- Cosmetic Totem Alliance Fire
+(29766,0,0,1,0, NULL), -- Cosmetic Totem Alliance Water
+(29777,0,0,1,0, NULL), -- Cosmetic Mechanical Gorilla
+(29780,0,0,1,0, NULL), -- Cosmetic Mechanical Chicken
+(29781,0,0,1,0, NULL), -- Cosmetic Mechanical Squirrel
+(29782,0,0,1,0, NULL), -- Cosmetic Mechanical Sheep
+(29783,0,0,1,0, NULL), -- Cosmetic Clockwork Robot
+(29784,0,0,1,0, NULL), -- Cosmetic Clockwork Robot (Blue)
+(29785,0,0,1,0, NULL), -- Cosmetic Clockwork Robot (Red)
+(29802,0,0,1,0, NULL), -- Cosmetic Toy Plane
+(29807,0,0,1,0, NULL), -- [DND] Dalaran Toy Store Plane String Hook
+(29812,0,0,1,0, NULL), -- [DND] Dalaran Toy Store Plane String Bunny
+(30094,0,0,1,0, NULL), -- Dalaran Sewer Rat
+(30095,0,0,1,0, NULL), -- Dalaran Sewer Turtle
+(30104,0,1,257,0, NULL), -- Adamman the Trader
+(30115,0,0,2,0, NULL), -- Vereesa Windrunner
+(30116,0,0,1,0, NULL), -- Archmage Aethas Sunreaver
+(30117,0,0,1,0, NULL), -- Archmage Modera
+(30137,0,0,1,0, NULL), -- Shifty Vickers
+(30164,0,0,133121,0, NULL), -- Cavedweller Worg
+(30352,0,0,256,0, NULL), -- Skybreaker Marine
+(30490,0,0,1,0, NULL), -- Rin Duoctane
+(30604,0,0,257,0, NULL), -- Teller Almeida
+(30605,0,0,257,0, NULL), -- Teller Gee
+(30607,0,0,257,0, NULL), -- Teller Plushner
+(30659,0,0,1,0, NULL), -- Violet Hold Guard
+(30726,0,0,257,0, NULL), -- Archivist Betha
+(30755,0,0,256,0, NULL), -- Kor'kron Reaver
+(30885,0,0,1,0, NULL), -- Blazik Fireclaw
+(31032,0,0,1,0, NULL), -- Derek Odds
+(31080,0,0,1,0, NULL), -- Warden Alturas
+(31081,0,0,1,0, NULL), -- Officer Van Rossem
+(31228,0,0,1,0, NULL), -- Grove Walker
+(31236,0,0,1,0, NULL), -- Dappled Stag
+(31439,0,0,1,0, NULL), -- Archmage Timear
+(31517,0,0,1,0, NULL), -- Dalaran Fountain Invis Stalker
+(31557,0,0,1,0, NULL), -- Uda the Beast
+(31580,0,0,1,0, NULL), -- Arcanist Ivrenne
+(31643,0,0,1,0, NULL), -- Dalaran Well Teleport Bunny
+(31730,0,0,1,0, NULL), -- Cosmetic Frog
+(32169,0,0,1,0, NULL), -- Arcanist Braedin
+(32170,0,0,1,0, NULL), -- Magister Surdiel
+(32172,0,0,257,0, NULL), -- Harold Winston
+(32216,0,0,257,0, NULL), -- Mei Francis
+(32249,0,0,1,0, NULL), -- Worg Pup
+(32265,0,50331648,1,0, NULL), -- Northrend Daily Dungeon Image Bunny
+(32321,0,0,1,0, NULL), -- Green Warrior
+(32322,0,0,1,0, NULL), -- Gold Warrior
+(32328,0,0,1,0, NULL), -- [DND] Dalaran Sewer Arena - Controller - Death
+(32329,0,0,1,0, NULL), -- Kanika Goldwell
+(32330,0,0,1,0, NULL), -- Minzi the Minx
+(32332,0,0,1,0, NULL), -- Ramik Slamwrench
+(32333,0,0,1,0, NULL), -- "Dapper" Danik Blackshaft
+(32334,0,0,1,0, NULL), -- Nixi Fireclaw
+(32337,0,0,257,0, NULL), -- Christi Stockton
+(32339,0,0,1,0, NULL), -- [DND] Dalaran Sewer Arena - Controller
+(32340,0,0,1,0, NULL), -- Gold Shaman
+(32342,0,0,1,0, NULL), -- Green Paladin
+(32403,0,0,1,0, NULL), -- Sandra Bartan
+(32411,0,0,257,0, NULL), -- Afsaneh Asrar
+(32413,0,0,1,0, NULL), -- Isirami Fairwind
+(32416,0,0,1,0, NULL), -- Stefen Cotter
+(32421,0,0,1,0, NULL), -- Marcella Bloom
+(32424,0,0,1,0, NULL), -- Laire Brewgold
+(32425,0,0,1,0, NULL), -- Galkara the Assassin
+(32426,0,0,1,0, NULL), -- Coira Longrifle
+(32428,0,0,1,0, NULL), -- Underbelly Rat
+(32435,0,0,1,0, NULL), -- Vern
+(32441,0,0,1,0, NULL), -- Underbelly Croc
+(32450,0,3,1,0, NULL), -- Badluck
+(32451,0,0,257,0, NULL), -- Dalaran Citizen
+(32466,0,0,1,0, NULL), -- Monstrous Underbelly Rat
+(32470,0,0,1,0, NULL), -- Sewer Frog
+(32509,0,0,257,0, NULL), -- Brammold Deepmine
+(32514,0,0,257,0, NULL), -- Vanessa Sellers
+(32515,0,0,257,0, NULL), -- Braeg Stoutbeard
+(32516,0,3,257,0, NULL), -- Washed-Up Mage
+(32606,0,0,1,0, NULL), -- [DND] Cosmetic Book
+(32641,0,0,1,0, NULL), -- Drix Blackwrench
+(32650,0,3,1,0, NULL), -- Wounded Dalaran Protector
+(32651,0,7,1,0, NULL), -- Wounded Dalaran Shield Guard
+(32652,0,3,1,0, NULL), -- Wounded Dalaran Watcher
+(32653,0,7,1,0, NULL), -- Wounded Dalaran Serpent
+(32664,0,0,1,0, NULL), -- Segacedi
+(32668,0,0,257,0, NULL), -- Emi
+(32669,0,0,257,0, NULL), -- Colin
+(32675,0,0,257,0, NULL), -- Babagahnoosh the Grumpy
+(32676,0,0,257,0, NULL), -- Grindle Firespark
+(32677,0,0,257,0, NULL), -- Whirt the All-Knowing
+(32678,0,0,257,0, NULL), -- Emeline Fizzlefry
+(32679,0,0,257,0, NULL), -- Darthalia Ebonscorch
+(32680,0,0,257,0, NULL), -- Fabioso the Fabulous
+(32681,0,0,257,0, NULL), -- The Magnificent Merleaux
+(32683,0,0,257,0, NULL), -- Grezla the Hag
+(32684,0,0,257,0, NULL), -- Mona Everspring
+(32685,0,0,257,0, NULL), -- Kitz Proudbreeze
+(32686,0,0,257,0, NULL), -- Crafticus Mindbender
+(32687,0,0,257,0, NULL), -- Linda Ann Kastinglow
+(32688,0,0,257,0, NULL), -- Archmage Tenaj
+(32689,0,0,257,0, NULL), -- Adorean Lew
+(32690,0,0,257,0, NULL), -- Bitty Frostflinger
+(32691,0,0,257,0, NULL), -- Magus Fansy Goodbringer
+(32692,0,0,257,0, NULL), -- Arcanist Alec
+(32693,0,0,257,0, NULL), -- Sabriana Sorrowgaze
+(32709,0,0,1,0, NULL), -- Hunaka Greenhoof
+(32711,0,0,1,0, NULL), -- Warp-Huntress Kula
+(32721,0,0,1,0, NULL), -- Felcaster Virim
+(32722,0,0,1,0, NULL), -- Warmage Lukems
+(32723,0,0,257,0, NULL), -- Warmage Kath'leen
+(32724,0,0,1,0, NULL), -- Warmage Mumplina
+(32725,0,0,1,0, NULL), -- Warmage Silva
+(32726,0,0,257,0, NULL), -- The Chooch
+(32727,0,0,257,0, NULL), -- Natalie Tootiblare
+(32728,0,0,257,0, NULL), -- Illusionist Karina
+(32729,0,0,257,0, NULL), -- Lofwyr Le'Fleur
+(32730,0,0,257,0, NULL), -- Goldlilly Gleamingfell
+(32731,0,0,257,0, NULL), -- Metopious Loreseeker
+(32732,0,0,257,0, NULL), -- Dorfus Alphamage
+(32733,0,0,257,0, NULL), -- Joboba Mezbreaker
+(32743,0,1,1,0, NULL), -- Willard Blauvelt
+(32744,0,0,1,0, NULL), -- Bakor the Gangly
+(32745,0,0,1,0, NULL), -- Amera Sky
+(32746,0,0,1,0, NULL), -- Geffon the Unruly
+(32747,0,0,1,0, NULL), -- Mendez Nightshadow
+(32749,0,1,1,0, NULL), -- Tuff Gorehoof
+(32751,0,0,1,0, NULL), -- Backbiter
+(32843,0,0,1,0, NULL), -- Tabea
+(32844,0,0,1,0, NULL), -- Apollo
+(33026,0,0,1,0, NULL), -- Sarah Brady
+(33027,0,0,257,0, NULL), -- Jessica Sellers
+(33422,0,0,1,0, NULL), -- Unbound Seer
+(33778,0,1,1,0, NULL), -- Tournament Hippogryph
+(33936,0,0,1,0, NULL), -- Nargle Lashcord
+(33937,0,0,1,0, NULL), -- Xazi Smolderpipe
+(33938,0,0,1,0, NULL), -- Zom Bocom
+(33964,0,0,1,0, NULL), -- Arcanist Firael
+(34095,0,0,1,0, NULL), -- Trapjaw Rix
+(34252,0,0,257,0, NULL), -- Dubin Clay
+(34330,0,3,1,0, NULL), -- Jones
+(34952,0,0,1,0, NULL), -- Isle of Conquest Portal
+(34953,0,0,1,0, NULL), -- Isle of Conquest Portal
+(34984,0,0,1,0, NULL), -- World Trigger (Not Floating)
+(35471,0,0,1,0, NULL), -- Sorn Proudmane
+(35494,0,0,1,0, NULL), -- Arcanist Miluria
+(35496,0,0,257,0, NULL), -- Rueben Lauren
+(35497,0,0,257,0, NULL), -- Rafael Langrom
+(35498,0,0,257,0, NULL), -- Horace Hunderland
+(35500,0,0,257,0, NULL), -- Matilda Brightlink
+(35507,0,0,1,0, NULL), -- Enchanter Isian
+(35608,0,0,1,0, NULL), -- [DND] Dalaran Argent Tournament Herald Bunny
+(35790,0,0,257,0, NULL), -- Usuri Brightcoin
+(35826,0,1,1,0, NULL), -- Kaye Toogie
+(36506,0,0,1,0, NULL), -- Daros Moonlance
+(36669,0,0,1,0, NULL), -- Arcanist Tybalin
+(36774,0,0,1,0, NULL), -- Silver Covenant Agent
+(36776,0,0,1,0, NULL), -- Sunreaver Agent
+(36851,0,0,1,0, NULL), -- Aquanos
+(36856,0,0,1,0, NULL), -- Shandy Glossgleam
+(37221,0,0,1,0, NULL), -- Lady Jaina Proudmoore
+(37225,0,0,0,0, NULL), -- Uther the Lightbringer
+(37226,0,0,1,0, NULL), -- The Lich King
+(37582,0,0,1,0, NULL), -- Archmage Koreln
+(37704,0,0,1,0, NULL), -- Frostmourne Altar Bunny (Quel'Delar)
+(37776,0,0,1,0, NULL), -- Apprentice Nelphi
+(37780,0,0,2,0, NULL), -- Dark Ranger Vorel
+(37849,0,50331648,0,0, NULL), -- Sartharion Image
+(37906,0,50331648,1,0, NULL), -- Imprisoned Soul
+(37942,0,0,1,0, NULL), -- Arcanist Uovril
+(38112,0,0,1,0, NULL), -- Falric
+(38113,0,0,1,0, NULL), -- Marwyn
+(38172,0,0,1,0, NULL), -- Phantom Mage
+(38173,0,0,1,0, NULL), -- Spectral Footman
+(38175,0,0,1,0, NULL), -- Ghostly Priest
+(38176,0,0,1,0, NULL), -- Tortured Rifleman
+(38177,0,0,1,0, NULL), -- Shadowy Mercenary
+(38567,0,0,1,0, NULL), -- Phantom Hallucination
+(40160,31837,0,257,0, NULL), -- Frozo the Renowned
+(7549,0,0,1,0, NULL); -- Tree Frog
+
+-- Model updates
+UPDATE `creature_model_info` SET `bounding_radius`=0,`combat_reach`=0,`gender`=2 WHERE `modelid`=22471; -- Tournament Hippogryph
+UPDATE `creature_model_info` SET `bounding_radius`=0,`combat_reach`=0,`gender`=2 WHERE `modelid`=26484; -- Alterac Valley Portal
+UPDATE `creature_model_info` SET `bounding_radius`=0,`combat_reach`=0,`gender`=2 WHERE `modelid`=26495; -- Arathi Basin Portal
+UPDATE `creature_model_info` SET `bounding_radius`=0,`combat_reach`=0,`gender`=2 WHERE `modelid`=26496; -- Arathi Basin Portal
+UPDATE `creature_model_info` SET `bounding_radius`=0,`combat_reach`=0,`gender`=2 WHERE `modelid`=26499; -- Eye of the Storm Portal
+UPDATE `creature_model_info` SET `bounding_radius`=0,`combat_reach`=0,`gender`=2 WHERE `modelid`=26501; -- Eye of the Storm Portal
+UPDATE `creature_model_info` SET `bounding_radius`=0,`combat_reach`=0,`gender`=2 WHERE `modelid`=26502; -- Warsong Gulch Portal
+UPDATE `creature_model_info` SET `bounding_radius`=0,`combat_reach`=0,`gender`=2 WHERE `modelid`=26504; -- Strand of the Ancients Portal
+UPDATE `creature_model_info` SET `bounding_radius`=0,`combat_reach`=0,`gender`=2 WHERE `modelid`=29743; -- Isle of Conquest Portal
+UPDATE `creature_model_info` SET `bounding_radius`=0,`combat_reach`=0,`gender`=2 WHERE `modelid`=29744; -- Isle of Conquest Portal
+UPDATE `creature_model_info` SET `bounding_radius`=0,`combat_reach`=1,`gender`=0 WHERE `modelid`=251; -- Colin
+UPDATE `creature_model_info` SET `bounding_radius`=0,`combat_reach`=1,`gender`=1 WHERE `modelid`=21270; -- Dalaran Visitor
+UPDATE `creature_model_info` SET `bounding_radius`=0,`combat_reach`=1,`gender`=1 WHERE `modelid`=80; -- Emi
+UPDATE `creature_model_info` SET `bounding_radius`=0,`combat_reach`=1,`gender`=2 WHERE `modelid`=2176; -- Cosmetic Rat
+UPDATE `creature_model_info` SET `bounding_radius`=0,`combat_reach`=1,`gender`=2 WHERE `modelid`=25870; -- Mekgineer's Chopper
+UPDATE `creature_model_info` SET `bounding_radius`=0,`combat_reach`=2,`gender`=2 WHERE `modelid`=26759; -- Dalaran Sewer Rat
+UPDATE `creature_model_info` SET `bounding_radius`=0,`combat_reach`=4,`gender`=2 WHERE `modelid`=27243; -- Wooly Mammoth
+UPDATE `creature_model_info` SET `bounding_radius`=0,`combat_reach`=4,`gender`=2 WHERE `modelid`=27972; -- Monstrous Underbelly Rat
+UPDATE `creature_model_info` SET `bounding_radius`=0.00235,`combat_reach`=0,`gender`=2 WHERE `modelid`=7804; -- [DND] Dalaran Argent Tournament Herald Bunny
+UPDATE `creature_model_info` SET `bounding_radius`=0.03,`combat_reach`=0,`gender`=2 WHERE `modelid`=26557; -- Cosmetic Toy Plane
+UPDATE `creature_model_info` SET `bounding_radius`=0.0937,`combat_reach`=0,`gender`=2 WHERE `modelid`=26530; -- Cosmetic Clockwork Robot (Blue)
+UPDATE `creature_model_info` SET `bounding_radius`=0.0937,`combat_reach`=0,`gender`=2 WHERE `modelid`=26531; -- Cosmetic Clockwork Robot (Red)
+UPDATE `creature_model_info` SET `bounding_radius`=0.0937,`combat_reach`=0,`gender`=2 WHERE `modelid`=26547; -- Cosmetic Clockwork Robot
+UPDATE `creature_model_info` SET `bounding_radius`=0.1,`combat_reach`=0,`gender`=2 WHERE `modelid`=24897; -- Wild Flower
+UPDATE `creature_model_info` SET `bounding_radius`=0.1,`combat_reach`=0,`gender`=2 WHERE `modelid`=24898; -- Wild Flower
+UPDATE `creature_model_info` SET `bounding_radius`=0.12,`combat_reach`=0,`gender`=2 WHERE `modelid`=24895; -- Wild Flower
+UPDATE `creature_model_info` SET `bounding_radius`=0.125,`combat_reach`=0,`gender`=2 WHERE `modelid`=17188; -- Invisible Stalker (Scale x0.5)
+UPDATE `creature_model_info` SET `bounding_radius`=0.125,`combat_reach`=0,`gender`=2 WHERE `modelid`=17200; -- Northrend Daily Dungeon Image Bunny
+UPDATE `creature_model_info` SET `bounding_radius`=0.15,`combat_reach`=0,`gender`=2 WHERE `modelid`=23574; -- Phoenix Hatchling
+UPDATE `creature_model_info` SET `bounding_radius`=0.175,`combat_reach`=0,`gender`=2 WHERE `modelid`=23501; -- Steam Burst
+UPDATE `creature_model_info` SET `bounding_radius`=0.18,`combat_reach`=1,`gender`=2 WHERE `modelid`=30799; -- Sartharion Image
+UPDATE `creature_model_info` SET `bounding_radius`=0.186,`combat_reach`=0,`gender`=2 WHERE `modelid`=28212; -- Backbiter
+UPDATE `creature_model_info` SET `bounding_radius`=0.187,`combat_reach`=0,`gender`=2 WHERE `modelid`=1160; -- Spider
+UPDATE `creature_model_info` SET `bounding_radius`=0.187,`combat_reach`=0,`gender`=2 WHERE `modelid`=2536; -- Spider
+UPDATE `creature_model_info` SET `bounding_radius`=0.2,`combat_reach`=0,`gender`=2 WHERE `modelid`=26517; -- Cosmetic Totem Alliance Air
+UPDATE `creature_model_info` SET `bounding_radius`=0.2,`combat_reach`=0,`gender`=2 WHERE `modelid`=26518; -- Cosmetic Totem Alliance Earth
+UPDATE `creature_model_info` SET `bounding_radius`=0.2,`combat_reach`=0,`gender`=2 WHERE `modelid`=26519; -- Cosmetic Totem Alliance Fire
+UPDATE `creature_model_info` SET `bounding_radius`=0.2,`combat_reach`=0,`gender`=2 WHERE `modelid`=26521; -- Cosmetic Totem Alliance Water
+UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=15253; -- League of Arathor Emissary
+UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=25605; -- Amisi Azuregaze
+UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=25608; -- Susana Averoy
+UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=25620; -- Dorothy Egan
+UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=25621; -- Katherine Lee
+UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=25636; -- Endora Moorehead
+UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=25637; -- Palja Amboss
+UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=25645; -- Tiffany Cartier
+UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=25647; -- Larana Drome
+UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=25648; -- Patricia Egan
+UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=25649; -- Dominique Stefano
+UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=25655; -- Marcia Chase
+UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=25674; -- Elizabeth Ross
+UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=25807; -- Jessa Weaver
+UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=25878; -- Valerie Langrom
+UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=25880; -- Abra Cadabra
+UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=25881; -- Griselda Hunderland
+UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=25983; -- Aerith Primrose
+UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=26311; -- Kerta the Bold
+UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=26377; -- Linna Bruder
+UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=26390; -- Angelique Butler
+UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=26396; -- Debbi Moore
+UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=26397; -- Hagatha Moorehead
+UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=26398; -- Josie Birch
+UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=26414; -- Grand Marauder Sai
+UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=26438; -- Chameli Banaphash
+UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=26440; -- Christi Stockton
+UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=27287; -- Archivist Betha
+UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=27782; -- Theresa Wolf
+UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=27822; -- Mei Francis
+UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=27944; -- Warmage Mumplina
+UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=27952; -- Sandra Bartan
+UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=27954; -- Afsaneh Asrar
+UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=27962; -- Marcella Bloom
+UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=27999; -- Vanessa Sellers
+UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=28125; -- Wounded Dalaran Watcher
+UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=28150; -- Grezla the Hag
+UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=28155; -- Linda Ann Kastinglow
+UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=28166; -- Illusionist Karina
+UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=28202; -- Amera Sky
+UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=28317; -- Tabea
+UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=28433; -- Jessica Sellers
+UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=30764; -- Apprentice Nelphi
+UPDATE `creature_model_info` SET `bounding_radius`=0.2288,`combat_reach`=1,`gender`=1 WHERE `modelid`=24916; -- Warmage Kath'leen
+UPDATE `creature_model_info` SET `bounding_radius`=0.2288,`combat_reach`=1,`gender`=1 WHERE `modelid`=25947; -- Archmage Celindra
+UPDATE `creature_model_info` SET `bounding_radius`=0.236,`combat_reach`=1,`gender`=1 WHERE `modelid`=27333; -- Kor'kron Reaver
+UPDATE `creature_model_info` SET `bounding_radius`=0.236,`combat_reach`=1,`gender`=1 WHERE `modelid`=28185; -- Warp-Huntress Kula
+UPDATE `creature_model_info` SET `bounding_radius`=0.236,`combat_reach`=1,`gender`=1 WHERE `modelid`=28208; -- Galkara the Assassin
+UPDATE `creature_model_info` SET `bounding_radius`=0.2429,`combat_reach`=1,`gender`=2 WHERE `modelid`=850; -- Felhunter
+UPDATE `creature_model_info` SET `bounding_radius`=0.25,`combat_reach`=0,`gender`=2 WHERE `modelid`=16259; -- Dalaran Sewer Turtle
+UPDATE `creature_model_info` SET `bounding_radius`=0.25,`combat_reach`=0,`gender`=2 WHERE `modelid`=5448; -- Cosmetic Cat Set 2/2
+UPDATE `creature_model_info` SET `bounding_radius`=0.25,`combat_reach`=0,`gender`=2 WHERE `modelid`=5554; -- Jones
+UPDATE `creature_model_info` SET `bounding_radius`=0.25,`combat_reach`=0,`gender`=2 WHERE `modelid`=5556; -- Badluck
+UPDATE `creature_model_info` SET `bounding_radius`=0.25,`combat_reach`=0,`gender`=2 WHERE `modelid`=5966; -- Wounded Dalaran Serpent
+UPDATE `creature_model_info` SET `bounding_radius`=0.26,`combat_reach`=1,`gender`=1 WHERE `modelid`=26771; -- Archmage Modera
+UPDATE `creature_model_info` SET `bounding_radius`=0.2625,`combat_reach`=0,`gender`=2 WHERE `modelid`=26524; -- Cosmetic Mechanical Gorilla
+UPDATE `creature_model_info` SET `bounding_radius`=0.263347,`combat_reach`=0,`gender`=2 WHERE `modelid`=16885; -- Ravager Specimen
+UPDATE `creature_model_info` SET `bounding_radius`=0.275,`combat_reach`=0,`gender`=2 WHERE `modelid`=28318; -- Apollo
+UPDATE `creature_model_info` SET `bounding_radius`=0.2912,`combat_reach`=2,`gender`=1 WHERE `modelid`=30977; -- Phantom Hallucination
+UPDATE `creature_model_info` SET `bounding_radius`=0.2912,`combat_reach`=2,`gender`=1 WHERE `modelid`=30977; -- Phantom Mage
+UPDATE `creature_model_info` SET `bounding_radius`=0.3,`combat_reach`=0,`gender`=2 WHERE `modelid`=27720; -- Cosmetic Worg Pup
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=23337; -- Warmage Silva
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=24607; -- Sebastian Bower
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=25166; -- Archmage Pentarus
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=25609; -- "Red" Jack Findle
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=25611; -- Alard Schmied
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=25613; -- Timofey Oshenko
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=25614; -- Jedidiah Handers
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=25615; -- Charles Worth
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=25623; -- Angelo Pescatore
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=25646; -- Bryan Landers
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=25650; -- Edward Egan
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=25651; -- Dorian Fines
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=25673; -- Andrew Matthews
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=25876; -- Anthony Durain
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=26075; -- Timothy Jones
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=26138; -- Torgo the Younger
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=26307; -- Jarold Puller
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=26309; -- Shen Kang Cheng
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=26310; -- Norvin Alderman
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=26312; -- Walther Whiteford
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=26313; -- Bartram Haller
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=26338; -- Orland Schaeffer
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=26362; -- Schembari "Uncle Sal" Shearbolt
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=26372; -- Binzik Goldbook
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=26373; -- Ajay Green
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=26391; -- "Techs" Rickard Rustbolt
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=26395; -- Orton Bennet
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=26417; -- Pazik "The Pick" Prylock
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=26444; -- Hexil Garrot
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=26445; -- Alchemist Cinesra
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=26463; -- Nargle Lashcord
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=26465; -- Zom Bocom
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=26766; -- Adamman the Trader
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=26779; -- Shifty Vickers
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=26997; -- Skybreaker Marine
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=26998; -- Skybreaker Marine
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=27068; -- Rin Duoctane
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=27157; -- Teller Almeida
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=27158; -- Teller Gee
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=27160; -- Teller Plushner
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=27334; -- Kor'kron Reaver
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=27398; -- Blazik Fireclaw
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=27449; -- Derek Odds
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=27799; -- Harold Winston
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=27910; -- Ramik Slamwrench
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=27911; -- "Dapper" Danik Blackshaft
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=27915; -- Lucian Trias
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=27958; -- Stefen Cotter
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=28006; -- Washed-Up Mage
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=28120; -- Drix Blackwrench
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=28123; -- Wounded Dalaran Protector
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=28124; -- Wounded Dalaran Shield Guard
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=28145; -- Whirt the All-Knowing
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=28149; -- The Magnificent Merleaux
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=28154; -- Crafticus Mindbender
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=28159; -- Adorean Lew
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=28161; -- Magus Fansy Goodbringer
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=28164; -- The Chooch
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=28203; -- Geffon the Unruly
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=29833; -- Horace Hunderland
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=29835; -- Rafael Langrom
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=29836; -- Rueben Lauren
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=30685; -- Archmage Koreln
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=1 WHERE `modelid`=25955; -- Kizi Copperclip
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=1 WHERE `modelid`=26335; -- Namha Moonwater
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=1 WHERE `modelid`=26347; -- Ninsianna
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=1 WHERE `modelid`=26375; -- Didi the Wrench
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=1 WHERE `modelid`=26386; -- "Baroness" Llana
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=1 WHERE `modelid`=26464; -- Xazi Smolderpipe
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=1 WHERE `modelid`=27908; -- Kanika Goldwell
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=1 WHERE `modelid`=27909; -- Minzi the Minx
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=1 WHERE `modelid`=27912; -- Nixi Fireclaw
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=1 WHERE `modelid`=29921; -- Usuri Brightcoin
+UPDATE `creature_model_info` SET `bounding_radius`=0.3068,`combat_reach`=1,`gender`=1 WHERE `modelid`=27616; -- Uda the Beast
+UPDATE `creature_model_info` SET `bounding_radius`=0.3366,`combat_reach`=1,`gender`=0 WHERE `modelid`=27215; -- Violet Hold Guard
+UPDATE `creature_model_info` SET `bounding_radius`=0.3366,`combat_reach`=1,`gender`=0 WHERE `modelid`=27216; -- Violet Hold Guard
+UPDATE `creature_model_info` SET `bounding_radius`=0.3366,`combat_reach`=1,`gender`=0 WHERE `modelid`=27217; -- Violet Hold Guard
+UPDATE `creature_model_info` SET `bounding_radius`=0.3366,`combat_reach`=1,`gender`=0 WHERE `modelid`=29076; -- Trapjaw Rix
+UPDATE `creature_model_info` SET `bounding_radius`=0.347,`combat_reach`=1,`gender`=0 WHERE `modelid`=21273; -- Dalaran Visitor
+UPDATE `creature_model_info` SET `bounding_radius`=0.347,`combat_reach`=1,`gender`=0 WHERE `modelid`=25644; -- Ranid Glowergold
+UPDATE `creature_model_info` SET `bounding_radius`=0.347,`combat_reach`=1,`gender`=0 WHERE `modelid`=26321; -- Bragund Brightlink
+UPDATE `creature_model_info` SET `bounding_radius`=0.347,`combat_reach`=1,`gender`=0 WHERE `modelid`=27332; -- Skybreaker Marine
+UPDATE `creature_model_info` SET `bounding_radius`=0.347,`combat_reach`=1,`gender`=0 WHERE `modelid`=27998; -- Brammold Deepmine
+UPDATE `creature_model_info` SET `bounding_radius`=0.347,`combat_reach`=1,`gender`=0 WHERE `modelid`=28000; -- Braeg Stoutbeard
+UPDATE `creature_model_info` SET `bounding_radius`=0.347,`combat_reach`=1,`gender`=0 WHERE `modelid`=28170; -- Dorfus Alphamage
+UPDATE `creature_model_info` SET `bounding_radius`=0.347,`combat_reach`=1,`gender`=0 WHERE `modelid`=29145; -- Dubin Clay
+UPDATE `creature_model_info` SET `bounding_radius`=0.347,`combat_reach`=1,`gender`=1 WHERE `modelid`=26299; -- Dagna Flintlock
+UPDATE `creature_model_info` SET `bounding_radius`=0.347,`combat_reach`=1,`gender`=1 WHERE `modelid`=27963; -- Laire Brewgold
+UPDATE `creature_model_info` SET `bounding_radius`=0.347,`combat_reach`=1,`gender`=1 WHERE `modelid`=27965; -- Coira Longrifle
+UPDATE `creature_model_info` SET `bounding_radius`=0.347,`combat_reach`=1,`gender`=1 WHERE `modelid`=29834; -- Matilda Brightlink
+UPDATE `creature_model_info` SET `bounding_radius`=0.3519,`combat_reach`=1,`gender`=0 WHERE `modelid`=25618; -- Professor Pallin
+UPDATE `creature_model_info` SET `bounding_radius`=0.3519,`combat_reach`=1,`gender`=0 WHERE `modelid`=26078; -- Windle Sparkshine
+UPDATE `creature_model_info` SET `bounding_radius`=0.3519,`combat_reach`=1,`gender`=0 WHERE `modelid`=26300; -- Jepetto Joybuzz
+UPDATE `creature_model_info` SET `bounding_radius`=0.3519,`combat_reach`=1,`gender`=0 WHERE `modelid`=26374; -- Findle Whistlesteam
+UPDATE `creature_model_info` SET `bounding_radius`=0.3519,`combat_reach`=1,`gender`=0 WHERE `modelid`=26437; -- Sheddle Glossgleam
+UPDATE `creature_model_info` SET `bounding_radius`=0.3519,`combat_reach`=1,`gender`=0 WHERE `modelid`=27465; -- Warden Alturas
+UPDATE `creature_model_info` SET `bounding_radius`=0.3519,`combat_reach`=1,`gender`=0 WHERE `modelid`=28143; -- Babagahnoosh the Grumpy
+UPDATE `creature_model_info` SET `bounding_radius`=0.3519,`combat_reach`=1,`gender`=0 WHERE `modelid`=28144; -- Grindle Firespark
+UPDATE `creature_model_info` SET `bounding_radius`=0.3519,`combat_reach`=1,`gender`=0 WHERE `modelid`=28162; -- Arcanist Alec
+UPDATE `creature_model_info` SET `bounding_radius`=0.3519,`combat_reach`=1,`gender`=0 WHERE `modelid`=28167; -- Lofwyr Le'Fleur
+UPDATE `creature_model_info` SET `bounding_radius`=0.3519,`combat_reach`=1,`gender`=0 WHERE `modelid`=28199; -- Bakor the Gangly
+UPDATE `creature_model_info` SET `bounding_radius`=0.3519,`combat_reach`=1,`gender`=0 WHERE `modelid`=30358; -- Shandy Glossgleam
+UPDATE `creature_model_info` SET `bounding_radius`=0.3519,`combat_reach`=1,`gender`=1 WHERE `modelid`=25602; -- Inzi Charmlight
+UPDATE `creature_model_info` SET `bounding_radius`=0.3519,`combat_reach`=1,`gender`=1 WHERE `modelid`=25619; -- Linzy Blackbolt
+UPDATE `creature_model_info` SET `bounding_radius`=0.3519,`combat_reach`=1,`gender`=1 WHERE `modelid`=26378; -- Lalla Brightweave
+UPDATE `creature_model_info` SET `bounding_radius`=0.3519,`combat_reach`=1,`gender`=1 WHERE `modelid`=28146; -- Emeline Fizzlefry
+UPDATE `creature_model_info` SET `bounding_radius`=0.3519,`combat_reach`=1,`gender`=1 WHERE `modelid`=28160; -- Bitty Frostflinger
+UPDATE `creature_model_info` SET `bounding_radius`=0.3519,`combat_reach`=1,`gender`=1 WHERE `modelid`=28165; -- Natalie Tootiblare
+UPDATE `creature_model_info` SET `bounding_radius`=0.3519,`combat_reach`=1,`gender`=1 WHERE `modelid`=28171; -- Joboba Mezbreaker
+UPDATE `creature_model_info` SET `bounding_radius`=0.3519,`combat_reach`=1,`gender`=1 WHERE `modelid`=28432; -- Sarah Brady
+UPDATE `creature_model_info` SET `bounding_radius`=0.3672,`combat_reach`=1,`gender`=0 WHERE `modelid`=27587; -- Officer Van Rossem
+UPDATE `creature_model_info` SET `bounding_radius`=0.3672,`combat_reach`=1,`gender`=0 WHERE `modelid`=27592; -- Archmage Timear
+UPDATE `creature_model_info` SET `bounding_radius`=0.3672,`combat_reach`=1,`gender`=1 WHERE `modelid`=28118; -- Mojodishu
+UPDATE `creature_model_info` SET `bounding_radius`=0.372,`combat_reach`=1,`gender`=0 WHERE `modelid`=27328; -- Kor'kron Reaver
+UPDATE `creature_model_info` SET `bounding_radius`=0.372,`combat_reach`=1,`gender`=0 WHERE `modelid`=28194; -- Willard Blauvelt
+UPDATE `creature_model_info` SET `bounding_radius`=0.3817,`combat_reach`=1,`gender`=0 WHERE `modelid`=27154; -- Alliance Brigadier General
+UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=0 WHERE `modelid`=25604; -- Caliel Brightwillow
+UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=0 WHERE `modelid`=25610; -- Enchanter Nalthanis
+UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=0 WHERE `modelid`=25806; -- Warcaster Fanoraithe
+UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=0 WHERE `modelid`=25877; -- Valaden Silverblade
+UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=0 WHERE `modelid`=25882; -- Arille Azuregaze
+UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=0 WHERE `modelid`=26067; -- Silver Covenant Guardian Mage
+UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=0 WHERE `modelid`=26068; -- Silver Covenant Guardian Mage
+UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=0 WHERE `modelid`=26072; -- Sunreaver Guardian Mage
+UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=0 WHERE `modelid`=26443; -- Darahir
+UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=0 WHERE `modelid`=27509; -- High Warlord Uro
+UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=0 WHERE `modelid`=27559; -- Arcanist Adurin
+UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=0 WHERE `modelid`=27800; -- Arcanist Braedin
+UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=0 WHERE `modelid`=27801; -- Magister Surdiel
+UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=0 WHERE `modelid`=27949; -- Warmage Lukems
+UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=0 WHERE `modelid`=28148; -- Fabioso the Fabulous
+UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=0 WHERE `modelid`=28151; -- Dalaran Citizen
+UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=0 WHERE `modelid`=28156; -- Archmage Tenaj
+UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=0 WHERE `modelid`=28169; -- Metopious Loreseeker
+UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=0 WHERE `modelid`=28198; -- Felcaster Virim
+UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=0 WHERE `modelid`=28755; -- Arcanist Tybalin
+UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=0 WHERE `modelid`=28987; -- Arcanist Firael
+UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=0 WHERE `modelid`=29830; -- Enchanter Isian
+UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=0 WHERE `modelid`=30310; -- Silver Covenant Agent
+UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=0 WHERE `modelid`=30439; -- Sunreaver Agent
+UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=0 WHERE `modelid`=30842; -- Arcanist Uovril
+UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=1 WHERE `modelid`=15242; -- Defilers Emissary
+UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=1 WHERE `modelid`=25594; -- Paldesse
+UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=1 WHERE `modelid`=25603; -- Narisa Redgold
+UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=1 WHERE `modelid`=25622; -- Olisarra the Kind
+UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=1 WHERE `modelid`=25635; -- Ildine Sorrowspear
+UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=1 WHERE `modelid`=25875; -- Aemara
+UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=1 WHERE `modelid`=25879; -- Karandonna
+UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=1 WHERE `modelid`=26069; -- Silver Covenant Guardian Mage
+UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=1 WHERE `modelid`=26070; -- Silver Covenant Guardian Mage
+UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=1 WHERE `modelid`=26073; -- Sunreaver Guardian Mage
+UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=1 WHERE `modelid`=26074; -- Sunreaver Guardian Mage
+UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=1 WHERE `modelid`=26330; -- Aimee
+UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=1 WHERE `modelid`=26339; -- Imindril Spearsong
+UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=1 WHERE `modelid`=26441; -- Fialla Sweetberry
+UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=1 WHERE `modelid`=27556; -- Arcanist Ivrenne
+UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=1 WHERE `modelid`=27956; -- Isirami Fairwind
+UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=1 WHERE `modelid`=28147; -- Darthalia Ebonscorch
+UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=1 WHERE `modelid`=28152; -- Mona Everspring
+UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=1 WHERE `modelid`=28153; -- Kitz Proudbreeze
+UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=1 WHERE `modelid`=28163; -- Sabriana Sorrowgaze
+UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=1 WHERE `modelid`=28168; -- Goldlilly Gleamingfell
+UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=1 WHERE `modelid`=29832; -- Arcanist Miluria
+UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=1 WHERE `modelid`=30042; -- Kaye Toogie
+UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=1 WHERE `modelid`=30311; -- Silver Covenant Agent
+UPDATE `creature_model_info` SET `bounding_radius`=0.385,`combat_reach`=1,`gender`=1 WHERE `modelid`=25005; -- Dreadsaber
+UPDATE `creature_model_info` SET `bounding_radius`=0.3875,`combat_reach`=1,`gender`=0 WHERE `modelid`=28618; -- Unbound Seer
+UPDATE `creature_model_info` SET `bounding_radius`=0.389,`combat_reach`=1,`gender`=0 WHERE `modelid`=26376; -- Ainderu Summerleaf
+UPDATE `creature_model_info` SET `bounding_radius`=0.389,`combat_reach`=1,`gender`=0 WHERE `modelid`=28204; -- Mendez Nightshadow
+UPDATE `creature_model_info` SET `bounding_radius`=0.389,`combat_reach`=1,`gender`=0 WHERE `modelid`=30156; -- Daros Moonlance
+UPDATE `creature_model_info` SET `bounding_radius`=0.3978,`combat_reach`=1,`gender`=0 WHERE `modelid`=26847; -- Dalaran Visitor
+UPDATE `creature_model_info` SET `bounding_radius`=0.4,`combat_reach`=0,`gender`=2 WHERE `modelid`=26526; -- Cosmetic Mechanical Sheep
+UPDATE `creature_model_info` SET `bounding_radius`=0.4,`combat_reach`=0,`gender`=2 WHERE `modelid`=9563; -- Worg Pup
+UPDATE `creature_model_info` SET `bounding_radius`=0.4131,`combat_reach`=2,`gender`=0 WHERE `modelid`=16024; -- Rhonin
+UPDATE `creature_model_info` SET `bounding_radius`=0.4185,`combat_reach`=1,`gender`=0 WHERE `modelid`=27820; -- Armored Brown Bear
+UPDATE `creature_model_info` SET `bounding_radius`=0.4213,`combat_reach`=1,`gender`=0 WHERE `modelid`=19744; -- Archmage Lan'dalock
+UPDATE `creature_model_info` SET `bounding_radius`=0.42228,`combat_reach`=2,`gender`=0 WHERE `modelid`=31713; -- Frozo the Renowned
+UPDATE `creature_model_info` SET `bounding_radius`=0.4284,`combat_reach`=2,`gender`=0 WHERE `modelid`=30978; -- Spectral Footman
+UPDATE `creature_model_info` SET `bounding_radius`=0.4284,`combat_reach`=2,`gender`=0 WHERE `modelid`=30981; -- Shadowy Mercenary
+UPDATE `creature_model_info` SET `bounding_radius`=0.44045,`combat_reach`=1,`gender`=1 WHERE `modelid`=30686; -- Dark Ranger Vorel
+UPDATE `creature_model_info` SET `bounding_radius`=0.465,`combat_reach`=0,`gender`=1 WHERE `modelid`=30867; -- Lady Jaina Proudmoore
+UPDATE `creature_model_info` SET `bounding_radius`=0.465,`combat_reach`=1,`gender`=2 WHERE `modelid`=28282; -- Brassbolt Mechawrench
+UPDATE `creature_model_info` SET `bounding_radius`=0.4685,`combat_reach`=0,`gender`=2 WHERE `modelid`=26442; -- Clockwork Assistant
+UPDATE `creature_model_info` SET `bounding_radius`=0.47875,`combat_reach`=1,`gender`=0 WHERE `modelid`=26770; -- Archmage Aethas Sunreaver
+UPDATE `creature_model_info` SET `bounding_radius`=0.47875,`combat_reach`=1,`gender`=1 WHERE `modelid`=28222; -- Vereesa Windrunner
+UPDATE `creature_model_info` SET `bounding_radius`=0.4858,`combat_reach`=2,`gender`=0 WHERE `modelid`=30980; -- Tortured Rifleman
+UPDATE `creature_model_info` SET `bounding_radius`=0.5,`combat_reach`=0,`gender`=0 WHERE `modelid`=4449; -- Imp
+UPDATE `creature_model_info` SET `bounding_radius`=0.5,`combat_reach`=1,`gender`=2 WHERE `modelid`=11686; -- Dalaran Fountain Invis Stalker
+UPDATE `creature_model_info` SET `bounding_radius`=0.5355,`combat_reach`=2,`gender`=0 WHERE `modelid`=30821; -- Uther the Lightbringer
+UPDATE `creature_model_info` SET `bounding_radius`=0.5362,`combat_reach`=2,`gender`=0 WHERE `modelid`=30979; -- Ghostly Priest
+UPDATE `creature_model_info` SET `bounding_radius`=0.5392,`combat_reach`=1,`gender`=2 WHERE `modelid`=1041; -- Stabled Hunter Pet
+UPDATE `creature_model_info` SET `bounding_radius`=0.54,`combat_reach`=0,`gender`=2 WHERE `modelid`=20833; -- Stabled Hunter Pet
+UPDATE `creature_model_info` SET `bounding_radius`=0.59823,`combat_reach`=2,`gender`=1 WHERE `modelid`=27917; -- Gold Warrior
+UPDATE `creature_model_info` SET `bounding_radius`=0.6,`combat_reach`=0,`gender`=2 WHERE `modelid`=27681; -- Cosmetic Pig
+UPDATE `creature_model_info` SET `bounding_radius`=0.6,`combat_reach`=1,`gender`=2 WHERE `modelid`=12200; -- Segacedi
+UPDATE `creature_model_info` SET `bounding_radius`=0.60725,`combat_reach`=3,`gender`=2 WHERE `modelid`=1988; -- Grove Walker
+UPDATE `creature_model_info` SET `bounding_radius`=0.6324,`combat_reach`=2,`gender`=0 WHERE `modelid`=27919; -- Green Warrior
+UPDATE `creature_model_info` SET `bounding_radius`=0.6511,`combat_reach`=2,`gender`=0 WHERE `modelid`=27930; -- Green Paladin
+UPDATE `creature_model_info` SET `bounding_radius`=0.6721,`combat_reach`=1,`gender`=2 WHERE `modelid`=31094; -- Arcturis
+UPDATE `creature_model_info` SET `bounding_radius`=0.75,`combat_reach`=0,`gender`=2 WHERE `modelid`=26064; -- Scourge Haunt
+UPDATE `creature_model_info` SET `bounding_radius`=0.75,`combat_reach`=1,`gender`=0 WHERE `modelid`=27766; -- [DND] Dalaran Sewer Arena - Controller
+UPDATE `creature_model_info` SET `bounding_radius`=0.75,`combat_reach`=1,`gender`=2 WHERE `modelid`=17612; -- Frostmourne Altar Bunny (Quel'Delar)
+UPDATE `creature_model_info` SET `bounding_radius`=0.765,`combat_reach`=3,`gender`=0 WHERE `modelid`=30972; -- Falric
+UPDATE `creature_model_info` SET `bounding_radius`=0.765,`combat_reach`=3,`gender`=0 WHERE `modelid`=30973; -- Marwyn
+UPDATE `creature_model_info` SET `bounding_radius`=0.8,`combat_reach`=0,`gender`=2 WHERE `modelid`=27700; -- Stabled Hunter Pet
+UPDATE `creature_model_info` SET `bounding_radius`=0.8725,`combat_reach`=3,`gender`=0 WHERE `modelid`=28183; -- Hunaka Greenhoof
+UPDATE `creature_model_info` SET `bounding_radius`=0.9,`combat_reach`=1,`gender`=2 WHERE `modelid`=14255; -- Felguard
+UPDATE `creature_model_info` SET `bounding_radius`=0.9747,`combat_reach`=4,`gender`=0 WHERE `modelid`=28207; -- Tuff Gorehoof
+UPDATE `creature_model_info` SET `bounding_radius`=0.9747,`combat_reach`=4,`gender`=0 WHERE `modelid`=29820; -- Sorn Proudmane
+UPDATE `creature_model_info` SET `bounding_radius`=1.05,`combat_reach`=1,`gender`=0 WHERE `modelid`=10957; -- Dappled Stag
+UPDATE `creature_model_info` SET `bounding_radius`=1.05,`combat_reach`=1,`gender`=2 WHERE `modelid`=27726; -- Stabled Hunter Pet
+UPDATE `creature_model_info` SET `bounding_radius`=1.1,`combat_reach`=1,`gender`=2 WHERE `modelid`=26532; -- Cosmetic Mechanical Squirrel
+UPDATE `creature_model_info` SET `bounding_radius`=1.122,`combat_reach`=0,`gender`=2 WHERE `modelid`=368; -- Black Widow Hatchling
+UPDATE `creature_model_info` SET `bounding_radius`=1.18065,`combat_reach`=2,`gender`=2 WHERE `modelid`=833; -- Underbelly Croc
+UPDATE `creature_model_info` SET `bounding_radius`=1.2,`combat_reach`=0,`gender`=0 WHERE `modelid`=24235; -- Sinewy Wolf
+UPDATE `creature_model_info` SET `bounding_radius`=1.3,`combat_reach`=1,`gender`=2 WHERE `modelid`=134; -- Squirrel
+UPDATE `creature_model_info` SET `bounding_radius`=1.5,`combat_reach`=0,`gender`=0 WHERE `modelid`=22003; -- Nargut
+UPDATE `creature_model_info` SET `bounding_radius`=1.5,`combat_reach`=0,`gender`=0 WHERE `modelid`=27019; -- Rhukah
+UPDATE `creature_model_info` SET `bounding_radius`=1.7,`combat_reach`=2,`gender`=1 WHERE `modelid`=27931; -- Gold Shaman
+UPDATE `creature_model_info` SET `bounding_radius`=2.75,`combat_reach`=5,`gender`=0 WHERE `modelid`=30721; -- The Lich King
+
+-- Template addon updates
+UPDATE `creature_template_addon` SET `bytes1`=0,`bytes2`=1,`mount`=0,`emote`=0,`auras`=NULL WHERE `entry`=1412; -- Squirrel
+UPDATE `creature_template_addon` SET `bytes1`=0,`bytes2`=1,`mount`=0,`emote`=0,`auras`=NULL WHERE `entry`=14881; -- Spider
+UPDATE `creature_template_addon` SET `bytes1`=0,`bytes2`=1,`mount`=0,`emote`=0,`auras`=NULL WHERE `entry`=14990; -- Defilers Emissary
+UPDATE `creature_template_addon` SET `bytes1`=0,`bytes2`=1,`mount`=0,`emote`=0,`auras`=NULL WHERE `entry`=14991; -- League of Arathor Emissary
+UPDATE `creature_template_addon` SET `bytes1`=0,`bytes2`=1,`mount`=0,`emote`=0,`auras`=NULL WHERE `entry`=17213; -- Broom
+UPDATE `creature_template_addon` SET `bytes1`=0,`bytes2`=1,`mount`=0,`emote`=0,`auras`=NULL WHERE `entry`=32642; -- Mojodishu
+UPDATE `creature_template_addon` SET `bytes1`=0,`bytes2`=1,`mount`=0,`emote`=0,`auras`=NULL WHERE `entry`=4075; -- Rat
+UPDATE `creature_template_addon` SET `bytes1`=0,`bytes2`=1,`mount`=0,`emote`=0,`auras`=NULL WHERE `entry`=721; -- Rabbit
+UPDATE `creature_template_addon` SET `bytes1`=3,`bytes2`=1,`mount`=0,`emote`=0,`auras`=NULL WHERE `entry`=31885; -- Rhukah
+UPDATE `creature_template_addon` SET `bytes1`=3,`bytes2`=1,`mount`=0,`emote`=0,`auras`=NULL WHERE `entry`=31886; -- Nargut
diff --git a/sql/updates/world/2011_03_23_02_world_creature_transport.sql b/sql/updates/world/2011_03_23_02_world_creature_transport.sql
new file mode 100644
index 00000000000..05c94518d83
--- /dev/null
+++ b/sql/updates/world/2011_03_23_02_world_creature_transport.sql
@@ -0,0 +1,3 @@
+DELETE FROM `creature_transport` WHERE `transport_entry`=192242 AND `npc_entry`=31261;
+INSERT INTO `creature_transport` (`transport_entry`,`npc_entry`,`TransOffsetX`,`TransOffsetY`,`TransOffsetZ`,`TransOffsetO`,`emote`) VALUES
+(192242,31261,-46.16626,12.04395,13.22064,1.437376,0); -- Brother Keltan abord the Skybreaker
diff --git a/sql/updates/world/2011_03_23_03_world_creature.sql b/sql/updates/world/2011_03_23_03_world_creature.sql
new file mode 100644
index 00000000000..ca0ccdc93c9
--- /dev/null
+++ b/sql/updates/world/2011_03_23_03_world_creature.sql
@@ -0,0 +1 @@
+UPDATE `creature` SET `id`=15105 WHERE `guid` BETWEEN 208382 AND 208393 AND `id`=15102;
diff --git a/sql/updates/world/2011_03_23_04_world_creature.sql b/sql/updates/world/2011_03_23_04_world_creature.sql
new file mode 100644
index 00000000000..9d9edec6452
--- /dev/null
+++ b/sql/updates/world/2011_03_23_04_world_creature.sql
@@ -0,0 +1,42 @@
+-- Spawn Missing Argent Crusaders
+-- Redid Exisiting to make Adding simpler
+SET @GUID=54706;
+DELETE FROM `creature` WHERE id IN (28029,28026);
+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
+(107427,28029,571,1,1,26231,0,5514,-2398.25,292.502,1.5708,300,0,0,9572,3561,0,0,0,0,0),
+(107428,28029,571,1,1,26228,0,5485.95,-2500.14,292.433,0.934353,300,0,0,9572,3561,0,0,0,0,0),
+(107429,28029,571,1,1,26229,0,5495.16,-2439.33,292.498,5.44414,300,0,0,9572,3561,0,0,0,0,0),
+(107430,28029,571,1,1,26230,0,5490.07,-2495.2,292.429,3.93988,300,0,0,9572,3561,0,0,0,0,0),
+(107431,28029,571,1,1,26230,0,5496.85,-2383.57,292.502,2.30383,300,0,0,9572,3561,0,0,0,0,0),
+(@GUID+0,28029,571,1,1,0,0,5442.812,-2554.325,297.783,1.554819,300,0,0,1,1,0,0,0,0,0),
+(@GUID+1,28029,571,1,1,0,0,5451.548,-2516.311,292.445,0.1570796,300,0,0,1,1,0,0,0,0,0),
+(@GUID+2,28029,571,1,1,0,0,5445.436,-2513.325,292.5019,1.64061,300,0,0,1,1,0,0,0,0,0),
+(@GUID+3,28029,571,1,1,0,0,5384.553,-2402.976,292.5019,0.8726646,300,0,0,1,1,0,0,0,0,0),
+(@GUID+4,28029,571,1,1,0,0,5386.06,-2421.43,292.5019,1.53589,300,0,0,1,1,0,0,0,0,0),
+(@GUID+5,28029,571,1,1,0,0,5383.483,-2472.9,292.5019,1.570796,300,0,0,1,1,0,0,0,0,0),
+(@GUID+6,28029,571,1,1,0,0,5400.021,-2448.991,292.5019,2.321288,300,0,0,1,1,0,0,0,0,0),
+(@GUID+7,28029,571,1,1,0,0,5369.318,-2443.405,292.5019,0.9424778,300,0,0,1,1,0,0,0,0,0),
+(@GUID+8,28029,571,1,1,0,0,5409.107,-2361.323,292.5019,0.6283185,300,0,0,1,1,0,0,0,0,0),
+(@GUID+9,28029,571,1,1,0,0,5464.651,-2496.451,292.5019,1.48353,300,0,0,1,1,0,0,0,0,0),
+(@GUID+10,28029,571,1,1,0,0,5435.183,-2513.578,292.445,0.918852,300,0,0,1,1,0,0,0,0,0),
+(@GUID+11,28029,571,1,1,0,0,5400.03,-2506.189,292.5019,1.553343,300,0,0,1,1,0,0,0,0,0),
+(@GUID+12,28029,571,1,1,0,0,5450.897,-2457.951,292.5019,1.553343,300,0,0,1,1,0,0,0,0,0),
+-- rampaging Geist
+(107193,28026,571,1,1,25286,0,5497.21,-2080.43,240.865,0.857485,300,5,0,10635,0,0,1,0,0,0),
+(107194,28026,571,1,1,25402,0,5511.68,-2358.28,292.441,2.71292,300,5,0,10635,0,0,1,0,0,0),
+(107195,28026,571,1,1,25402,0,5512.46,-2455.17,292.424,2.97264,300,5,0,10635,0,0,1,0,0,0),
+(107196,28026,571,1,1,25286,0,5519.86,-2423.45,292.473,3.83817,300,5,0,10635,0,0,1,0,0,0),
+(107197,28026,571,1,1,25286,0,5488.13,-2497.19,292.429,3.93989,300,5,0,10635,0,0,1,0,0,0),
+(32067,28026,571,1,1,0,0,5429.262,-2486.59,292.5296,2.737376,300,5,0,10635,0,0,1,0,0,0),
+(32068,28026,571,1,1,0,0,5408.888,-2479.563,292.5296,0.7370623,300,5,0,10635,0,0,1,0,0,0),
+(32070,28026,571,1,1,0,0,5419.276,-2505.731,292.5433,4.015942,300,5,0,10635,0,0,1,0,0,0),
+(32071,28026,571,1,1,0,0,5384.713,-2463.133,292.843,2.721308,300,5,0,10635,0,0,1,0,0,0),
+(32073,28026,571,1,1,0,0,5383.064,-2413.345,292.5399,6.069617,300,5,0,10635,0,0,1,0,0,0),
+(32074,28026,571,1,1,0,0,5394.180,-2442.885,292.468,2.731286,300,5,0,10635,0,0,1,0,0,0),
+(518,28026,571,1,1,0,0,5452.489,-2447.378,292.5435,0.3663993,300,5,0,10635,0,0,1,0,0,0);
+
+-- Addon data
+DELETE FROM `creature_template_addon` WHERE `entry` IN (28029,28026);
+INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
+(28029,0,0,1,375, NULL), -- Argent Crusader
+(28026,0,0,1,0, NULL); -- Rampaging Geist
diff --git a/sql/updates/world/2011_03_23_06_world_quest_template.sql b/sql/updates/world/2011_03_23_06_world_quest_template.sql
new file mode 100644
index 00000000000..1b100325ae4
--- /dev/null
+++ b/sql/updates/world/2011_03_23_06_world_quest_template.sql
@@ -0,0 +1,2 @@
+-- Update Vile Familiars, Burning Blade Medallion and Report to Sen'jin Village required races (Horde)
+UPDATE `quest_template` SET `RequiredRaces`=690 WHERE `entry` IN (792,794,805);
diff --git a/sql/updates/world/2011_03_23_07_world_creatureinvolvedrelation.sql b/sql/updates/world/2011_03_23_07_world_creatureinvolvedrelation.sql
new file mode 100644
index 00000000000..1a8e09c0727
--- /dev/null
+++ b/sql/updates/world/2011_03_23_07_world_creatureinvolvedrelation.sql
@@ -0,0 +1,4 @@
+-- Battle to Undercity should be turned in to Bragor Bloodfist
+DELETE FROM `creature_involvedrelation` WHERE `quest` IN (14351,550);
+DELETE FROM `creature_questrelation` WHERE `quest` IN (14351,550);
+INSERT INTO `creature_involvedrelation` (`id`,`quest`) VALUES (36273,14351);
diff --git a/sql/updates/world/2011_03_23_08_world_gameobject_template.sql b/sql/updates/world/2011_03_23_08_world_gameobject_template.sql
new file mode 100644
index 00000000000..8db2ac8f117
--- /dev/null
+++ b/sql/updates/world/2011_03_23_08_world_gameobject_template.sql
@@ -0,0 +1,8 @@
+DELETE FROM `gameobject_template` WHERE `entry`=300149;
+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
+(300149,8,1287, 'TEMP Wrathscale Lair Fountain', '', '', '',0,0,1,0,0,0,0,0,0,223,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, '', '',1);
+
+-- NEEDS VISUAL (apart form Ruins of Stardust, its MISSING!)
+DELETE FROM `gameobject` WHERE `id`=300149;
+INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES
+(1160,300149,530,1,1,-2186.4,-12340.5,56.2888,5.31,0,0,0.121294,-0.992617,-300,0,1);
diff --git a/sql/updates/world/2011_03_23_09_world_creature.sql b/sql/updates/world/2011_03_23_09_world_creature.sql
new file mode 100644
index 00000000000..11aad5a0466
--- /dev/null
+++ b/sql/updates/world/2011_03_23_09_world_creature.sql
@@ -0,0 +1,132 @@
+-- create missing spawns:
+SET @GUID := 151895; -- SET BY TDB
+
+DELETE FROM `creature` WHERE `id`IN(18695,18697,18689,18686,18698,18678,17144,18692,18677,18693,18683,18679);
+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
+-- Ambassador Jerrikar
+(@GUID,18695,530,1,1,0,0,-4455.05,1694.55,161.278,1.93093,28800,0,0,13522,0,0,0),
+(@GUID+1,18695,530,1,1,0,0,-4203.43,344.462,115.416,4.161,28800,0,0,13522,0,0,0),
+(@GUID+2,18695,530,1,1,0,0,-3815.24,2689.31,100.581,5.38433,28800,5,0,13522,0,0,1),
+(@GUID+3,18695,530,1,1,0,0,-3082.38,1867.38,139.906,1.53194,28800,5,0,13522,0,0,1),
+(@GUID+4,18695,530,1,1,0,0,-3076.35,1020.61,-2.88056,3.73969,28800,5,0,13522,0,0,1),
+-- Chief Engineer Lorthander
+(@GUID+5,18697,530,1,1,0,0,4092.53,4001.75,117.282,4.650480,28800,0,0,10818,15400,0,0),
+(@GUID+6,18697,530,1,1,0,0,2293.31,2821.12,130.917,4.422730,28800,5,0,10818,15400,0,1),
+(@GUID+7,18697,530,1,1,0,0,2954.82,2147.42,165.328,0.753333,28800,5,0,10818,15400,0,1),
+-- Crippler
+(@GUID+8,18689,530,1,1,0,0,-3005.68,5037.76,-23.7032,4.12334,28800,30,0,11828,0,0,1), -- only have one for him :(
+-- Doomsayer Jurim
+(@GUID+9,18686,530,1,1,0,0,-2537.44,5147.04,9.05971,5.82974,28800,0,0,9144,13525,0,0),
+(@GUID+10,18686,530,1,1,0,0,-1874.09,4663.57,10.9095,3.87017,28800,5,0,9144,13525,0,1),
+(@GUID+11,18686,530,1,1,0,0,-2172.31,4091.34,3.00316,4.21182,28800,5,0,9144,13525,0,1),
+(@GUID+12,18686,530,1,1,0,0,-3001.44,3297.82,0.537389,4.35947,28800,5,0,9144,13525,0,1),
+(@GUID+13,18686,530,1,1,0,0,-3540.43,4051.46,66.3999,2.6905,28800,5,0,9144,13525,0,1),
+-- Ever-Core the Punisher
+(@GUID+14,18698,530,1,1,0,0,3014.36,4025.81,144.105,2.90805,28800,5,0,10466,5982,0,1),
+(@GUID+15,18698,530,1,1,0,0,3835.65,3835.2,103.641,5.80224,28800,5,0,10466,5982,0,1),
+(@GUID+16,18698,530,1,1,0,0,4824.65,2738.08,88.9073,0.75999,28800,5,0,10466,5982,0,1),
+(@GUID+17,18698,530,1,1,0,0,4113.73,1677.64,130.749,0.237701,28800,5,0,10466,5982,0,1),
+-- Fulgorge (should be 3 i think)
+(@GUID+18,18678,530,1,1,0,0,-565.303,4343,49.9107,6.05994,28800,0,0,10682,0,0,0),
+(@GUID+19,18678,530,1,1,0,0,-632.339,3908.47,28.9953,4.74599,28800,0,0,10682,0,0,0),
+(@GUID+38,18678,530,1,1,0,0,-634.201,3795.52,28.99509,1.162743,28800,0,0,10682,0,0,0),
+-- Goretooth
+(@GUID+20,17144,530,1,1,0,0,-1762.6,8066.57,-104.023,1.86887,28800,0,0,11828,0,0,0),
+(@GUID+21,17144,530,1,1,0,0,-1840.51,8450.93,-64.6652,4.69754,28800,0,0,11828,0,0,0),
+(@GUID+22,17144,530,1,1,0,0,-1025.68,7114.78,2.37478,0.256121,28800,0,0,11828,0,0,0),
+(@GUID+23,17144,530,1,1,0,0,-2876.55,6078.57,-4.24251,1.15226,28800,0,0,11828,0,0,0),
+-- Hemathion
+(@GUID+24,18692,530,1,1,0,0,2116.26,7250.19,365.147,2.86924,28800,0,0,13084,0,0,0),
+(@GUID+25,18692,530,1,1,0,0,2699.59,7237.5,366.064,3.30389,28800,0,0,13084,0,0,0),
+-- Mekthorg the Wild
+(@GUID+26,18677,530,1,1,0,0,-575.456,3240.77,5.76784,4.69623,28800,0,0,10316,0,0,0),
+(@GUID+27,18677,530,1,1,0,0,-1084.3,2014.46,67.6811,0.947525,28800,5,0,10316,0,0,1),
+-- Speaker Mar'grom
+(@GUID+28,18693,530,1,1,0,0,2365.59,6544.67,3.4638,1.66658,28800,0,0,10466,8973,0,0),
+(@GUID+29,18693,530,1,1,0,0,1599.44,6433.12,-10.4082,0.215986,28800,0,0,10466,8973,0,0),
+(@GUID+30,18693,530,1,1,0,0,1607.56,6423.05,-10.3477,0.577269,28800,5,0,10466,8973,0,1),
+(@GUID+31,18693,530,1,1,0,0,2915.68,6000.98,-4.1535,4.87572,28800,5,0,10466,8973,0,1),
+(@GUID+32,18693,530,1,1,0,0,3636.49,5349.23,-20.7,4.57491,28800,5,0,10466,8973,0,1),
+-- Voidhunter Yar (1 spawn. circular pathing)
+(@GUID+33,18683,530,1,1,0,0,-2422.61,8206.15,-38.3408,0.177212,28800,0,0,10466,11964,0,0),
+-- Vorakem Doomspeaker
+(@GUID+34,18679,530,1,1,0,0,175.918,1720.29,34.4088,3.26023,28800,0,0,8548,2568,0,0),
+(@GUID+35,18679,530,1,1,0,0,-444.675,1851.37,78.3747,5.77743,28800,5,0,8548,2568,0,1),
+(@GUID+36,18679,530,1,1,0,0,399.416,2204.89,118.365,0.918177,28800,5,0,8548,2568,0,1),
+(@GUID+37,18679,530,1,1,0,0,362.142,3354.43,64.1364,1.86458,28800,5,0,8548,2568,0,1);
+
+-- DefiningPooling_templates
+DELETE FROM `pool_template` WHERE `entry` BETWEEN 1073 AND 1085;
+INSERT INTO pool_template (`entry`,`max_limit`,`description`) VALUES
+(1073,1, 'Okrek Rare Spawn (1 out 4)'),
+(1074,1, 'Ambassador Jerrikar Rare Spawn (1 out 5)'),
+(1075,1, 'Okrek Rare Spawn (1 out 3)'),
+(1076,1, 'Crippler Rare Spawn (1 out 1)'),
+(1077,1, 'Doomsayer Jurim Rare Spawn (1 out 5)'),
+(1078,1, 'Ever-Core the Punisher Rare Spawn (1 out 4)'),
+(1079,1, 'Fulgore Rare Spawn (1 out 3)'),
+(1080,1, 'Goretooth Rare Spawn (1 out 4)'),
+(1081,1, 'Hemathion Rare Spawn (1 out 2)'),
+(1082,1, 'Mekthorg the Wild Rare Spawn (1 out 2)'),
+(1083,1, 'Speaker Margrom Rare Spawn (1 out 5)'),
+(1084,1, 'Voidhunter Yar Rare Spawn (1 out 1)'),
+(1085,1, 'Vorakem Doomspeaker Rare Spawn (1 out 4)');
+
+-- Pooling the Spawns
+DELETE FROM `pool_creature` WHERE `pool_entry` BETWEEN 1073 AND 1085;
+INSERT INTO pool_creature(`guid`,`pool_entry`,`chance`,`description`) VALUES
+(85382,1073,25, 'Okrek - Spawnlocation 1'),
+(85405,1073,25, 'Okrek - Spawnlocation 2'),
+(85564,1073,25, 'Okrek - Spawnlocation 3'),
+(85565,1073,25, 'Okrek - Spawnlocation 4'),
+(@GUID,1074,20, 'Ambassador Jerrikar - Spawnlocation 1'),
+(@GUID+1,1074,20, 'Ambassador Jerrikar - Spawnlocation 2'),
+(@GUID+2,1074,20, 'Ambassador Jerrikar - Spawnlocation 3'),
+(@GUID+3,1074,20, 'Ambassador Jerrikar - Spawnlocation 4'),
+(@GUID+4,1074,20, 'Ambassador Jerrikar - Spawnlocation 5'),
+(@GUID+5,1075,33, 'Chief Engineer Lorthander - Spawnlocation 1'),
+(@GUID+6,1075,33, 'Chief Engineer Lorthander - Spawnlocation 2'),
+(@GUID+7,1075,34, 'Chief Engineer Lorthander - Spawnlocation 3'),
+(@GUID+8,1076,100, 'Crippler - Spawnlocation 1'),
+(@GUID+9,1077,20, 'Doomsayer Jurim Spawnlocation 1'),
+(@GUID+10,1077,20, 'Doomsayer Jurim Spawnlocation 2'),
+(@GUID+11,1077,20, 'Doomsayer Jurim Spawnlocation 3'),
+(@GUID+12,1077,20, 'Doomsayer Jurim Spawnlocation 4'),
+(@GUID+13,1077,20, 'Doomsayer Jurim Spawnlocation 5'),
+(@GUID+14,1078,25, 'Ever-Core the Punisher Spawnlocation 1'),
+(@GUID+15,1078,25, 'Ever-Core the Punisher Spawnlocation 2'),
+(@GUID+16,1078,25, 'Ever-Core the Punisher Spawnlocation 3'),
+(@GUID+17,1078,25, 'Ever-Core the Punisher Spawnlocation 4'),
+(@GUID+18,1079,33, 'Fulgore Spawnlocation 1'),
+(@GUID+19,1079,33, 'Fulgore Spawnlocation 2'),
+(@GUID+38,1079,33, 'Fulgore Spawnlocation 2'),
+(@GUID+20,1080,25, 'Goretooth Spawnlocation 1'),
+(@GUID+21,1080,25, 'Goretooth Spawnlocation 2'),
+(@GUID+22,1080,25, 'Goretooth Spawnlocation 3'),
+(@GUID+23,1080,25, 'Goretooth Spawnlocation 4'),
+(@GUID+24,1081,50, 'Hemathion Spawnlocation 1'),
+(@GUID+25,1081,50, 'Hemathion Spawnlocation 2'),
+(@GUID+26,1082,50, 'Mekthorg the Wild Spawnlocation 1'),
+(@GUID+27,1082,50, 'Mekthorg the Wild Spawnlocation 2'),
+(@GUID+28,1083,20, 'Speaker Margrom Spawnlocation 1'),
+(@GUID+29,1083,20, 'Speaker Margrom Spawnlocation 2'),
+(@GUID+30,1083,20, 'Speaker Margrom Spawnlocation 3'),
+(@GUID+31,1083,20, 'Speaker Margrom Spawnlocation 4'),
+(@GUID+32,1083,20, 'Speaker Margrom Spawnlocation 5'),
+(@GUID+33,1084,100, 'Voidhunter Yar Spawnlocation 1'),
+(@GUID+34,1085,25, 'Vorakem Doomspeaker Spawnlocation 1'),
+(@GUID+35,1085,25, 'Vorakem Doomspeaker Spawnlocation 2'),
+(@GUID+36,1085,25, 'Vorakem Doomspeaker Spawnlocation 3'),
+(@GUID+37,1085,25, 'Vorakem Doomspeaker Spawnlocation 4');
+
+-- Chief Engineer Lorthander (sniffed)
+SET @EquiEntry = 1807; -- (creature_equip_template.entry - need 1)
+UPDATE `creature_template` SET `faction_A`=1701,`faction_H`=1701,`equipment_id`=@EquiEntry,`speed_walk`=1 WHERE `entry`=18697;
+DELETE FROM `creature_equip_template` WHERE `entry`=@EquiEntry;
+INSERT INTO `creature_equip_template` (`entry`,`equipentry1`,`equipentry2`,`equipentry3`) VALUES
+(@EquiEntry,31301,32768,0);
+DELETE FROM `creature_template_addon` WHERE `entry`=18697;
+INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
+(18697,0,0,1,0, NULL);
diff --git a/sql/updates/world/2011_03_23_0_world_conditions.sql b/sql/updates/world/2011_03_23_0_world_conditions.sql
deleted file mode 100644
index e8817974939..00000000000
--- a/sql/updates/world/2011_03_23_0_world_conditions.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=18 AND `SourceEntry`=33581;
-INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceEntry`,`ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `Comment`) VALUES 
-(18,33581,24,1,24238, 'Only use Insult on Bjorn Halgurdsson');
diff --git a/sql/updates/world/2011_03_23_1_world_creature_template.sql b/sql/updates/world/2011_03_23_1_world_creature_template.sql
deleted file mode 100644
index ddc7e9c4cbc..00000000000
--- a/sql/updates/world/2011_03_23_1_world_creature_template.sql
+++ /dev/null
@@ -1,874 +0,0 @@
--- Updates for (mostly) HoR creatures/GOs
--- Gameobject updates
-UPDATE `gameobject_template` SET `flags`=`flags`|32 WHERE `entry`=202443; -- Dedication of Honor
-UPDATE `gameobject_template` SET `flags`=`flags`|32 WHERE `entry`=201761; -- The Pit of Saron Portcullis
-UPDATE `gameobject_template` SET `flags`=`flags`|32 WHERE `entry`=201759; -- The Forge of Souls Portcullis
-UPDATE `gameobject_template` SET `flags`=`flags`|32 WHERE `entry`=201760; -- The Halls of Reflection Gate
-UPDATE `gameobject_template` SET `flags`=`flags`|32,`faction`=114 WHERE `entry`=201976; -- Doodad_IceCrown_Door_04
-UPDATE `gameobject_template` SET `flags`=`flags`|32,`faction`=114 WHERE `entry`=202236; -- Frostmourne Altar
-UPDATE `gameobject_template` SET `flags`=`flags`|32,`faction`=114 WHERE `entry`=202302; -- Frostmourne
-UPDATE `gameobject_template` SET `flags`=`flags`|32,`faction`=1375 WHERE `entry`=197341; -- Impenetrable Door
-UPDATE `gameobject_template` SET `flags`=`flags`|32,`faction`=1375 WHERE `entry`=197343; -- Doodad_IceCrown_Door_03
-UPDATE `gameobject_template` SET `flags`=`flags`|32,`faction`=1375 WHERE `entry`=197342; -- Doodad_IceCrown_Door_02
-UPDATE `gameobject_template` SET `faction`=16 WHERE `entry`=164639; -- Frost Trap
-
-SET @Equip=10137; -- equipment_id
--- Template updates
-UPDATE `creature_template` SET `equipment_id`=@Equip+0 WHERE `entry`=17252; -- Felguard
-UPDATE `creature_template` SET `baseattacktime`=1800 WHERE `entry`=38112; -- Falric
-UPDATE `creature_template` SET `baseattacktime`=2000 WHERE `entry`=14881; -- Spider
-UPDATE `creature_template` SET `dynamicflags`=`dynamicflags`|4 WHERE `entry`=1412; -- Squirrel
-UPDATE `creature_template` SET `dynamicflags`=`dynamicflags`|4 WHERE `entry`=32428; -- Underbelly Rat
-UPDATE `creature_template` SET `dynamicflags`=`dynamicflags`|4,`unit_class`=4 WHERE `entry`=36774; -- Silver Covenant Agent
-UPDATE `creature_template` SET `equipment_id`=1221 WHERE `entry`=37221; -- Lady Jaina Proudmoore
-UPDATE `creature_template` SET `equipment_id`=637 WHERE `entry`=37582; -- Archmage Koreln
-UPDATE `creature_template` SET `exp`=0 WHERE `entry`=32206; -- Armored Brown Bear
-UPDATE `creature_template` SET `exp`=0 WHERE `entry`=32322; -- Gold Warrior
-UPDATE `creature_template` SET `exp`=0 WHERE `entry`=32328; -- [DND] Dalaran Sewer Arena - Controller - Death
-UPDATE `creature_template` SET `exp`=0 WHERE `entry`=32339; -- [DND] Dalaran Sewer Arena - Controller
-UPDATE `creature_template` SET `exp`=0 WHERE `entry`=32425; -- Galkara the Assassin
-UPDATE `creature_template` SET `exp`=0 WHERE `entry`=32435; -- Vern
-UPDATE `creature_template` SET `exp`=0 WHERE `entry`=32441; -- Underbelly Croc
-UPDATE `creature_template` SET `exp`=0 WHERE `entry`=32664; -- Segacedi
-UPDATE `creature_template` SET `exp`=0,`npcflag`=`npcflag`|130 WHERE `entry`=31032; -- Derek Odds
-UPDATE `creature_template` SET `exp`=0,`npcflag`=`npcflag`|3 WHERE `entry`=31081; -- Officer Van Rossem
-UPDATE `creature_template` SET `exp`=0,`npcflag`=`npcflag`|640 WHERE `entry`=32416; -- Stefen Cotter
-UPDATE `creature_template` SET `exp`=0,`unit_flags`=`unit_flags`|526592 WHERE `entry`=32321; -- Green Warrior
-UPDATE `creature_template` SET `exp`=0,`unit_flags`=`unit_flags`|526592 WHERE `entry`=32340; -- Gold Shaman
-UPDATE `creature_template` SET `exp`=0,`unit_flags`=`unit_flags`|526592 WHERE `entry`=32342; -- Green Paladin
-UPDATE `creature_template` SET `exp`=2 WHERE `entry`=37704; -- Frostmourne Altar Bunny (Quel'Delar)
-UPDATE `creature_template` SET `exp`=2,`minlevel`=82,`maxlevel`=82,`unit_flags`=`unit_flags`|33555200 WHERE `entry`=37849; -- Sartharion Image
-UPDATE `creature_template` SET `exp`=0,`unit_flags`=`unit_flags`|32768 WHERE `entry`=30755; -- Kor'kron Reaver
-UPDATE `creature_template` SET `minlevel`=60,`maxlevel`=60,`unit_flags`=`unit_flags`|33555200 WHERE `entry`=34984; -- World Trigger (Not Floating)
-UPDATE `creature_template` SET `minlevel`=75,`maxlevel`=75,`npcflag`=`npcflag`|4224,`unit_flags`=`unit_flags`|512 WHERE `entry`=33936; -- Nargle Lashcord
-UPDATE `creature_template` SET `minlevel`=75,`maxlevel`=75,`npcflag`=`npcflag`|4224,`unit_flags`=`unit_flags`|768 WHERE `entry`=33937; -- Xazi Smolderpipe
-UPDATE `creature_template` SET `minlevel`=75,`maxlevel`=75,`npcflag`=`npcflag`|4224,`unit_flags`=`unit_flags`|768 WHERE `entry`=33938; -- Zom Bocom
-UPDATE `creature_template` SET `unit_class`=4 WHERE `entry`=26125; -- Risen Ghoul
-UPDATE `creature_template` SET `unit_class`=8 WHERE `entry`=416; -- Imp
-UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=28690; -- Tassia Whisperglen
-UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=28708; -- Kizi Copperclip
-UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=28956; -- Warcaster Fanoraithe
-UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=28958; -- Jessa Weaver
-UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=29660; -- Grand Marauder Sai
-UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=29665; -- Pazik "The Pick" Prylock
-UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=30104; -- Adamman the Trader
-UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=30726; -- Archivist Betha
-UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=31136; -- High Warlord Uro
-UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=32169; -- Arcanist Braedin
-UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=32170; -- Magister Surdiel
-UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=32676; -- Grindle Firespark
-UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=32677; -- Whirt the All-Knowing
-UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=32678; -- Emeline Fizzlefry
-UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=32679; -- Darthalia Ebonscorch
-UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=32680; -- Fabioso the Fabulous
-UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=32681; -- The Magnificent Merleaux
-UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=32683; -- Grezla the Hag
-UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=32684; -- Mona Everspring
-UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=32685; -- Kitz Proudbreeze
-UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=32686; -- Crafticus Mindbender
-UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=32687; -- Linda Ann Kastinglow
-UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=32688; -- Archmage Tenaj
-UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=32689; -- Adorean Lew
-UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=32690; -- Bitty Frostflinger
-UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=32691; -- Magus Fansy Goodbringer
-UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=32692; -- Arcanist Alec
-UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=32693; -- Sabriana Sorrowgaze
-UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=32726; -- The Chooch
-UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=32727; -- Natalie Tootiblare
-UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=32728; -- Illusionist Karina
-UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=32729; -- Lofwyr Le'Fleur
-UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=32730; -- Goldlilly Gleamingfell
-UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=32731; -- Metopious Loreseeker
-UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=32732; -- Dorfus Alphamage
-UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=32733; -- Joboba Mezbreaker
-UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=33031; -- Sebastian Bower
-UPDATE `creature_template` SET `npcflag`=`npcflag`|1 WHERE `entry`=36856; -- Shandy Glossgleam
-UPDATE `creature_template` SET `npcflag`=`npcflag`|1,`unit_flags`=`unit_flags`|768 WHERE `entry`=35594; -- Brassbolt Mechawrench
-UPDATE `creature_template` SET `npcflag`=`npcflag`|1048577 WHERE `entry`=14990; -- Defilers Emissary
-UPDATE `creature_template` SET `npcflag`=`npcflag`|1048577 WHERE `entry`=14991; -- League of Arathor Emissary
-UPDATE `creature_template` SET `npcflag`=`npcflag`|1048577 WHERE `entry`=29533; -- Schembari "Uncle Sal" Shearbolt
-UPDATE `creature_template` SET `npcflag`=`npcflag`|1048577 WHERE `entry`=29568; -- "Techs" Rickard Rustbolt
-UPDATE `creature_template` SET `npcflag`=`npcflag`|1048577 WHERE `entry`=29667; -- Warsong Gulch Portal
-UPDATE `creature_template` SET `npcflag`=`npcflag`|1048577 WHERE `entry`=29668; -- Arathi Basin Portal
-UPDATE `creature_template` SET `npcflag`=`npcflag`|1048577 WHERE `entry`=29669; -- Alterac Valley Portal
-UPDATE `creature_template` SET `npcflag`=`npcflag`|1048577 WHERE `entry`=29670; -- Eye of the Storm Portal
-UPDATE `creature_template` SET `npcflag`=`npcflag`|1048577 WHERE `entry`=29671; -- Strand of the Ancients Portal
-UPDATE `creature_template` SET `npcflag`=`npcflag`|1048577 WHERE `entry`=29673; -- Arathi Basin Portal
-UPDATE `creature_template` SET `npcflag`=`npcflag`|1048577 WHERE `entry`=29675; -- Eye of the Storm Portal
-UPDATE `creature_template` SET `npcflag`=`npcflag`|1048577 WHERE `entry`=32330; -- Minzi the Minx
-UPDATE `creature_template` SET `npcflag`=`npcflag`|1048577 WHERE `entry`=32332; -- Ramik Slamwrench
-UPDATE `creature_template` SET `npcflag`=`npcflag`|1048577 WHERE `entry`=32333; -- "Dapper" Danik Blackshaft
-UPDATE `creature_template` SET `npcflag`=`npcflag`|1048577 WHERE `entry`=34952; -- Isle of Conquest Portal
-UPDATE `creature_template` SET `npcflag`=`npcflag`|1048577 WHERE `entry`=34953; -- Isle of Conquest Portal
-UPDATE `creature_template` SET `npcflag`=`npcflag`|1154 WHERE `entry`=29535; -- Alchemist Cinesra
-UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=28692; -- "Red" Jack Findle
-UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=28707; -- Angelo Pescatore
-UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=28715; -- Endora Moorehead
-UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=28721; -- Tiffany Cartier
-UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=28723; -- Larana Drome
-UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=28725; -- Patricia Egan
-UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=28726; -- Dominique Stefano
-UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=28727; -- Edward Egan
-UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=28728; -- Dorian Fines
-UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=28951; -- Breanni
-UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=28993; -- Aerith Primrose
-UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=28994; -- Abra Cadabra
-UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=29491; -- Karandonna
-UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=29495; -- Norvin Alderman
-UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=29510; -- Linna Bruder
-UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=29511; -- Lalla Brightweave
-UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=29512; -- Ainderu Summerleaf
-UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=29528; -- Debbi Moore
-UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=29529; -- Ninsianna
-UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=29548; -- Aimee
-UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=29628; -- Angelique Butler
-UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=29702; -- Chameli Banaphash
-UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=29703; -- Sheddle Glossgleam
-UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=29716; -- Clockwork Assistant
-UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=30885; -- Blazik Fireclaw
-UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=31579; -- Arcanist Adurin
-UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=31580; -- Arcanist Ivrenne
-UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=32172; -- Harold Winston
-UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=32216; -- Mei Francis
-UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=32334; -- Nixi Fireclaw
-UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=32509; -- Brammold Deepmine
-UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=32514; -- Vanessa Sellers
-UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=33027; -- Jessica Sellers
-UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=33964; -- Arcanist Firael
-UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=37942; -- Arcanist Uovril
-UPDATE `creature_template` SET `npcflag`=`npcflag`|128 WHERE `entry`=40160; -- Frozo the Renowned
-UPDATE `creature_template` SET `npcflag`=`npcflag`|128,`unit_flags`=`unit_flags`|32768 WHERE `entry`=35790; -- Usuri Brightcoin
-UPDATE `creature_template` SET `npcflag`=`npcflag`|128,`unit_flags`=`unit_flags`|768 WHERE `entry`=35494; -- Arcanist Miluria
-UPDATE `creature_template` SET `npcflag`=`npcflag`|128,`unit_flags`=`unit_flags`|768 WHERE `entry`=35507; -- Enchanter Isian
-UPDATE `creature_template` SET `npcflag`=`npcflag`|129 WHERE `entry`=28776; -- Elizabeth Ross
-UPDATE `creature_template` SET `npcflag`=`npcflag`|129 WHERE `entry`=29478; -- Jepetto Joybuzz
-UPDATE `creature_template` SET `npcflag`=`npcflag`|130 WHERE `entry`=28718; -- Ranid Glowergold
-UPDATE `creature_template` SET `npcflag`=`npcflag`|130 WHERE `entry`=29527; -- Orton Bennet
-UPDATE `creature_template` SET `npcflag`=`npcflag`|130 WHERE `entry`=32337; -- Christi Stockton
-UPDATE `creature_template` SET `npcflag`=`npcflag`|130 WHERE `entry`=32515; -- Braeg Stoutbeard
-UPDATE `creature_template` SET `npcflag`=`npcflag`|131,`unit_flags`=`unit_flags`|320 WHERE `entry`=15351; -- Alliance Brigadier General
-UPDATE `creature_template` SET `npcflag`=`npcflag`|131072 WHERE `entry`=29530; -- Binzik Goldbook
-UPDATE `creature_template` SET `npcflag`=`npcflag`|131072 WHERE `entry`=30604; -- Teller Almeida
-UPDATE `creature_template` SET `npcflag`=`npcflag`|131072 WHERE `entry`=30605; -- Teller Gee
-UPDATE `creature_template` SET `npcflag`=`npcflag`|131072 WHERE `entry`=30607; -- Teller Plushner
-UPDATE `creature_template` SET `npcflag`=`npcflag`|147 WHERE `entry`=28701; -- Timothy Jones
-UPDATE `creature_template` SET `npcflag`=`npcflag`|16 WHERE `entry`=28693; -- Enchanter Nalthanis
-UPDATE `creature_template` SET `npcflag`=`npcflag`|16 WHERE `entry`=28697; -- Timofey Oshenko
-UPDATE `creature_template` SET `npcflag`=`npcflag`|16 WHERE `entry`=28702; -- Professor Pallin
-UPDATE `creature_template` SET `npcflag`=`npcflag`|16 WHERE `entry`=28704; -- Dorothy Egan
-UPDATE `creature_template` SET `npcflag`=`npcflag`|16 WHERE `entry`=29509; -- Namha Moonwater
-UPDATE `creature_template` SET `npcflag`=`npcflag`|16 WHERE `entry`=29513; -- Didi the Wrench
-UPDATE `creature_template` SET `npcflag`=`npcflag`|16 WHERE `entry`=29514; -- Findle Whistlesteam
-UPDATE `creature_template` SET `npcflag`=`npcflag`|19 WHERE `entry`=28699; -- Charles Worth
-UPDATE `creature_template` SET `npcflag`=`npcflag`|19 WHERE `entry`=28703; -- Linzy Blackbolt
-UPDATE `creature_template` SET `npcflag`=`npcflag`|2 WHERE `entry`=30115; -- Vereesa Windrunner
-UPDATE `creature_template` SET `npcflag`=`npcflag`|2 WHERE `entry`=30116; -- Archmage Aethas Sunreaver
-UPDATE `creature_template` SET `npcflag`=`npcflag`|2 WHERE `entry`=30137; -- Shifty Vickers
-UPDATE `creature_template` SET `npcflag`=`npcflag`|2 WHERE `entry`=30490; -- Rin Duoctane
-UPDATE `creature_template` SET `npcflag`=`npcflag`|2 WHERE `entry`=31080; -- Warden Alturas
-UPDATE `creature_template` SET `npcflag`=`npcflag`|2 WHERE `entry`=32516; -- Washed-Up Mage
-UPDATE `creature_template` SET `npcflag`=`npcflag`|2 WHERE `entry`=36506; -- Daros Moonlance
-UPDATE `creature_template` SET `npcflag`=`npcflag`|2 WHERE `entry`=37776; -- Apprentice Nelphi
-UPDATE `creature_template` SET `npcflag`=`npcflag`|2 WHERE `entry`=37780; -- Dark Ranger Vorel
-UPDATE `creature_template` SET `npcflag`=`npcflag`|2,`unit_flags`=`unit_flags`|768 WHERE `entry`=35471; -- Sorn Proudmane
-UPDATE `creature_template` SET `npcflag`=`npcflag`|2176 WHERE `entry`=28714; -- Ildine Sorrowspear
-UPDATE `creature_template` SET `npcflag`=`npcflag`|2176 WHERE `entry`=29537; -- Darahir
-UPDATE `creature_template` SET `npcflag`=`npcflag`|2176 WHERE `entry`=29636; -- Hagatha Moorehead
-UPDATE `creature_template` SET `npcflag`=`npcflag`|262145 WHERE `entry`=29534; -- "Baroness" Llana
-UPDATE `creature_template` SET `npcflag`=`npcflag`|262145 WHERE `entry`=32329; -- Kanika Goldwell
-UPDATE `creature_template` SET `npcflag`=`npcflag`|3 WHERE `entry`=16128; -- Rhonin
-UPDATE `creature_template` SET `npcflag`=`npcflag`|3 WHERE `entry`=20735; -- Archmage Lan'dalock
-UPDATE `creature_template` SET `npcflag`=`npcflag`|3 WHERE `entry`=28160; -- Archmage Pentarus
-UPDATE `creature_template` SET `npcflag`=`npcflag`|3 WHERE `entry`=29156; -- Archmage Celindra
-UPDATE `creature_template` SET `npcflag`=`npcflag`|3 WHERE `entry`=31439; -- Archmage Timear
-UPDATE `creature_template` SET `npcflag`=`npcflag`|3 WHERE `entry`=36669; -- Arcanist Tybalin
-UPDATE `creature_template` SET `npcflag`=`npcflag`|384 WHERE `entry`=28691; -- Susana Averoy
-UPDATE `creature_template` SET `npcflag`=`npcflag`|384 WHERE `entry`=29493; -- Jarold Puller
-UPDATE `creature_template` SET `npcflag`=`npcflag`|4224 WHERE `entry`=28716; -- Palja Amboss
-UPDATE `creature_template` SET `npcflag`=`npcflag`|4224 WHERE `entry`=28722; -- Bryan Landers
-UPDATE `creature_template` SET `npcflag`=`npcflag`|4224 WHERE `entry`=28989; -- Aemara
-UPDATE `creature_template` SET `npcflag`=`npcflag`|4224 WHERE `entry`=28990; -- Anthony Durain
-UPDATE `creature_template` SET `npcflag`=`npcflag`|4224 WHERE `entry`=28991; -- Valaden Silverblade
-UPDATE `creature_template` SET `npcflag`=`npcflag`|4224 WHERE `entry`=28992; -- Valerie Langrom
-UPDATE `creature_template` SET `npcflag`=`npcflag`|4224 WHERE `entry`=28995; -- Paldesse
-UPDATE `creature_template` SET `npcflag`=`npcflag`|4224 WHERE `entry`=28997; -- Griselda Hunderland
-UPDATE `creature_template` SET `npcflag`=`npcflag`|4224 WHERE `entry`=29476; -- Dagna Flintlock
-UPDATE `creature_template` SET `npcflag`=`npcflag`|4224 WHERE `entry`=29494; -- Shen Kang Cheng
-UPDATE `creature_template` SET `npcflag`=`npcflag`|4224 WHERE `entry`=29496; -- Kerta the Bold
-UPDATE `creature_template` SET `npcflag`=`npcflag`|4224 WHERE `entry`=29497; -- Walther Whiteford
-UPDATE `creature_template` SET `npcflag`=`npcflag`|4224 WHERE `entry`=29499; -- Bartram Haller
-UPDATE `creature_template` SET `npcflag`=`npcflag`|4224 WHERE `entry`=29523; -- Bragund Brightlink
-UPDATE `creature_template` SET `npcflag`=`npcflag`|4224 WHERE `entry`=29538; -- Hexil Garrot
-UPDATE `creature_template` SET `npcflag`=`npcflag`|4224 WHERE `entry`=34252; -- Dubin Clay
-UPDATE `creature_template` SET `npcflag`=`npcflag`|4224 WHERE `entry`=35497; -- Rafael Langrom
-UPDATE `creature_template` SET `npcflag`=`npcflag`|4224 WHERE `entry`=35500; -- Matilda Brightlink
-UPDATE `creature_template` SET `npcflag`=`npcflag`|4224,`unit_flags`=`unit_flags`|512 WHERE `entry`=34095; -- Trapjaw Rix
-UPDATE `creature_template` SET `npcflag`=`npcflag`|4224,`unit_flags`=`unit_flags`|512 WHERE `entry`=35496; -- Rueben Lauren
-UPDATE `creature_template` SET `npcflag`=`npcflag`|4224,`unit_flags`=`unit_flags`|512 WHERE `entry`=35498; -- Horace Hunderland
-UPDATE `creature_template` SET `npcflag`=`npcflag`|640 WHERE `entry`=28682; -- Inzi Charmlight
-UPDATE `creature_template` SET `npcflag`=`npcflag`|640 WHERE `entry`=28685; -- Narisa Redgold
-UPDATE `creature_template` SET `npcflag`=`npcflag`|640 WHERE `entry`=29547; -- Applebough
-UPDATE `creature_template` SET `npcflag`=`npcflag`|640 WHERE `entry`=29714; -- Lucian Trias
-UPDATE `creature_template` SET `npcflag`=`npcflag`|640 WHERE `entry`=29715; -- Fialla Sweetberry
-UPDATE `creature_template` SET `npcflag`=`npcflag`|640 WHERE `entry`=32403; -- Sandra Bartan
-UPDATE `creature_template` SET `npcflag`=`npcflag`|640 WHERE `entry`=32421; -- Marcella Bloom
-UPDATE `creature_template` SET `npcflag`=`npcflag`|640 WHERE `entry`=32424; -- Laire Brewgold
-UPDATE `creature_template` SET `npcflag`=`npcflag`|640 WHERE `entry`=32426; -- Coira Longrifle
-UPDATE `creature_template` SET `npcflag`=`npcflag`|640 WHERE `entry`=33026; -- Sarah Brady
-UPDATE `creature_template` SET `npcflag`=`npcflag`|642 WHERE `entry`=29049; -- Arille Azuregaze
-UPDATE `creature_template` SET `npcflag`=`npcflag`|65536 WHERE `entry`=28686; -- Caliel Brightwillow
-UPDATE `creature_template` SET `npcflag`=`npcflag`|65536 WHERE `entry`=32411; -- Afsaneh Asrar
-UPDATE `creature_template` SET `npcflag`=`npcflag`|66177 WHERE `entry`=28687; -- Amisi Azuregaze
-UPDATE `creature_template` SET `npcflag`=`npcflag`|66177 WHERE `entry`=31557; -- Uda the Beast
-UPDATE `creature_template` SET `npcflag`=`npcflag`|66177 WHERE `entry`=32413; -- Isirami Fairwind
-UPDATE `creature_template` SET `npcflag`=`npcflag`|66179 WHERE `entry`=29532; -- Ajay Green
-UPDATE `creature_template` SET `npcflag`=`npcflag`|723 WHERE `entry`=28742; -- Marcia Chase
-UPDATE `creature_template` SET `npcflag`=`npcflag`|7296 WHERE `entry`=32641; -- Drix Blackwrench
-UPDATE `creature_template` SET `npcflag`=`npcflag`|786433 WHERE `entry`=28774; -- Andrew Matthews
-UPDATE `creature_template` SET `npcflag`=`npcflag`|80 WHERE `entry`=28694; -- Alard Schmied
-UPDATE `creature_template` SET `npcflag`=`npcflag`|80 WHERE `entry`=28698; -- Jedidiah Handers
-UPDATE `creature_template` SET `npcflag`=`npcflag`|80 WHERE `entry`=29505; -- Imindril Spearsong
-UPDATE `creature_template` SET `npcflag`=`npcflag`|80 WHERE `entry`=29506; -- Orland Schaeffer
-UPDATE `creature_template` SET `npcflag`=`npcflag`|82 WHERE `entry`=28706; -- Olisarra the Kind
-UPDATE `creature_template` SET `npcflag`=`npcflag`|83 WHERE `entry`=28705; -- Katherine Lee
-UPDATE `creature_template` SET `npcflag`=`npcflag`|896 WHERE `entry`=32642; -- Mojodishu
-UPDATE `creature_template` SET `unit_class`=4 WHERE `entry`=36774; -- Silver Covenant Agent
-UPDATE `creature_template` SET `unit_class`=4 WHERE `entry`=36776; -- Sunreaver Agent
-UPDATE `creature_template` SET `unit_flags`=`unit_flags`|32832,`equipment_id`=1819 WHERE `entry`=37225; -- Uther the Lightbringer
-UPDATE `creature_template` SET `unit_flags`=`unit_flags`|33555200 WHERE `entry`=35608; -- [DND] Dalaran Argent Tournament Herald Bunny
-UPDATE `creature_template` SET `unit_flags`=`unit_flags`|33555200 WHERE `entry`=37906; -- Imprisoned Soul
-UPDATE `creature_template` SET `unit_flags`=`unit_flags`|768 WHERE `entry`=34330; -- Jones
-UPDATE `creature_template` SET `unit_flags`=`unit_flags`|768 WHERE `entry`=35826; -- Kaye Toogie
-
--- Equipments
-DELETE FROM `creature_equip_template` WHERE `entry` IN (@Equip,@Equip+1);
-INSERT INTO `creature_equip_template` (`entry`,`equipentry1`,`equipentry2`,`equipentry3`) VALUES
-(@Equip+0,22199,0,0),
-(@Equip+1,50771,50781,0);
-
--- Creature addon updates
-DELETE FROM `creature_template_addon` WHERE `entry` IN (15351,16128,20735,23472,25171,26043,26119,27047,27870,28160,28332,28682,28685,28686,28687,28691,28692,28693,28694,28697,28698,28699,28701,28702,28703,28704,28705,28706,28707,28708,28714,28715,28716,28718,28721,28722,28723,28725,28726,28727,28728,28742,28774,28776,28956,28958,28989,28990,28991,28992,28993,28994,28995,28997,29049,29156,29238,29254,29255,29261,29325,29476,29478,29491,29493,29494,29495,29496,29497,29499,29505,29506,29509,29510,29511,29512,29513,29514,29523,29527,29528,29529,29530,29532,29533,29534,29535,29537,29538,29547,29548,29568,29628,29636,29640,29641,29660,29665,29667,29668,29669,29670,29671,29673,29675,29702,29703,29714,29715,29716,29763,29764,29765,29766,29777,29780,29781,29782,29783,29784,29785,29802,29807,29812,30094,30095,30104,30115,30116,30117,30137,30164,30352,30490,30604,30605,30607,30659,30726,30755,30885,31032,31080,31081,31228,31236,31439,31517,31557,31580,31643,31730,32169,32170,32172,32216,32249,32265,32321,32322,32328,32329,32330,32332,32333,32334,32337,32339,32340,32342,32403,32411,32413,32416,32421,32424,32425,32426,32428,32435,32441,32450,32451,32466,32470,32509,32514,32515,32516,32606,32641,32650,32651,32652,32653,32664,32668,32669,32675,32676,32677,32678,32679,32680,32681,32683,32684,32685,32686,32687,32688,32689,32690,32691,32692,32693,32709,32711,32721,32722,32723,32724,32725,32726,32727,32728,32729,32730,32731,32732,32733,32743,32744,32745,32746,32747,32749,32751,32843,32844,33026,33027,33422,33778,33936,33937,33938,33964,34095,34252,34330,34952,34953,34984,35471,35494,35496,35497,35498,35500,35507,35608,35790,35826,36506,36669,36774,36776,36851,36856,37221,37225,37226,37582,37704,37776,37780,37849,37906,37942,38112,38113,38172,38173,38175,38176,38177,38567,40160,7549);
-INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
-(15351,0,0,1,0, NULL), -- Alliance Brigadier General
-(16128,0,0,1,0, NULL), -- Rhonin
-(20735,0,0,1,0, NULL), -- Archmage Lan'dalock
-(23472,0,0,1,0, NULL), -- World Trigger (Large AOI, Not Immune PC/NPC)
-(25171,0,0,1,0, NULL), -- Invisible Stalker (Scale x0.5)
-(26043,0,0,1,0, NULL), -- Steam Burst
-(26119,0,0,1,0, NULL), -- Phoenix Hatchling
-(27047,0,0,1,0, NULL), -- Invisible Stalker (Floating Only)
-(27870,0,0,1,0, NULL), -- Wild Flower
-(28160,0,0,257,0, NULL), -- Archmage Pentarus
-(28332,0,0,1,0, NULL), -- Generic Trigger LAB (Large AOI)
-(28682,0,0,1,0, NULL), -- Inzi Charmlight
-(28685,0,0,1,0, NULL), -- Narisa Redgold
-(28686,0,0,1,0, NULL), -- Caliel Brightwillow
-(28687,0,0,257,0, NULL), -- Amisi Azuregaze
-(28691,0,0,257,0, NULL), -- Susana Averoy
-(28692,0,0,257,0, NULL), -- "Red" Jack Findle
-(28693,0,0,257,0, NULL), -- Enchanter Nalthanis
-(28694,0,0,257,0, NULL), -- Alard Schmied
-(28697,0,0,257,0, NULL), -- Timofey Oshenko
-(28698,0,0,257,0, NULL), -- Jedidiah Handers
-(28699,0,0,257,0, NULL), -- Charles Worth
-(28701,0,0,257,0, NULL), -- Timothy Jones
-(28702,0,0,257,0, NULL), -- Professor Pallin
-(28703,0,0,257,0, NULL), -- Linzy Blackbolt
-(28704,0,0,257,0, NULL), -- Dorothy Egan
-(28705,0,0,1,0, NULL), -- Katherine Lee
-(28706,0,0,257,0, NULL), -- Olisarra the Kind
-(28707,0,0,257,0, NULL), -- Angelo Pescatore
-(28708,0,0,257,0, NULL), -- Kizi Copperclip
-(28714,0,0,257,0, NULL), -- Ildine Sorrowspear
-(28715,0,0,257,0, NULL), -- Endora Moorehead
-(28716,0,0,257,0, NULL), -- Palja Amboss
-(28718,0,0,257,0, NULL), -- Ranid Glowergold
-(28721,0,0,257,0, NULL), -- Tiffany Cartier
-(28722,0,0,257,0, NULL), -- Bryan Landers
-(28723,0,0,257,0, NULL), -- Larana Drome
-(28725,0,0,257,0, NULL), -- Patricia Egan
-(28726,0,0,257,0, NULL), -- Dominique Stefano
-(28727,0,0,257,0, NULL), -- Edward Egan
-(28728,0,0,257,0, NULL), -- Dorian Fines
-(28742,0,0,257,0, NULL), -- Marcia Chase
-(28774,0,0,257,0, NULL), -- Andrew Matthews
-(28776,0,0,257,0, NULL), -- Elizabeth Ross
-(28956,0,0,257,0, NULL), -- Warcaster Fanoraithe
-(28958,0,0,257,0, NULL), -- Jessa Weaver
-(28989,0,0,258,0, NULL), -- Aemara
-(28990,0,0,257,0, NULL), -- Anthony Durain
-(28991,0,0,257,0, NULL), -- Valaden Silverblade
-(28992,0,0,257,0, NULL), -- Valerie Langrom
-(28993,0,0,1,0, NULL), -- Aerith Primrose
-(28994,0,0,257,0, NULL), -- Abra Cadabra
-(28995,0,0,257,0, NULL), -- Paldesse
-(28997,0,0,257,0, NULL), -- Griselda Hunderland
-(29049,0,0,1,0, NULL), -- Arille Azuregaze
-(29156,0,0,257,0, NULL), -- Archmage Celindra
-(29238,0,0,1,0, NULL), -- Scourge Haunt
-(29254,0,0,1,0, NULL), -- Silver Covenant Guardian Mage
-(29255,0,0,1,0, NULL), -- Sunreaver Guardian Mage
-(29261,0,0,2,0, NULL), -- Windle Sparkshine
-(29325,0,0,1,379, NULL), -- Torgo the Younger
-(29476,0,0,258,0, NULL), -- Dagna Flintlock
-(29478,0,0,257,0, NULL), -- Jepetto Joybuzz
-(29491,0,0,257,0, NULL), -- Karandonna
-(29493,0,0,257,0, NULL), -- Jarold Puller
-(29494,0,0,257,0, NULL), -- Shen Kang Cheng
-(29495,0,0,257,0, NULL), -- Norvin Alderman
-(29496,0,0,257,0, NULL), -- Kerta the Bold
-(29497,0,0,257,69, NULL), -- Walther Whiteford
-(29499,0,0,257,0, NULL), -- Bartram Haller
-(29505,0,0,257,233, NULL), -- Imindril Spearsong
-(29506,0,0,257,0, NULL), -- Orland Schaeffer
-(29509,0,0,257,0, NULL), -- Namha Moonwater
-(29510,0,0,257,0, NULL), -- Linna Bruder
-(29511,0,0,257,0, NULL), -- Lalla Brightweave
-(29512,0,0,257,69, NULL), -- Ainderu Summerleaf
-(29513,0,0,257,0, NULL), -- Didi the Wrench
-(29514,0,0,257,0, NULL), -- Findle Whistlesteam
-(29523,0,0,257,0, NULL), -- Bragund Brightlink
-(29527,0,0,257,0, NULL), -- Orton Bennet
-(29528,0,0,257,0, NULL), -- Debbi Moore
-(29529,0,0,257,0, NULL), -- Ninsianna
-(29530,0,0,257,0, NULL), -- Binzik Goldbook
-(29532,0,0,257,0, NULL), -- Ajay Green
-(29533,0,0,1,0, NULL), -- Schembari "Uncle Sal" Shearbolt
-(29534,0,0,1,0, NULL), -- "Baroness" Llana
-(29535,0,0,257,0, NULL), -- Alchemist Cinesra
-(29537,0,0,257,0, NULL), -- Darahir
-(29538,0,0,257,0, NULL), -- Hexil Garrot
-(29547,0,0,257,0, NULL), -- Applebough
-(29548,0,0,257,0, NULL), -- Aimee
-(29568,0,0,1,0, NULL), -- "Techs" Rickard Rustbolt
-(29628,0,0,257,0, NULL), -- Angelique Butler
-(29636,0,0,257,0, NULL), -- Hagatha Moorehead
-(29640,0,0,257,0, NULL), -- Josie Birch
-(29641,0,0,257,0, NULL), -- Theresa Wolf
-(29660,0,0,1,0, NULL), -- Grand Marauder Sai
-(29665,0,0,1,0, NULL), -- Pazik "The Pick" Prylock
-(29667,0,0,1,0, NULL), -- Warsong Gulch Portal
-(29668,0,0,1,0, NULL), -- Arathi Basin Portal
-(29669,0,0,1,0, NULL), -- Alterac Valley Portal
-(29670,0,0,1,0, NULL), -- Eye of the Storm Portal
-(29671,0,0,1,0, NULL), -- Strand of the Ancients Portal
-(29673,0,0,1,0, NULL), -- Arathi Basin Portal
-(29675,0,0,1,0, NULL), -- Eye of the Storm Portal
-(29702,0,0,257,0, NULL), -- Chameli Banaphash
-(29703,0,0,257,0, NULL), -- Sheddle Glossgleam
-(29714,0,0,1,0, NULL), -- Lucian Trias
-(29715,0,0,257,0, NULL), -- Fialla Sweetberry
-(29716,0,0,257,0, NULL), -- Clockwork Assistant
-(29763,0,0,1,0, NULL), -- Cosmetic Totem Alliance Air
-(29764,0,0,1,0, NULL), -- Cosmetic Totem Alliance Earth
-(29765,0,0,1,0, NULL), -- Cosmetic Totem Alliance Fire
-(29766,0,0,1,0, NULL), -- Cosmetic Totem Alliance Water
-(29777,0,0,1,0, NULL), -- Cosmetic Mechanical Gorilla
-(29780,0,0,1,0, NULL), -- Cosmetic Mechanical Chicken
-(29781,0,0,1,0, NULL), -- Cosmetic Mechanical Squirrel
-(29782,0,0,1,0, NULL), -- Cosmetic Mechanical Sheep
-(29783,0,0,1,0, NULL), -- Cosmetic Clockwork Robot
-(29784,0,0,1,0, NULL), -- Cosmetic Clockwork Robot (Blue)
-(29785,0,0,1,0, NULL), -- Cosmetic Clockwork Robot (Red)
-(29802,0,0,1,0, NULL), -- Cosmetic Toy Plane
-(29807,0,0,1,0, NULL), -- [DND] Dalaran Toy Store Plane String Hook
-(29812,0,0,1,0, NULL), -- [DND] Dalaran Toy Store Plane String Bunny
-(30094,0,0,1,0, NULL), -- Dalaran Sewer Rat
-(30095,0,0,1,0, NULL), -- Dalaran Sewer Turtle
-(30104,0,1,257,0, NULL), -- Adamman the Trader
-(30115,0,0,2,0, NULL), -- Vereesa Windrunner
-(30116,0,0,1,0, NULL), -- Archmage Aethas Sunreaver
-(30117,0,0,1,0, NULL), -- Archmage Modera
-(30137,0,0,1,0, NULL), -- Shifty Vickers
-(30164,0,0,133121,0, NULL), -- Cavedweller Worg
-(30352,0,0,256,0, NULL), -- Skybreaker Marine
-(30490,0,0,1,0, NULL), -- Rin Duoctane
-(30604,0,0,257,0, NULL), -- Teller Almeida
-(30605,0,0,257,0, NULL), -- Teller Gee
-(30607,0,0,257,0, NULL), -- Teller Plushner
-(30659,0,0,1,0, NULL), -- Violet Hold Guard
-(30726,0,0,257,0, NULL), -- Archivist Betha
-(30755,0,0,256,0, NULL), -- Kor'kron Reaver
-(30885,0,0,1,0, NULL), -- Blazik Fireclaw
-(31032,0,0,1,0, NULL), -- Derek Odds
-(31080,0,0,1,0, NULL), -- Warden Alturas
-(31081,0,0,1,0, NULL), -- Officer Van Rossem
-(31228,0,0,1,0, NULL), -- Grove Walker
-(31236,0,0,1,0, NULL), -- Dappled Stag
-(31439,0,0,1,0, NULL), -- Archmage Timear
-(31517,0,0,1,0, NULL), -- Dalaran Fountain Invis Stalker
-(31557,0,0,1,0, NULL), -- Uda the Beast
-(31580,0,0,1,0, NULL), -- Arcanist Ivrenne
-(31643,0,0,1,0, NULL), -- Dalaran Well Teleport Bunny
-(31730,0,0,1,0, NULL), -- Cosmetic Frog
-(32169,0,0,1,0, NULL), -- Arcanist Braedin
-(32170,0,0,1,0, NULL), -- Magister Surdiel
-(32172,0,0,257,0, NULL), -- Harold Winston
-(32216,0,0,257,0, NULL), -- Mei Francis
-(32249,0,0,1,0, NULL), -- Worg Pup
-(32265,0,50331648,1,0, NULL), -- Northrend Daily Dungeon Image Bunny
-(32321,0,0,1,0, NULL), -- Green Warrior
-(32322,0,0,1,0, NULL), -- Gold Warrior
-(32328,0,0,1,0, NULL), -- [DND] Dalaran Sewer Arena - Controller - Death
-(32329,0,0,1,0, NULL), -- Kanika Goldwell
-(32330,0,0,1,0, NULL), -- Minzi the Minx
-(32332,0,0,1,0, NULL), -- Ramik Slamwrench
-(32333,0,0,1,0, NULL), -- "Dapper" Danik Blackshaft
-(32334,0,0,1,0, NULL), -- Nixi Fireclaw
-(32337,0,0,257,0, NULL), -- Christi Stockton
-(32339,0,0,1,0, NULL), -- [DND] Dalaran Sewer Arena - Controller
-(32340,0,0,1,0, NULL), -- Gold Shaman
-(32342,0,0,1,0, NULL), -- Green Paladin
-(32403,0,0,1,0, NULL), -- Sandra Bartan
-(32411,0,0,257,0, NULL), -- Afsaneh Asrar
-(32413,0,0,1,0, NULL), -- Isirami Fairwind
-(32416,0,0,1,0, NULL), -- Stefen Cotter
-(32421,0,0,1,0, NULL), -- Marcella Bloom
-(32424,0,0,1,0, NULL), -- Laire Brewgold
-(32425,0,0,1,0, NULL), -- Galkara the Assassin
-(32426,0,0,1,0, NULL), -- Coira Longrifle
-(32428,0,0,1,0, NULL), -- Underbelly Rat
-(32435,0,0,1,0, NULL), -- Vern
-(32441,0,0,1,0, NULL), -- Underbelly Croc
-(32450,0,3,1,0, NULL), -- Badluck
-(32451,0,0,257,0, NULL), -- Dalaran Citizen
-(32466,0,0,1,0, NULL), -- Monstrous Underbelly Rat
-(32470,0,0,1,0, NULL), -- Sewer Frog
-(32509,0,0,257,0, NULL), -- Brammold Deepmine
-(32514,0,0,257,0, NULL), -- Vanessa Sellers
-(32515,0,0,257,0, NULL), -- Braeg Stoutbeard
-(32516,0,3,257,0, NULL), -- Washed-Up Mage
-(32606,0,0,1,0, NULL), -- [DND] Cosmetic Book
-(32641,0,0,1,0, NULL), -- Drix Blackwrench
-(32650,0,3,1,0, NULL), -- Wounded Dalaran Protector
-(32651,0,7,1,0, NULL), -- Wounded Dalaran Shield Guard
-(32652,0,3,1,0, NULL), -- Wounded Dalaran Watcher
-(32653,0,7,1,0, NULL), -- Wounded Dalaran Serpent
-(32664,0,0,1,0, NULL), -- Segacedi
-(32668,0,0,257,0, NULL), -- Emi
-(32669,0,0,257,0, NULL), -- Colin
-(32675,0,0,257,0, NULL), -- Babagahnoosh the Grumpy
-(32676,0,0,257,0, NULL), -- Grindle Firespark
-(32677,0,0,257,0, NULL), -- Whirt the All-Knowing
-(32678,0,0,257,0, NULL), -- Emeline Fizzlefry
-(32679,0,0,257,0, NULL), -- Darthalia Ebonscorch
-(32680,0,0,257,0, NULL), -- Fabioso the Fabulous
-(32681,0,0,257,0, NULL), -- The Magnificent Merleaux
-(32683,0,0,257,0, NULL), -- Grezla the Hag
-(32684,0,0,257,0, NULL), -- Mona Everspring
-(32685,0,0,257,0, NULL), -- Kitz Proudbreeze
-(32686,0,0,257,0, NULL), -- Crafticus Mindbender
-(32687,0,0,257,0, NULL), -- Linda Ann Kastinglow
-(32688,0,0,257,0, NULL), -- Archmage Tenaj
-(32689,0,0,257,0, NULL), -- Adorean Lew
-(32690,0,0,257,0, NULL), -- Bitty Frostflinger
-(32691,0,0,257,0, NULL), -- Magus Fansy Goodbringer
-(32692,0,0,257,0, NULL), -- Arcanist Alec
-(32693,0,0,257,0, NULL), -- Sabriana Sorrowgaze
-(32709,0,0,1,0, NULL), -- Hunaka Greenhoof
-(32711,0,0,1,0, NULL), -- Warp-Huntress Kula
-(32721,0,0,1,0, NULL), -- Felcaster Virim
-(32722,0,0,1,0, NULL), -- Warmage Lukems
-(32723,0,0,257,0, NULL), -- Warmage Kath'leen
-(32724,0,0,1,0, NULL), -- Warmage Mumplina
-(32725,0,0,1,0, NULL), -- Warmage Silva
-(32726,0,0,257,0, NULL), -- The Chooch
-(32727,0,0,257,0, NULL), -- Natalie Tootiblare
-(32728,0,0,257,0, NULL), -- Illusionist Karina
-(32729,0,0,257,0, NULL), -- Lofwyr Le'Fleur
-(32730,0,0,257,0, NULL), -- Goldlilly Gleamingfell
-(32731,0,0,257,0, NULL), -- Metopious Loreseeker
-(32732,0,0,257,0, NULL), -- Dorfus Alphamage
-(32733,0,0,257,0, NULL), -- Joboba Mezbreaker
-(32743,0,1,1,0, NULL), -- Willard Blauvelt
-(32744,0,0,1,0, NULL), -- Bakor the Gangly
-(32745,0,0,1,0, NULL), -- Amera Sky
-(32746,0,0,1,0, NULL), -- Geffon the Unruly
-(32747,0,0,1,0, NULL), -- Mendez Nightshadow
-(32749,0,1,1,0, NULL), -- Tuff Gorehoof
-(32751,0,0,1,0, NULL), -- Backbiter
-(32843,0,0,1,0, NULL), -- Tabea
-(32844,0,0,1,0, NULL), -- Apollo
-(33026,0,0,1,0, NULL), -- Sarah Brady
-(33027,0,0,257,0, NULL), -- Jessica Sellers
-(33422,0,0,1,0, NULL), -- Unbound Seer
-(33778,0,1,1,0, NULL), -- Tournament Hippogryph
-(33936,0,0,1,0, NULL), -- Nargle Lashcord
-(33937,0,0,1,0, NULL), -- Xazi Smolderpipe
-(33938,0,0,1,0, NULL), -- Zom Bocom
-(33964,0,0,1,0, NULL), -- Arcanist Firael
-(34095,0,0,1,0, NULL), -- Trapjaw Rix
-(34252,0,0,257,0, NULL), -- Dubin Clay
-(34330,0,3,1,0, NULL), -- Jones
-(34952,0,0,1,0, NULL), -- Isle of Conquest Portal
-(34953,0,0,1,0, NULL), -- Isle of Conquest Portal
-(34984,0,0,1,0, NULL), -- World Trigger (Not Floating)
-(35471,0,0,1,0, NULL), -- Sorn Proudmane
-(35494,0,0,1,0, NULL), -- Arcanist Miluria
-(35496,0,0,257,0, NULL), -- Rueben Lauren
-(35497,0,0,257,0, NULL), -- Rafael Langrom
-(35498,0,0,257,0, NULL), -- Horace Hunderland
-(35500,0,0,257,0, NULL), -- Matilda Brightlink
-(35507,0,0,1,0, NULL), -- Enchanter Isian
-(35608,0,0,1,0, NULL), -- [DND] Dalaran Argent Tournament Herald Bunny
-(35790,0,0,257,0, NULL), -- Usuri Brightcoin
-(35826,0,1,1,0, NULL), -- Kaye Toogie
-(36506,0,0,1,0, NULL), -- Daros Moonlance
-(36669,0,0,1,0, NULL), -- Arcanist Tybalin
-(36774,0,0,1,0, NULL), -- Silver Covenant Agent
-(36776,0,0,1,0, NULL), -- Sunreaver Agent
-(36851,0,0,1,0, NULL), -- Aquanos
-(36856,0,0,1,0, NULL), -- Shandy Glossgleam
-(37221,0,0,1,0, NULL), -- Lady Jaina Proudmoore
-(37225,0,0,0,0, NULL), -- Uther the Lightbringer
-(37226,0,0,1,0, NULL), -- The Lich King
-(37582,0,0,1,0, NULL), -- Archmage Koreln
-(37704,0,0,1,0, NULL), -- Frostmourne Altar Bunny (Quel'Delar)
-(37776,0,0,1,0, NULL), -- Apprentice Nelphi
-(37780,0,0,2,0, NULL), -- Dark Ranger Vorel
-(37849,0,50331648,0,0, NULL), -- Sartharion Image
-(37906,0,50331648,1,0, NULL), -- Imprisoned Soul
-(37942,0,0,1,0, NULL), -- Arcanist Uovril
-(38112,0,0,1,0, NULL), -- Falric
-(38113,0,0,1,0, NULL), -- Marwyn
-(38172,0,0,1,0, NULL), -- Phantom Mage
-(38173,0,0,1,0, NULL), -- Spectral Footman
-(38175,0,0,1,0, NULL), -- Ghostly Priest
-(38176,0,0,1,0, NULL), -- Tortured Rifleman
-(38177,0,0,1,0, NULL), -- Shadowy Mercenary
-(38567,0,0,1,0, NULL), -- Phantom Hallucination
-(40160,31837,0,257,0, NULL), -- Frozo the Renowned
-(7549,0,0,1,0, NULL); -- Tree Frog
-
--- Model updates
-UPDATE `creature_model_info` SET `bounding_radius`=0,`combat_reach`=0,`gender`=2 WHERE `modelid`=22471; -- Tournament Hippogryph
-UPDATE `creature_model_info` SET `bounding_radius`=0,`combat_reach`=0,`gender`=2 WHERE `modelid`=26484; -- Alterac Valley Portal
-UPDATE `creature_model_info` SET `bounding_radius`=0,`combat_reach`=0,`gender`=2 WHERE `modelid`=26495; -- Arathi Basin Portal
-UPDATE `creature_model_info` SET `bounding_radius`=0,`combat_reach`=0,`gender`=2 WHERE `modelid`=26496; -- Arathi Basin Portal
-UPDATE `creature_model_info` SET `bounding_radius`=0,`combat_reach`=0,`gender`=2 WHERE `modelid`=26499; -- Eye of the Storm Portal
-UPDATE `creature_model_info` SET `bounding_radius`=0,`combat_reach`=0,`gender`=2 WHERE `modelid`=26501; -- Eye of the Storm Portal
-UPDATE `creature_model_info` SET `bounding_radius`=0,`combat_reach`=0,`gender`=2 WHERE `modelid`=26502; -- Warsong Gulch Portal
-UPDATE `creature_model_info` SET `bounding_radius`=0,`combat_reach`=0,`gender`=2 WHERE `modelid`=26504; -- Strand of the Ancients Portal
-UPDATE `creature_model_info` SET `bounding_radius`=0,`combat_reach`=0,`gender`=2 WHERE `modelid`=29743; -- Isle of Conquest Portal
-UPDATE `creature_model_info` SET `bounding_radius`=0,`combat_reach`=0,`gender`=2 WHERE `modelid`=29744; -- Isle of Conquest Portal
-UPDATE `creature_model_info` SET `bounding_radius`=0,`combat_reach`=1,`gender`=0 WHERE `modelid`=251; -- Colin
-UPDATE `creature_model_info` SET `bounding_radius`=0,`combat_reach`=1,`gender`=1 WHERE `modelid`=21270; -- Dalaran Visitor
-UPDATE `creature_model_info` SET `bounding_radius`=0,`combat_reach`=1,`gender`=1 WHERE `modelid`=80; -- Emi
-UPDATE `creature_model_info` SET `bounding_radius`=0,`combat_reach`=1,`gender`=2 WHERE `modelid`=2176; -- Cosmetic Rat
-UPDATE `creature_model_info` SET `bounding_radius`=0,`combat_reach`=1,`gender`=2 WHERE `modelid`=25870; -- Mekgineer's Chopper
-UPDATE `creature_model_info` SET `bounding_radius`=0,`combat_reach`=2,`gender`=2 WHERE `modelid`=26759; -- Dalaran Sewer Rat
-UPDATE `creature_model_info` SET `bounding_radius`=0,`combat_reach`=4,`gender`=2 WHERE `modelid`=27243; -- Wooly Mammoth
-UPDATE `creature_model_info` SET `bounding_radius`=0,`combat_reach`=4,`gender`=2 WHERE `modelid`=27972; -- Monstrous Underbelly Rat
-UPDATE `creature_model_info` SET `bounding_radius`=0.00235,`combat_reach`=0,`gender`=2 WHERE `modelid`=7804; -- [DND] Dalaran Argent Tournament Herald Bunny
-UPDATE `creature_model_info` SET `bounding_radius`=0.03,`combat_reach`=0,`gender`=2 WHERE `modelid`=26557; -- Cosmetic Toy Plane
-UPDATE `creature_model_info` SET `bounding_radius`=0.0937,`combat_reach`=0,`gender`=2 WHERE `modelid`=26530; -- Cosmetic Clockwork Robot (Blue)
-UPDATE `creature_model_info` SET `bounding_radius`=0.0937,`combat_reach`=0,`gender`=2 WHERE `modelid`=26531; -- Cosmetic Clockwork Robot (Red)
-UPDATE `creature_model_info` SET `bounding_radius`=0.0937,`combat_reach`=0,`gender`=2 WHERE `modelid`=26547; -- Cosmetic Clockwork Robot
-UPDATE `creature_model_info` SET `bounding_radius`=0.1,`combat_reach`=0,`gender`=2 WHERE `modelid`=24897; -- Wild Flower
-UPDATE `creature_model_info` SET `bounding_radius`=0.1,`combat_reach`=0,`gender`=2 WHERE `modelid`=24898; -- Wild Flower
-UPDATE `creature_model_info` SET `bounding_radius`=0.12,`combat_reach`=0,`gender`=2 WHERE `modelid`=24895; -- Wild Flower
-UPDATE `creature_model_info` SET `bounding_radius`=0.125,`combat_reach`=0,`gender`=2 WHERE `modelid`=17188; -- Invisible Stalker (Scale x0.5)
-UPDATE `creature_model_info` SET `bounding_radius`=0.125,`combat_reach`=0,`gender`=2 WHERE `modelid`=17200; -- Northrend Daily Dungeon Image Bunny
-UPDATE `creature_model_info` SET `bounding_radius`=0.15,`combat_reach`=0,`gender`=2 WHERE `modelid`=23574; -- Phoenix Hatchling
-UPDATE `creature_model_info` SET `bounding_radius`=0.175,`combat_reach`=0,`gender`=2 WHERE `modelid`=23501; -- Steam Burst
-UPDATE `creature_model_info` SET `bounding_radius`=0.18,`combat_reach`=1,`gender`=2 WHERE `modelid`=30799; -- Sartharion Image
-UPDATE `creature_model_info` SET `bounding_radius`=0.186,`combat_reach`=0,`gender`=2 WHERE `modelid`=28212; -- Backbiter
-UPDATE `creature_model_info` SET `bounding_radius`=0.187,`combat_reach`=0,`gender`=2 WHERE `modelid`=1160; -- Spider
-UPDATE `creature_model_info` SET `bounding_radius`=0.187,`combat_reach`=0,`gender`=2 WHERE `modelid`=2536; -- Spider
-UPDATE `creature_model_info` SET `bounding_radius`=0.2,`combat_reach`=0,`gender`=2 WHERE `modelid`=26517; -- Cosmetic Totem Alliance Air
-UPDATE `creature_model_info` SET `bounding_radius`=0.2,`combat_reach`=0,`gender`=2 WHERE `modelid`=26518; -- Cosmetic Totem Alliance Earth
-UPDATE `creature_model_info` SET `bounding_radius`=0.2,`combat_reach`=0,`gender`=2 WHERE `modelid`=26519; -- Cosmetic Totem Alliance Fire
-UPDATE `creature_model_info` SET `bounding_radius`=0.2,`combat_reach`=0,`gender`=2 WHERE `modelid`=26521; -- Cosmetic Totem Alliance Water
-UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=15253; -- League of Arathor Emissary
-UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=25605; -- Amisi Azuregaze
-UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=25608; -- Susana Averoy
-UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=25620; -- Dorothy Egan
-UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=25621; -- Katherine Lee
-UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=25636; -- Endora Moorehead
-UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=25637; -- Palja Amboss
-UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=25645; -- Tiffany Cartier
-UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=25647; -- Larana Drome
-UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=25648; -- Patricia Egan
-UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=25649; -- Dominique Stefano
-UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=25655; -- Marcia Chase
-UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=25674; -- Elizabeth Ross
-UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=25807; -- Jessa Weaver
-UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=25878; -- Valerie Langrom
-UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=25880; -- Abra Cadabra
-UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=25881; -- Griselda Hunderland
-UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=25983; -- Aerith Primrose
-UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=26311; -- Kerta the Bold
-UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=26377; -- Linna Bruder
-UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=26390; -- Angelique Butler
-UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=26396; -- Debbi Moore
-UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=26397; -- Hagatha Moorehead
-UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=26398; -- Josie Birch
-UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=26414; -- Grand Marauder Sai
-UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=26438; -- Chameli Banaphash
-UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=26440; -- Christi Stockton
-UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=27287; -- Archivist Betha
-UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=27782; -- Theresa Wolf
-UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=27822; -- Mei Francis
-UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=27944; -- Warmage Mumplina
-UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=27952; -- Sandra Bartan
-UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=27954; -- Afsaneh Asrar
-UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=27962; -- Marcella Bloom
-UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=27999; -- Vanessa Sellers
-UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=28125; -- Wounded Dalaran Watcher
-UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=28150; -- Grezla the Hag
-UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=28155; -- Linda Ann Kastinglow
-UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=28166; -- Illusionist Karina
-UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=28202; -- Amera Sky
-UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=28317; -- Tabea
-UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=28433; -- Jessica Sellers
-UPDATE `creature_model_info` SET `bounding_radius`=0.208,`combat_reach`=1,`gender`=1 WHERE `modelid`=30764; -- Apprentice Nelphi
-UPDATE `creature_model_info` SET `bounding_radius`=0.2288,`combat_reach`=1,`gender`=1 WHERE `modelid`=24916; -- Warmage Kath'leen
-UPDATE `creature_model_info` SET `bounding_radius`=0.2288,`combat_reach`=1,`gender`=1 WHERE `modelid`=25947; -- Archmage Celindra
-UPDATE `creature_model_info` SET `bounding_radius`=0.236,`combat_reach`=1,`gender`=1 WHERE `modelid`=27333; -- Kor'kron Reaver
-UPDATE `creature_model_info` SET `bounding_radius`=0.236,`combat_reach`=1,`gender`=1 WHERE `modelid`=28185; -- Warp-Huntress Kula
-UPDATE `creature_model_info` SET `bounding_radius`=0.236,`combat_reach`=1,`gender`=1 WHERE `modelid`=28208; -- Galkara the Assassin
-UPDATE `creature_model_info` SET `bounding_radius`=0.2429,`combat_reach`=1,`gender`=2 WHERE `modelid`=850; -- Felhunter
-UPDATE `creature_model_info` SET `bounding_radius`=0.25,`combat_reach`=0,`gender`=2 WHERE `modelid`=16259; -- Dalaran Sewer Turtle
-UPDATE `creature_model_info` SET `bounding_radius`=0.25,`combat_reach`=0,`gender`=2 WHERE `modelid`=5448; -- Cosmetic Cat Set 2/2
-UPDATE `creature_model_info` SET `bounding_radius`=0.25,`combat_reach`=0,`gender`=2 WHERE `modelid`=5554; -- Jones
-UPDATE `creature_model_info` SET `bounding_radius`=0.25,`combat_reach`=0,`gender`=2 WHERE `modelid`=5556; -- Badluck
-UPDATE `creature_model_info` SET `bounding_radius`=0.25,`combat_reach`=0,`gender`=2 WHERE `modelid`=5966; -- Wounded Dalaran Serpent
-UPDATE `creature_model_info` SET `bounding_radius`=0.26,`combat_reach`=1,`gender`=1 WHERE `modelid`=26771; -- Archmage Modera
-UPDATE `creature_model_info` SET `bounding_radius`=0.2625,`combat_reach`=0,`gender`=2 WHERE `modelid`=26524; -- Cosmetic Mechanical Gorilla
-UPDATE `creature_model_info` SET `bounding_radius`=0.263347,`combat_reach`=0,`gender`=2 WHERE `modelid`=16885; -- Ravager Specimen
-UPDATE `creature_model_info` SET `bounding_radius`=0.275,`combat_reach`=0,`gender`=2 WHERE `modelid`=28318; -- Apollo
-UPDATE `creature_model_info` SET `bounding_radius`=0.2912,`combat_reach`=2,`gender`=1 WHERE `modelid`=30977; -- Phantom Hallucination
-UPDATE `creature_model_info` SET `bounding_radius`=0.2912,`combat_reach`=2,`gender`=1 WHERE `modelid`=30977; -- Phantom Mage
-UPDATE `creature_model_info` SET `bounding_radius`=0.3,`combat_reach`=0,`gender`=2 WHERE `modelid`=27720; -- Cosmetic Worg Pup
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=23337; -- Warmage Silva
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=24607; -- Sebastian Bower
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=25166; -- Archmage Pentarus
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=25609; -- "Red" Jack Findle
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=25611; -- Alard Schmied
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=25613; -- Timofey Oshenko
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=25614; -- Jedidiah Handers
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=25615; -- Charles Worth
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=25623; -- Angelo Pescatore
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=25646; -- Bryan Landers
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=25650; -- Edward Egan
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=25651; -- Dorian Fines
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=25673; -- Andrew Matthews
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=25876; -- Anthony Durain
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=26075; -- Timothy Jones
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=26138; -- Torgo the Younger
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=26307; -- Jarold Puller
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=26309; -- Shen Kang Cheng
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=26310; -- Norvin Alderman
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=26312; -- Walther Whiteford
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=26313; -- Bartram Haller
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=26338; -- Orland Schaeffer
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=26362; -- Schembari "Uncle Sal" Shearbolt
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=26372; -- Binzik Goldbook
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=26373; -- Ajay Green
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=26391; -- "Techs" Rickard Rustbolt
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=26395; -- Orton Bennet
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=26417; -- Pazik "The Pick" Prylock
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=26444; -- Hexil Garrot
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=26445; -- Alchemist Cinesra
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=26463; -- Nargle Lashcord
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=26465; -- Zom Bocom
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=26766; -- Adamman the Trader
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=26779; -- Shifty Vickers
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=26997; -- Skybreaker Marine
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=26998; -- Skybreaker Marine
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=27068; -- Rin Duoctane
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=27157; -- Teller Almeida
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=27158; -- Teller Gee
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=27160; -- Teller Plushner
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=27334; -- Kor'kron Reaver
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=27398; -- Blazik Fireclaw
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=27449; -- Derek Odds
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=27799; -- Harold Winston
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=27910; -- Ramik Slamwrench
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=27911; -- "Dapper" Danik Blackshaft
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=27915; -- Lucian Trias
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=27958; -- Stefen Cotter
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=28006; -- Washed-Up Mage
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=28120; -- Drix Blackwrench
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=28123; -- Wounded Dalaran Protector
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=28124; -- Wounded Dalaran Shield Guard
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=28145; -- Whirt the All-Knowing
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=28149; -- The Magnificent Merleaux
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=28154; -- Crafticus Mindbender
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=28159; -- Adorean Lew
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=28161; -- Magus Fansy Goodbringer
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=28164; -- The Chooch
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=28203; -- Geffon the Unruly
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=29833; -- Horace Hunderland
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=29835; -- Rafael Langrom
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=29836; -- Rueben Lauren
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=30685; -- Archmage Koreln
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=1 WHERE `modelid`=25955; -- Kizi Copperclip
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=1 WHERE `modelid`=26335; -- Namha Moonwater
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=1 WHERE `modelid`=26347; -- Ninsianna
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=1 WHERE `modelid`=26375; -- Didi the Wrench
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=1 WHERE `modelid`=26386; -- "Baroness" Llana
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=1 WHERE `modelid`=26464; -- Xazi Smolderpipe
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=1 WHERE `modelid`=27908; -- Kanika Goldwell
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=1 WHERE `modelid`=27909; -- Minzi the Minx
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=1 WHERE `modelid`=27912; -- Nixi Fireclaw
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=1 WHERE `modelid`=29921; -- Usuri Brightcoin
-UPDATE `creature_model_info` SET `bounding_radius`=0.3068,`combat_reach`=1,`gender`=1 WHERE `modelid`=27616; -- Uda the Beast
-UPDATE `creature_model_info` SET `bounding_radius`=0.3366,`combat_reach`=1,`gender`=0 WHERE `modelid`=27215; -- Violet Hold Guard
-UPDATE `creature_model_info` SET `bounding_radius`=0.3366,`combat_reach`=1,`gender`=0 WHERE `modelid`=27216; -- Violet Hold Guard
-UPDATE `creature_model_info` SET `bounding_radius`=0.3366,`combat_reach`=1,`gender`=0 WHERE `modelid`=27217; -- Violet Hold Guard
-UPDATE `creature_model_info` SET `bounding_radius`=0.3366,`combat_reach`=1,`gender`=0 WHERE `modelid`=29076; -- Trapjaw Rix
-UPDATE `creature_model_info` SET `bounding_radius`=0.347,`combat_reach`=1,`gender`=0 WHERE `modelid`=21273; -- Dalaran Visitor
-UPDATE `creature_model_info` SET `bounding_radius`=0.347,`combat_reach`=1,`gender`=0 WHERE `modelid`=25644; -- Ranid Glowergold
-UPDATE `creature_model_info` SET `bounding_radius`=0.347,`combat_reach`=1,`gender`=0 WHERE `modelid`=26321; -- Bragund Brightlink
-UPDATE `creature_model_info` SET `bounding_radius`=0.347,`combat_reach`=1,`gender`=0 WHERE `modelid`=27332; -- Skybreaker Marine
-UPDATE `creature_model_info` SET `bounding_radius`=0.347,`combat_reach`=1,`gender`=0 WHERE `modelid`=27998; -- Brammold Deepmine
-UPDATE `creature_model_info` SET `bounding_radius`=0.347,`combat_reach`=1,`gender`=0 WHERE `modelid`=28000; -- Braeg Stoutbeard
-UPDATE `creature_model_info` SET `bounding_radius`=0.347,`combat_reach`=1,`gender`=0 WHERE `modelid`=28170; -- Dorfus Alphamage
-UPDATE `creature_model_info` SET `bounding_radius`=0.347,`combat_reach`=1,`gender`=0 WHERE `modelid`=29145; -- Dubin Clay
-UPDATE `creature_model_info` SET `bounding_radius`=0.347,`combat_reach`=1,`gender`=1 WHERE `modelid`=26299; -- Dagna Flintlock
-UPDATE `creature_model_info` SET `bounding_radius`=0.347,`combat_reach`=1,`gender`=1 WHERE `modelid`=27963; -- Laire Brewgold
-UPDATE `creature_model_info` SET `bounding_radius`=0.347,`combat_reach`=1,`gender`=1 WHERE `modelid`=27965; -- Coira Longrifle
-UPDATE `creature_model_info` SET `bounding_radius`=0.347,`combat_reach`=1,`gender`=1 WHERE `modelid`=29834; -- Matilda Brightlink
-UPDATE `creature_model_info` SET `bounding_radius`=0.3519,`combat_reach`=1,`gender`=0 WHERE `modelid`=25618; -- Professor Pallin
-UPDATE `creature_model_info` SET `bounding_radius`=0.3519,`combat_reach`=1,`gender`=0 WHERE `modelid`=26078; -- Windle Sparkshine
-UPDATE `creature_model_info` SET `bounding_radius`=0.3519,`combat_reach`=1,`gender`=0 WHERE `modelid`=26300; -- Jepetto Joybuzz
-UPDATE `creature_model_info` SET `bounding_radius`=0.3519,`combat_reach`=1,`gender`=0 WHERE `modelid`=26374; -- Findle Whistlesteam
-UPDATE `creature_model_info` SET `bounding_radius`=0.3519,`combat_reach`=1,`gender`=0 WHERE `modelid`=26437; -- Sheddle Glossgleam
-UPDATE `creature_model_info` SET `bounding_radius`=0.3519,`combat_reach`=1,`gender`=0 WHERE `modelid`=27465; -- Warden Alturas
-UPDATE `creature_model_info` SET `bounding_radius`=0.3519,`combat_reach`=1,`gender`=0 WHERE `modelid`=28143; -- Babagahnoosh the Grumpy
-UPDATE `creature_model_info` SET `bounding_radius`=0.3519,`combat_reach`=1,`gender`=0 WHERE `modelid`=28144; -- Grindle Firespark
-UPDATE `creature_model_info` SET `bounding_radius`=0.3519,`combat_reach`=1,`gender`=0 WHERE `modelid`=28162; -- Arcanist Alec
-UPDATE `creature_model_info` SET `bounding_radius`=0.3519,`combat_reach`=1,`gender`=0 WHERE `modelid`=28167; -- Lofwyr Le'Fleur
-UPDATE `creature_model_info` SET `bounding_radius`=0.3519,`combat_reach`=1,`gender`=0 WHERE `modelid`=28199; -- Bakor the Gangly
-UPDATE `creature_model_info` SET `bounding_radius`=0.3519,`combat_reach`=1,`gender`=0 WHERE `modelid`=30358; -- Shandy Glossgleam
-UPDATE `creature_model_info` SET `bounding_radius`=0.3519,`combat_reach`=1,`gender`=1 WHERE `modelid`=25602; -- Inzi Charmlight
-UPDATE `creature_model_info` SET `bounding_radius`=0.3519,`combat_reach`=1,`gender`=1 WHERE `modelid`=25619; -- Linzy Blackbolt
-UPDATE `creature_model_info` SET `bounding_radius`=0.3519,`combat_reach`=1,`gender`=1 WHERE `modelid`=26378; -- Lalla Brightweave
-UPDATE `creature_model_info` SET `bounding_radius`=0.3519,`combat_reach`=1,`gender`=1 WHERE `modelid`=28146; -- Emeline Fizzlefry
-UPDATE `creature_model_info` SET `bounding_radius`=0.3519,`combat_reach`=1,`gender`=1 WHERE `modelid`=28160; -- Bitty Frostflinger
-UPDATE `creature_model_info` SET `bounding_radius`=0.3519,`combat_reach`=1,`gender`=1 WHERE `modelid`=28165; -- Natalie Tootiblare
-UPDATE `creature_model_info` SET `bounding_radius`=0.3519,`combat_reach`=1,`gender`=1 WHERE `modelid`=28171; -- Joboba Mezbreaker
-UPDATE `creature_model_info` SET `bounding_radius`=0.3519,`combat_reach`=1,`gender`=1 WHERE `modelid`=28432; -- Sarah Brady
-UPDATE `creature_model_info` SET `bounding_radius`=0.3672,`combat_reach`=1,`gender`=0 WHERE `modelid`=27587; -- Officer Van Rossem
-UPDATE `creature_model_info` SET `bounding_radius`=0.3672,`combat_reach`=1,`gender`=0 WHERE `modelid`=27592; -- Archmage Timear
-UPDATE `creature_model_info` SET `bounding_radius`=0.3672,`combat_reach`=1,`gender`=1 WHERE `modelid`=28118; -- Mojodishu
-UPDATE `creature_model_info` SET `bounding_radius`=0.372,`combat_reach`=1,`gender`=0 WHERE `modelid`=27328; -- Kor'kron Reaver
-UPDATE `creature_model_info` SET `bounding_radius`=0.372,`combat_reach`=1,`gender`=0 WHERE `modelid`=28194; -- Willard Blauvelt
-UPDATE `creature_model_info` SET `bounding_radius`=0.3817,`combat_reach`=1,`gender`=0 WHERE `modelid`=27154; -- Alliance Brigadier General
-UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=0 WHERE `modelid`=25604; -- Caliel Brightwillow
-UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=0 WHERE `modelid`=25610; -- Enchanter Nalthanis
-UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=0 WHERE `modelid`=25806; -- Warcaster Fanoraithe
-UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=0 WHERE `modelid`=25877; -- Valaden Silverblade
-UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=0 WHERE `modelid`=25882; -- Arille Azuregaze
-UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=0 WHERE `modelid`=26067; -- Silver Covenant Guardian Mage
-UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=0 WHERE `modelid`=26068; -- Silver Covenant Guardian Mage
-UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=0 WHERE `modelid`=26072; -- Sunreaver Guardian Mage
-UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=0 WHERE `modelid`=26443; -- Darahir
-UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=0 WHERE `modelid`=27509; -- High Warlord Uro
-UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=0 WHERE `modelid`=27559; -- Arcanist Adurin
-UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=0 WHERE `modelid`=27800; -- Arcanist Braedin
-UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=0 WHERE `modelid`=27801; -- Magister Surdiel
-UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=0 WHERE `modelid`=27949; -- Warmage Lukems
-UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=0 WHERE `modelid`=28148; -- Fabioso the Fabulous
-UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=0 WHERE `modelid`=28151; -- Dalaran Citizen
-UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=0 WHERE `modelid`=28156; -- Archmage Tenaj
-UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=0 WHERE `modelid`=28169; -- Metopious Loreseeker
-UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=0 WHERE `modelid`=28198; -- Felcaster Virim
-UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=0 WHERE `modelid`=28755; -- Arcanist Tybalin
-UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=0 WHERE `modelid`=28987; -- Arcanist Firael
-UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=0 WHERE `modelid`=29830; -- Enchanter Isian
-UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=0 WHERE `modelid`=30310; -- Silver Covenant Agent
-UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=0 WHERE `modelid`=30439; -- Sunreaver Agent
-UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=0 WHERE `modelid`=30842; -- Arcanist Uovril
-UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=1 WHERE `modelid`=15242; -- Defilers Emissary
-UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=1 WHERE `modelid`=25594; -- Paldesse
-UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=1 WHERE `modelid`=25603; -- Narisa Redgold
-UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=1 WHERE `modelid`=25622; -- Olisarra the Kind
-UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=1 WHERE `modelid`=25635; -- Ildine Sorrowspear
-UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=1 WHERE `modelid`=25875; -- Aemara
-UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=1 WHERE `modelid`=25879; -- Karandonna
-UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=1 WHERE `modelid`=26069; -- Silver Covenant Guardian Mage
-UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=1 WHERE `modelid`=26070; -- Silver Covenant Guardian Mage
-UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=1 WHERE `modelid`=26073; -- Sunreaver Guardian Mage
-UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=1 WHERE `modelid`=26074; -- Sunreaver Guardian Mage
-UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=1 WHERE `modelid`=26330; -- Aimee
-UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=1 WHERE `modelid`=26339; -- Imindril Spearsong
-UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=1 WHERE `modelid`=26441; -- Fialla Sweetberry
-UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=1 WHERE `modelid`=27556; -- Arcanist Ivrenne
-UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=1 WHERE `modelid`=27956; -- Isirami Fairwind
-UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=1 WHERE `modelid`=28147; -- Darthalia Ebonscorch
-UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=1 WHERE `modelid`=28152; -- Mona Everspring
-UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=1 WHERE `modelid`=28153; -- Kitz Proudbreeze
-UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=1 WHERE `modelid`=28163; -- Sabriana Sorrowgaze
-UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=1 WHERE `modelid`=28168; -- Goldlilly Gleamingfell
-UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=1 WHERE `modelid`=29832; -- Arcanist Miluria
-UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=1 WHERE `modelid`=30042; -- Kaye Toogie
-UPDATE `creature_model_info` SET `bounding_radius`=0.383,`combat_reach`=1,`gender`=1 WHERE `modelid`=30311; -- Silver Covenant Agent
-UPDATE `creature_model_info` SET `bounding_radius`=0.385,`combat_reach`=1,`gender`=1 WHERE `modelid`=25005; -- Dreadsaber
-UPDATE `creature_model_info` SET `bounding_radius`=0.3875,`combat_reach`=1,`gender`=0 WHERE `modelid`=28618; -- Unbound Seer
-UPDATE `creature_model_info` SET `bounding_radius`=0.389,`combat_reach`=1,`gender`=0 WHERE `modelid`=26376; -- Ainderu Summerleaf
-UPDATE `creature_model_info` SET `bounding_radius`=0.389,`combat_reach`=1,`gender`=0 WHERE `modelid`=28204; -- Mendez Nightshadow
-UPDATE `creature_model_info` SET `bounding_radius`=0.389,`combat_reach`=1,`gender`=0 WHERE `modelid`=30156; -- Daros Moonlance
-UPDATE `creature_model_info` SET `bounding_radius`=0.3978,`combat_reach`=1,`gender`=0 WHERE `modelid`=26847; -- Dalaran Visitor
-UPDATE `creature_model_info` SET `bounding_radius`=0.4,`combat_reach`=0,`gender`=2 WHERE `modelid`=26526; -- Cosmetic Mechanical Sheep
-UPDATE `creature_model_info` SET `bounding_radius`=0.4,`combat_reach`=0,`gender`=2 WHERE `modelid`=9563; -- Worg Pup
-UPDATE `creature_model_info` SET `bounding_radius`=0.4131,`combat_reach`=2,`gender`=0 WHERE `modelid`=16024; -- Rhonin
-UPDATE `creature_model_info` SET `bounding_radius`=0.4185,`combat_reach`=1,`gender`=0 WHERE `modelid`=27820; -- Armored Brown Bear
-UPDATE `creature_model_info` SET `bounding_radius`=0.4213,`combat_reach`=1,`gender`=0 WHERE `modelid`=19744; -- Archmage Lan'dalock
-UPDATE `creature_model_info` SET `bounding_radius`=0.42228,`combat_reach`=2,`gender`=0 WHERE `modelid`=31713; -- Frozo the Renowned
-UPDATE `creature_model_info` SET `bounding_radius`=0.4284,`combat_reach`=2,`gender`=0 WHERE `modelid`=30978; -- Spectral Footman
-UPDATE `creature_model_info` SET `bounding_radius`=0.4284,`combat_reach`=2,`gender`=0 WHERE `modelid`=30981; -- Shadowy Mercenary
-UPDATE `creature_model_info` SET `bounding_radius`=0.44045,`combat_reach`=1,`gender`=1 WHERE `modelid`=30686; -- Dark Ranger Vorel
-UPDATE `creature_model_info` SET `bounding_radius`=0.465,`combat_reach`=0,`gender`=1 WHERE `modelid`=30867; -- Lady Jaina Proudmoore
-UPDATE `creature_model_info` SET `bounding_radius`=0.465,`combat_reach`=1,`gender`=2 WHERE `modelid`=28282; -- Brassbolt Mechawrench
-UPDATE `creature_model_info` SET `bounding_radius`=0.4685,`combat_reach`=0,`gender`=2 WHERE `modelid`=26442; -- Clockwork Assistant
-UPDATE `creature_model_info` SET `bounding_radius`=0.47875,`combat_reach`=1,`gender`=0 WHERE `modelid`=26770; -- Archmage Aethas Sunreaver
-UPDATE `creature_model_info` SET `bounding_radius`=0.47875,`combat_reach`=1,`gender`=1 WHERE `modelid`=28222; -- Vereesa Windrunner
-UPDATE `creature_model_info` SET `bounding_radius`=0.4858,`combat_reach`=2,`gender`=0 WHERE `modelid`=30980; -- Tortured Rifleman
-UPDATE `creature_model_info` SET `bounding_radius`=0.5,`combat_reach`=0,`gender`=0 WHERE `modelid`=4449; -- Imp
-UPDATE `creature_model_info` SET `bounding_radius`=0.5,`combat_reach`=1,`gender`=2 WHERE `modelid`=11686; -- Dalaran Fountain Invis Stalker
-UPDATE `creature_model_info` SET `bounding_radius`=0.5355,`combat_reach`=2,`gender`=0 WHERE `modelid`=30821; -- Uther the Lightbringer
-UPDATE `creature_model_info` SET `bounding_radius`=0.5362,`combat_reach`=2,`gender`=0 WHERE `modelid`=30979; -- Ghostly Priest
-UPDATE `creature_model_info` SET `bounding_radius`=0.5392,`combat_reach`=1,`gender`=2 WHERE `modelid`=1041; -- Stabled Hunter Pet
-UPDATE `creature_model_info` SET `bounding_radius`=0.54,`combat_reach`=0,`gender`=2 WHERE `modelid`=20833; -- Stabled Hunter Pet
-UPDATE `creature_model_info` SET `bounding_radius`=0.59823,`combat_reach`=2,`gender`=1 WHERE `modelid`=27917; -- Gold Warrior
-UPDATE `creature_model_info` SET `bounding_radius`=0.6,`combat_reach`=0,`gender`=2 WHERE `modelid`=27681; -- Cosmetic Pig
-UPDATE `creature_model_info` SET `bounding_radius`=0.6,`combat_reach`=1,`gender`=2 WHERE `modelid`=12200; -- Segacedi
-UPDATE `creature_model_info` SET `bounding_radius`=0.60725,`combat_reach`=3,`gender`=2 WHERE `modelid`=1988; -- Grove Walker
-UPDATE `creature_model_info` SET `bounding_radius`=0.6324,`combat_reach`=2,`gender`=0 WHERE `modelid`=27919; -- Green Warrior
-UPDATE `creature_model_info` SET `bounding_radius`=0.6511,`combat_reach`=2,`gender`=0 WHERE `modelid`=27930; -- Green Paladin
-UPDATE `creature_model_info` SET `bounding_radius`=0.6721,`combat_reach`=1,`gender`=2 WHERE `modelid`=31094; -- Arcturis
-UPDATE `creature_model_info` SET `bounding_radius`=0.75,`combat_reach`=0,`gender`=2 WHERE `modelid`=26064; -- Scourge Haunt
-UPDATE `creature_model_info` SET `bounding_radius`=0.75,`combat_reach`=1,`gender`=0 WHERE `modelid`=27766; -- [DND] Dalaran Sewer Arena - Controller
-UPDATE `creature_model_info` SET `bounding_radius`=0.75,`combat_reach`=1,`gender`=2 WHERE `modelid`=17612; -- Frostmourne Altar Bunny (Quel'Delar)
-UPDATE `creature_model_info` SET `bounding_radius`=0.765,`combat_reach`=3,`gender`=0 WHERE `modelid`=30972; -- Falric
-UPDATE `creature_model_info` SET `bounding_radius`=0.765,`combat_reach`=3,`gender`=0 WHERE `modelid`=30973; -- Marwyn
-UPDATE `creature_model_info` SET `bounding_radius`=0.8,`combat_reach`=0,`gender`=2 WHERE `modelid`=27700; -- Stabled Hunter Pet
-UPDATE `creature_model_info` SET `bounding_radius`=0.8725,`combat_reach`=3,`gender`=0 WHERE `modelid`=28183; -- Hunaka Greenhoof
-UPDATE `creature_model_info` SET `bounding_radius`=0.9,`combat_reach`=1,`gender`=2 WHERE `modelid`=14255; -- Felguard
-UPDATE `creature_model_info` SET `bounding_radius`=0.9747,`combat_reach`=4,`gender`=0 WHERE `modelid`=28207; -- Tuff Gorehoof
-UPDATE `creature_model_info` SET `bounding_radius`=0.9747,`combat_reach`=4,`gender`=0 WHERE `modelid`=29820; -- Sorn Proudmane
-UPDATE `creature_model_info` SET `bounding_radius`=1.05,`combat_reach`=1,`gender`=0 WHERE `modelid`=10957; -- Dappled Stag
-UPDATE `creature_model_info` SET `bounding_radius`=1.05,`combat_reach`=1,`gender`=2 WHERE `modelid`=27726; -- Stabled Hunter Pet
-UPDATE `creature_model_info` SET `bounding_radius`=1.1,`combat_reach`=1,`gender`=2 WHERE `modelid`=26532; -- Cosmetic Mechanical Squirrel
-UPDATE `creature_model_info` SET `bounding_radius`=1.122,`combat_reach`=0,`gender`=2 WHERE `modelid`=368; -- Black Widow Hatchling
-UPDATE `creature_model_info` SET `bounding_radius`=1.18065,`combat_reach`=2,`gender`=2 WHERE `modelid`=833; -- Underbelly Croc
-UPDATE `creature_model_info` SET `bounding_radius`=1.2,`combat_reach`=0,`gender`=0 WHERE `modelid`=24235; -- Sinewy Wolf
-UPDATE `creature_model_info` SET `bounding_radius`=1.3,`combat_reach`=1,`gender`=2 WHERE `modelid`=134; -- Squirrel
-UPDATE `creature_model_info` SET `bounding_radius`=1.5,`combat_reach`=0,`gender`=0 WHERE `modelid`=22003; -- Nargut
-UPDATE `creature_model_info` SET `bounding_radius`=1.5,`combat_reach`=0,`gender`=0 WHERE `modelid`=27019; -- Rhukah
-UPDATE `creature_model_info` SET `bounding_radius`=1.7,`combat_reach`=2,`gender`=1 WHERE `modelid`=27931; -- Gold Shaman
-UPDATE `creature_model_info` SET `bounding_radius`=2.75,`combat_reach`=5,`gender`=0 WHERE `modelid`=30721; -- The Lich King
-
--- Template addon updates
-UPDATE `creature_template_addon` SET `bytes1`=0,`bytes2`=1,`mount`=0,`emote`=0,`auras`=NULL WHERE `entry`=1412; -- Squirrel
-UPDATE `creature_template_addon` SET `bytes1`=0,`bytes2`=1,`mount`=0,`emote`=0,`auras`=NULL WHERE `entry`=14881; -- Spider
-UPDATE `creature_template_addon` SET `bytes1`=0,`bytes2`=1,`mount`=0,`emote`=0,`auras`=NULL WHERE `entry`=14990; -- Defilers Emissary
-UPDATE `creature_template_addon` SET `bytes1`=0,`bytes2`=1,`mount`=0,`emote`=0,`auras`=NULL WHERE `entry`=14991; -- League of Arathor Emissary
-UPDATE `creature_template_addon` SET `bytes1`=0,`bytes2`=1,`mount`=0,`emote`=0,`auras`=NULL WHERE `entry`=17213; -- Broom
-UPDATE `creature_template_addon` SET `bytes1`=0,`bytes2`=1,`mount`=0,`emote`=0,`auras`=NULL WHERE `entry`=32642; -- Mojodishu
-UPDATE `creature_template_addon` SET `bytes1`=0,`bytes2`=1,`mount`=0,`emote`=0,`auras`=NULL WHERE `entry`=4075; -- Rat
-UPDATE `creature_template_addon` SET `bytes1`=0,`bytes2`=1,`mount`=0,`emote`=0,`auras`=NULL WHERE `entry`=721; -- Rabbit
-UPDATE `creature_template_addon` SET `bytes1`=3,`bytes2`=1,`mount`=0,`emote`=0,`auras`=NULL WHERE `entry`=31885; -- Rhukah
-UPDATE `creature_template_addon` SET `bytes1`=3,`bytes2`=1,`mount`=0,`emote`=0,`auras`=NULL WHERE `entry`=31886; -- Nargut
diff --git a/sql/updates/world/2011_03_23_2_world_creature_transport.sql b/sql/updates/world/2011_03_23_2_world_creature_transport.sql
deleted file mode 100644
index 05c94518d83..00000000000
--- a/sql/updates/world/2011_03_23_2_world_creature_transport.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-DELETE FROM `creature_transport` WHERE `transport_entry`=192242 AND `npc_entry`=31261;
-INSERT INTO `creature_transport` (`transport_entry`,`npc_entry`,`TransOffsetX`,`TransOffsetY`,`TransOffsetZ`,`TransOffsetO`,`emote`) VALUES
-(192242,31261,-46.16626,12.04395,13.22064,1.437376,0); -- Brother Keltan abord the Skybreaker
diff --git a/sql/updates/world/2011_03_23_3_world_creature.sql b/sql/updates/world/2011_03_23_3_world_creature.sql
deleted file mode 100644
index ca0ccdc93c9..00000000000
--- a/sql/updates/world/2011_03_23_3_world_creature.sql
+++ /dev/null
@@ -1 +0,0 @@
-UPDATE `creature` SET `id`=15105 WHERE `guid` BETWEEN 208382 AND 208393 AND `id`=15102;
diff --git a/sql/updates/world/2011_03_23_4_world_creature.sql b/sql/updates/world/2011_03_23_4_world_creature.sql
deleted file mode 100644
index 9d9edec6452..00000000000
--- a/sql/updates/world/2011_03_23_4_world_creature.sql
+++ /dev/null
@@ -1,42 +0,0 @@
--- Spawn Missing Argent Crusaders
--- Redid Exisiting to make Adding simpler
-SET @GUID=54706;
-DELETE FROM `creature` WHERE id IN (28029,28026);
-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
-(107427,28029,571,1,1,26231,0,5514,-2398.25,292.502,1.5708,300,0,0,9572,3561,0,0,0,0,0),
-(107428,28029,571,1,1,26228,0,5485.95,-2500.14,292.433,0.934353,300,0,0,9572,3561,0,0,0,0,0),
-(107429,28029,571,1,1,26229,0,5495.16,-2439.33,292.498,5.44414,300,0,0,9572,3561,0,0,0,0,0),
-(107430,28029,571,1,1,26230,0,5490.07,-2495.2,292.429,3.93988,300,0,0,9572,3561,0,0,0,0,0),
-(107431,28029,571,1,1,26230,0,5496.85,-2383.57,292.502,2.30383,300,0,0,9572,3561,0,0,0,0,0),
-(@GUID+0,28029,571,1,1,0,0,5442.812,-2554.325,297.783,1.554819,300,0,0,1,1,0,0,0,0,0),
-(@GUID+1,28029,571,1,1,0,0,5451.548,-2516.311,292.445,0.1570796,300,0,0,1,1,0,0,0,0,0),
-(@GUID+2,28029,571,1,1,0,0,5445.436,-2513.325,292.5019,1.64061,300,0,0,1,1,0,0,0,0,0),
-(@GUID+3,28029,571,1,1,0,0,5384.553,-2402.976,292.5019,0.8726646,300,0,0,1,1,0,0,0,0,0),
-(@GUID+4,28029,571,1,1,0,0,5386.06,-2421.43,292.5019,1.53589,300,0,0,1,1,0,0,0,0,0),
-(@GUID+5,28029,571,1,1,0,0,5383.483,-2472.9,292.5019,1.570796,300,0,0,1,1,0,0,0,0,0),
-(@GUID+6,28029,571,1,1,0,0,5400.021,-2448.991,292.5019,2.321288,300,0,0,1,1,0,0,0,0,0),
-(@GUID+7,28029,571,1,1,0,0,5369.318,-2443.405,292.5019,0.9424778,300,0,0,1,1,0,0,0,0,0),
-(@GUID+8,28029,571,1,1,0,0,5409.107,-2361.323,292.5019,0.6283185,300,0,0,1,1,0,0,0,0,0),
-(@GUID+9,28029,571,1,1,0,0,5464.651,-2496.451,292.5019,1.48353,300,0,0,1,1,0,0,0,0,0),
-(@GUID+10,28029,571,1,1,0,0,5435.183,-2513.578,292.445,0.918852,300,0,0,1,1,0,0,0,0,0),
-(@GUID+11,28029,571,1,1,0,0,5400.03,-2506.189,292.5019,1.553343,300,0,0,1,1,0,0,0,0,0),
-(@GUID+12,28029,571,1,1,0,0,5450.897,-2457.951,292.5019,1.553343,300,0,0,1,1,0,0,0,0,0),
--- rampaging Geist
-(107193,28026,571,1,1,25286,0,5497.21,-2080.43,240.865,0.857485,300,5,0,10635,0,0,1,0,0,0),
-(107194,28026,571,1,1,25402,0,5511.68,-2358.28,292.441,2.71292,300,5,0,10635,0,0,1,0,0,0),
-(107195,28026,571,1,1,25402,0,5512.46,-2455.17,292.424,2.97264,300,5,0,10635,0,0,1,0,0,0),
-(107196,28026,571,1,1,25286,0,5519.86,-2423.45,292.473,3.83817,300,5,0,10635,0,0,1,0,0,0),
-(107197,28026,571,1,1,25286,0,5488.13,-2497.19,292.429,3.93989,300,5,0,10635,0,0,1,0,0,0),
-(32067,28026,571,1,1,0,0,5429.262,-2486.59,292.5296,2.737376,300,5,0,10635,0,0,1,0,0,0),
-(32068,28026,571,1,1,0,0,5408.888,-2479.563,292.5296,0.7370623,300,5,0,10635,0,0,1,0,0,0),
-(32070,28026,571,1,1,0,0,5419.276,-2505.731,292.5433,4.015942,300,5,0,10635,0,0,1,0,0,0),
-(32071,28026,571,1,1,0,0,5384.713,-2463.133,292.843,2.721308,300,5,0,10635,0,0,1,0,0,0),
-(32073,28026,571,1,1,0,0,5383.064,-2413.345,292.5399,6.069617,300,5,0,10635,0,0,1,0,0,0),
-(32074,28026,571,1,1,0,0,5394.180,-2442.885,292.468,2.731286,300,5,0,10635,0,0,1,0,0,0),
-(518,28026,571,1,1,0,0,5452.489,-2447.378,292.5435,0.3663993,300,5,0,10635,0,0,1,0,0,0);
-
--- Addon data
-DELETE FROM `creature_template_addon` WHERE `entry` IN (28029,28026);
-INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
-(28029,0,0,1,375, NULL), -- Argent Crusader
-(28026,0,0,1,0, NULL); -- Rampaging Geist
diff --git a/sql/updates/world/2011_03_23_6_world_quest_template.sql b/sql/updates/world/2011_03_23_6_world_quest_template.sql
deleted file mode 100644
index 1b100325ae4..00000000000
--- a/sql/updates/world/2011_03_23_6_world_quest_template.sql
+++ /dev/null
@@ -1,2 +0,0 @@
--- Update Vile Familiars, Burning Blade Medallion and Report to Sen'jin Village required races (Horde)
-UPDATE `quest_template` SET `RequiredRaces`=690 WHERE `entry` IN (792,794,805);
diff --git a/sql/updates/world/2011_03_23_7_world_creatureinvolvedrelation.sql b/sql/updates/world/2011_03_23_7_world_creatureinvolvedrelation.sql
deleted file mode 100644
index 1a8e09c0727..00000000000
--- a/sql/updates/world/2011_03_23_7_world_creatureinvolvedrelation.sql
+++ /dev/null
@@ -1,4 +0,0 @@
--- Battle to Undercity should be turned in to Bragor Bloodfist
-DELETE FROM `creature_involvedrelation` WHERE `quest` IN (14351,550);
-DELETE FROM `creature_questrelation` WHERE `quest` IN (14351,550);
-INSERT INTO `creature_involvedrelation` (`id`,`quest`) VALUES (36273,14351);
diff --git a/sql/updates/world/2011_03_23_8_world_gameobject_template.sql b/sql/updates/world/2011_03_23_8_world_gameobject_template.sql
deleted file mode 100644
index 8db2ac8f117..00000000000
--- a/sql/updates/world/2011_03_23_8_world_gameobject_template.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-DELETE FROM `gameobject_template` WHERE `entry`=300149;
-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
-(300149,8,1287, 'TEMP Wrathscale Lair Fountain', '', '', '',0,0,1,0,0,0,0,0,0,223,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, '', '',1);
-
--- NEEDS VISUAL (apart form Ruins of Stardust, its MISSING!)
-DELETE FROM `gameobject` WHERE `id`=300149;
-INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES
-(1160,300149,530,1,1,-2186.4,-12340.5,56.2888,5.31,0,0,0.121294,-0.992617,-300,0,1);
diff --git a/sql/updates/world/2011_03_23_9_world_creature.sql b/sql/updates/world/2011_03_23_9_world_creature.sql
deleted file mode 100644
index 11aad5a0466..00000000000
--- a/sql/updates/world/2011_03_23_9_world_creature.sql
+++ /dev/null
@@ -1,132 +0,0 @@
--- create missing spawns:
-SET @GUID := 151895; -- SET BY TDB
-
-DELETE FROM `creature` WHERE `id`IN(18695,18697,18689,18686,18698,18678,17144,18692,18677,18693,18683,18679);
-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
--- Ambassador Jerrikar
-(@GUID,18695,530,1,1,0,0,-4455.05,1694.55,161.278,1.93093,28800,0,0,13522,0,0,0),
-(@GUID+1,18695,530,1,1,0,0,-4203.43,344.462,115.416,4.161,28800,0,0,13522,0,0,0),
-(@GUID+2,18695,530,1,1,0,0,-3815.24,2689.31,100.581,5.38433,28800,5,0,13522,0,0,1),
-(@GUID+3,18695,530,1,1,0,0,-3082.38,1867.38,139.906,1.53194,28800,5,0,13522,0,0,1),
-(@GUID+4,18695,530,1,1,0,0,-3076.35,1020.61,-2.88056,3.73969,28800,5,0,13522,0,0,1),
--- Chief Engineer Lorthander
-(@GUID+5,18697,530,1,1,0,0,4092.53,4001.75,117.282,4.650480,28800,0,0,10818,15400,0,0),
-(@GUID+6,18697,530,1,1,0,0,2293.31,2821.12,130.917,4.422730,28800,5,0,10818,15400,0,1),
-(@GUID+7,18697,530,1,1,0,0,2954.82,2147.42,165.328,0.753333,28800,5,0,10818,15400,0,1),
--- Crippler
-(@GUID+8,18689,530,1,1,0,0,-3005.68,5037.76,-23.7032,4.12334,28800,30,0,11828,0,0,1), -- only have one for him :(
--- Doomsayer Jurim
-(@GUID+9,18686,530,1,1,0,0,-2537.44,5147.04,9.05971,5.82974,28800,0,0,9144,13525,0,0),
-(@GUID+10,18686,530,1,1,0,0,-1874.09,4663.57,10.9095,3.87017,28800,5,0,9144,13525,0,1),
-(@GUID+11,18686,530,1,1,0,0,-2172.31,4091.34,3.00316,4.21182,28800,5,0,9144,13525,0,1),
-(@GUID+12,18686,530,1,1,0,0,-3001.44,3297.82,0.537389,4.35947,28800,5,0,9144,13525,0,1),
-(@GUID+13,18686,530,1,1,0,0,-3540.43,4051.46,66.3999,2.6905,28800,5,0,9144,13525,0,1),
--- Ever-Core the Punisher
-(@GUID+14,18698,530,1,1,0,0,3014.36,4025.81,144.105,2.90805,28800,5,0,10466,5982,0,1),
-(@GUID+15,18698,530,1,1,0,0,3835.65,3835.2,103.641,5.80224,28800,5,0,10466,5982,0,1),
-(@GUID+16,18698,530,1,1,0,0,4824.65,2738.08,88.9073,0.75999,28800,5,0,10466,5982,0,1),
-(@GUID+17,18698,530,1,1,0,0,4113.73,1677.64,130.749,0.237701,28800,5,0,10466,5982,0,1),
--- Fulgorge (should be 3 i think)
-(@GUID+18,18678,530,1,1,0,0,-565.303,4343,49.9107,6.05994,28800,0,0,10682,0,0,0),
-(@GUID+19,18678,530,1,1,0,0,-632.339,3908.47,28.9953,4.74599,28800,0,0,10682,0,0,0),
-(@GUID+38,18678,530,1,1,0,0,-634.201,3795.52,28.99509,1.162743,28800,0,0,10682,0,0,0),
--- Goretooth
-(@GUID+20,17144,530,1,1,0,0,-1762.6,8066.57,-104.023,1.86887,28800,0,0,11828,0,0,0),
-(@GUID+21,17144,530,1,1,0,0,-1840.51,8450.93,-64.6652,4.69754,28800,0,0,11828,0,0,0),
-(@GUID+22,17144,530,1,1,0,0,-1025.68,7114.78,2.37478,0.256121,28800,0,0,11828,0,0,0),
-(@GUID+23,17144,530,1,1,0,0,-2876.55,6078.57,-4.24251,1.15226,28800,0,0,11828,0,0,0),
--- Hemathion
-(@GUID+24,18692,530,1,1,0,0,2116.26,7250.19,365.147,2.86924,28800,0,0,13084,0,0,0),
-(@GUID+25,18692,530,1,1,0,0,2699.59,7237.5,366.064,3.30389,28800,0,0,13084,0,0,0),
--- Mekthorg the Wild
-(@GUID+26,18677,530,1,1,0,0,-575.456,3240.77,5.76784,4.69623,28800,0,0,10316,0,0,0),
-(@GUID+27,18677,530,1,1,0,0,-1084.3,2014.46,67.6811,0.947525,28800,5,0,10316,0,0,1),
--- Speaker Mar'grom
-(@GUID+28,18693,530,1,1,0,0,2365.59,6544.67,3.4638,1.66658,28800,0,0,10466,8973,0,0),
-(@GUID+29,18693,530,1,1,0,0,1599.44,6433.12,-10.4082,0.215986,28800,0,0,10466,8973,0,0),
-(@GUID+30,18693,530,1,1,0,0,1607.56,6423.05,-10.3477,0.577269,28800,5,0,10466,8973,0,1),
-(@GUID+31,18693,530,1,1,0,0,2915.68,6000.98,-4.1535,4.87572,28800,5,0,10466,8973,0,1),
-(@GUID+32,18693,530,1,1,0,0,3636.49,5349.23,-20.7,4.57491,28800,5,0,10466,8973,0,1),
--- Voidhunter Yar (1 spawn. circular pathing)
-(@GUID+33,18683,530,1,1,0,0,-2422.61,8206.15,-38.3408,0.177212,28800,0,0,10466,11964,0,0),
--- Vorakem Doomspeaker
-(@GUID+34,18679,530,1,1,0,0,175.918,1720.29,34.4088,3.26023,28800,0,0,8548,2568,0,0),
-(@GUID+35,18679,530,1,1,0,0,-444.675,1851.37,78.3747,5.77743,28800,5,0,8548,2568,0,1),
-(@GUID+36,18679,530,1,1,0,0,399.416,2204.89,118.365,0.918177,28800,5,0,8548,2568,0,1),
-(@GUID+37,18679,530,1,1,0,0,362.142,3354.43,64.1364,1.86458,28800,5,0,8548,2568,0,1);
-
--- DefiningPooling_templates
-DELETE FROM `pool_template` WHERE `entry` BETWEEN 1073 AND 1085;
-INSERT INTO pool_template (`entry`,`max_limit`,`description`) VALUES
-(1073,1, 'Okrek Rare Spawn (1 out 4)'),
-(1074,1, 'Ambassador Jerrikar Rare Spawn (1 out 5)'),
-(1075,1, 'Okrek Rare Spawn (1 out 3)'),
-(1076,1, 'Crippler Rare Spawn (1 out 1)'),
-(1077,1, 'Doomsayer Jurim Rare Spawn (1 out 5)'),
-(1078,1, 'Ever-Core the Punisher Rare Spawn (1 out 4)'),
-(1079,1, 'Fulgore Rare Spawn (1 out 3)'),
-(1080,1, 'Goretooth Rare Spawn (1 out 4)'),
-(1081,1, 'Hemathion Rare Spawn (1 out 2)'),
-(1082,1, 'Mekthorg the Wild Rare Spawn (1 out 2)'),
-(1083,1, 'Speaker Margrom Rare Spawn (1 out 5)'),
-(1084,1, 'Voidhunter Yar Rare Spawn (1 out 1)'),
-(1085,1, 'Vorakem Doomspeaker Rare Spawn (1 out 4)');
-
--- Pooling the Spawns
-DELETE FROM `pool_creature` WHERE `pool_entry` BETWEEN 1073 AND 1085;
-INSERT INTO pool_creature(`guid`,`pool_entry`,`chance`,`description`) VALUES
-(85382,1073,25, 'Okrek - Spawnlocation 1'),
-(85405,1073,25, 'Okrek - Spawnlocation 2'),
-(85564,1073,25, 'Okrek - Spawnlocation 3'),
-(85565,1073,25, 'Okrek - Spawnlocation 4'),
-(@GUID,1074,20, 'Ambassador Jerrikar - Spawnlocation 1'),
-(@GUID+1,1074,20, 'Ambassador Jerrikar - Spawnlocation 2'),
-(@GUID+2,1074,20, 'Ambassador Jerrikar - Spawnlocation 3'),
-(@GUID+3,1074,20, 'Ambassador Jerrikar - Spawnlocation 4'),
-(@GUID+4,1074,20, 'Ambassador Jerrikar - Spawnlocation 5'),
-(@GUID+5,1075,33, 'Chief Engineer Lorthander - Spawnlocation 1'),
-(@GUID+6,1075,33, 'Chief Engineer Lorthander - Spawnlocation 2'),
-(@GUID+7,1075,34, 'Chief Engineer Lorthander - Spawnlocation 3'),
-(@GUID+8,1076,100, 'Crippler - Spawnlocation 1'),
-(@GUID+9,1077,20, 'Doomsayer Jurim Spawnlocation 1'),
-(@GUID+10,1077,20, 'Doomsayer Jurim Spawnlocation 2'),
-(@GUID+11,1077,20, 'Doomsayer Jurim Spawnlocation 3'),
-(@GUID+12,1077,20, 'Doomsayer Jurim Spawnlocation 4'),
-(@GUID+13,1077,20, 'Doomsayer Jurim Spawnlocation 5'),
-(@GUID+14,1078,25, 'Ever-Core the Punisher Spawnlocation 1'),
-(@GUID+15,1078,25, 'Ever-Core the Punisher Spawnlocation 2'),
-(@GUID+16,1078,25, 'Ever-Core the Punisher Spawnlocation 3'),
-(@GUID+17,1078,25, 'Ever-Core the Punisher Spawnlocation 4'),
-(@GUID+18,1079,33, 'Fulgore Spawnlocation 1'),
-(@GUID+19,1079,33, 'Fulgore Spawnlocation 2'),
-(@GUID+38,1079,33, 'Fulgore Spawnlocation 2'),
-(@GUID+20,1080,25, 'Goretooth Spawnlocation 1'),
-(@GUID+21,1080,25, 'Goretooth Spawnlocation 2'),
-(@GUID+22,1080,25, 'Goretooth Spawnlocation 3'),
-(@GUID+23,1080,25, 'Goretooth Spawnlocation 4'),
-(@GUID+24,1081,50, 'Hemathion Spawnlocation 1'),
-(@GUID+25,1081,50, 'Hemathion Spawnlocation 2'),
-(@GUID+26,1082,50, 'Mekthorg the Wild Spawnlocation 1'),
-(@GUID+27,1082,50, 'Mekthorg the Wild Spawnlocation 2'),
-(@GUID+28,1083,20, 'Speaker Margrom Spawnlocation 1'),
-(@GUID+29,1083,20, 'Speaker Margrom Spawnlocation 2'),
-(@GUID+30,1083,20, 'Speaker Margrom Spawnlocation 3'),
-(@GUID+31,1083,20, 'Speaker Margrom Spawnlocation 4'),
-(@GUID+32,1083,20, 'Speaker Margrom Spawnlocation 5'),
-(@GUID+33,1084,100, 'Voidhunter Yar Spawnlocation 1'),
-(@GUID+34,1085,25, 'Vorakem Doomspeaker Spawnlocation 1'),
-(@GUID+35,1085,25, 'Vorakem Doomspeaker Spawnlocation 2'),
-(@GUID+36,1085,25, 'Vorakem Doomspeaker Spawnlocation 3'),
-(@GUID+37,1085,25, 'Vorakem Doomspeaker Spawnlocation 4');
-
--- Chief Engineer Lorthander (sniffed)
-SET @EquiEntry = 1807; -- (creature_equip_template.entry - need 1)
-UPDATE `creature_template` SET `faction_A`=1701,`faction_H`=1701,`equipment_id`=@EquiEntry,`speed_walk`=1 WHERE `entry`=18697;
-DELETE FROM `creature_equip_template` WHERE `entry`=@EquiEntry;
-INSERT INTO `creature_equip_template` (`entry`,`equipentry1`,`equipentry2`,`equipentry3`) VALUES
-(@EquiEntry,31301,32768,0);
-DELETE FROM `creature_template_addon` WHERE `entry`=18697;
-INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
-(18697,0,0,1,0, NULL);
diff --git a/sql/updates/world/2011_03_24_00_world_creature_template.sql b/sql/updates/world/2011_03_24_00_world_creature_template.sql
new file mode 100644
index 00000000000..d1dd1653f33
--- /dev/null
+++ b/sql/updates/world/2011_03_24_00_world_creature_template.sql
@@ -0,0 +1,69 @@
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=10404; -- Pustulating Horror 
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=34606; -- Frost Sphere
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=36724; -- Servant of the Throne
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=36725; -- Nerub'ar Broodkeeper
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=36805; -- Deathspeaker Servant
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=36807; -- Deathspeaker Disciple
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=36808; -- Deathspeaker Zealot
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=36811; -- Deathspeaker Attendant
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=36829; -- Deathspeaker High Priest
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=36839; -- Horde Gunship Cannon
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=36844; -- Risen Deathspeaker Servant
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=36998; -- Skybreaker Protector
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37003; -- Skybreaker Vindicator
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37004; -- Skybreaker Dreadblade
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37007; -- Deathbound Ward
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37011; -- The Damned
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37012; -- Ancient Skeletal Soldier
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37016; -- Skybreaker Luminary
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37017; -- Skybreaker Assassin
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37021; -- Skybreaker Vicar
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37027; -- Skybreaker Hierophant
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37030; -- Kor'kron Primalist
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37031; -- Kor'kron Oracle
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37032; -- Kor'kron Defender
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37033; -- Kor'kron Invoker
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37035; -- Kor'kron Vanquisher
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37144; -- Skybreaker Marksman
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37146; -- Kor'kron Sniper
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37148; -- Skybreaker Summoner
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37149; -- Kor'kron Necrolyte
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37230; -- Spire Frostwyrm
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37544; -- Spire Gargoyle
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37545; -- Spire Minion
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37546; -- Frenzied Abomination
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=36880; -- Decaying Colossus
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=36897; -- Little Ooze
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=36899; -- Big Ooze
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37022; -- Blighted Abomination
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37023; -- Plague Scientist
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37025; -- Stinky
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37038; -- Vengeful Fleshreaper
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37098; -- Val'kyr Herald
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37217; -- Precious
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37571; -- Darkfallen Advisor
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37595; -- Darkfallen Blood Knight
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37662; -- Darkfallen Commander
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37663; -- Darkfallen Noble
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37664; -- Darkfallen Archmage
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37665; -- Darkfallen Lieutenant
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37666; -- Darkfallen Tactician
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37782; -- Flesh-eating Insect
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37901; -- Vampiric Fiend
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=38104; -- Plagued Zombie
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=38410; -- Severed Essence
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37034; -- Kor'kron Templar
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37501; -- Nerub'ar Champion
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37502; -- Nerub'ar Webweaver
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=38184; -- Corrupted Ymirjar
+UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37232; -- Nerub'ar Broodling
+UPDATE `creature_template` SET `difficulty_entry_1`=0,`difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=36990; -- Lady Sylvanas Windrunner
+UPDATE `creature_template` SET `difficulty_entry_1`=0,`difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37068; -- Spiritual Reflection
+UPDATE `creature_template` SET `difficulty_entry_1`=0,`difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37107; -- Spiritual Reflection
+UPDATE `creature_template` SET `difficulty_entry_1`=0,`difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37920; -- Kor'kron Reaver
+UPDATE `creature_template` SET `difficulty_entry_1`=0,`difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=38456; -- Frozen Orb
+
+-- Delete all the fake/temp diffentry templates
+DELETE FROM `creature_template` WHERE `entry` BETWEEN 3460602 AND 3845601 OR `entry` IN (1040402,1040403);
+DELETE FROM `creature_loot_template` WHERE `entry` IN (3672402,3672403,3672502,3672503,3680502,3680503,3680702,3680703,3680802,3680803,3681102,3681103,3682902,3682903,3688002,3688003,3699802,3699803,3700302,3700303,3700402,3700403,3700702,3700703,3701102,3701103,3701202,3701203,3701602,3701603,3701702,3701703,3702102,3702103,3702202,3702203,3702302,3702303,3702502,3702503,3702702,3702703,3703002,3703003,3703102,3703103,3703202,3703203,3703302,3703303,3703402,3703403,3703502,3703503,3703802,3703803,3709802,3709803,3714402,3714403,3714602,3714603,3714802,3714803,3714902,3714903,3721702,3721703,3723002,3723003,3750102,3750103,3750202,3750203,3754402,3754403,3754502,3754503,3754602,3754603,3757102,3757103,3759502,3759503,3766202,3766203,3766302,3766303,3766402,3766403,3766502,3766503,3766602,3766603);
+DELETE FROM `creature_onkill_reputation` WHERE `creature_id` BETWEEN 3460602 AND 3845601 OR `creature_id` IN (1040402,1040403);
diff --git a/sql/updates/world/2011_03_24_01_world_loot_template.sql b/sql/updates/world/2011_03_24_01_world_loot_template.sql
new file mode 100644
index 00000000000..a039b5d1933
--- /dev/null
+++ b/sql/updates/world/2011_03_24_01_world_loot_template.sql
@@ -0,0 +1,382 @@
+-- Trashloot for ICC/FoS/PoS/HoR
+-- Generic
+SET @ICC_TrashGenericGrey := 35063; -- Set by TDB (need x)
+SET @ICC_TrashGenericWhite := @ICC_TrashGenericGrey+1;
+SET @ICC_TrashGenericScroll := @ICC_TrashGenericGrey+2;
+SET @ICC_TrashGenericGreen := @ICC_TrashGenericGrey+3;
+SET @ICC_TrashGenericBlue := @ICC_TrashGenericGrey+4;
+SET @ICC_TrashGenericPurpleICC := @ICC_TrashGenericGrey+5;
+SET @ICC_TrashCitadelFinal := @ICC_TrashGenericGrey+6;
+SET @ICC_TrashGenericPurpleDUNN := @ICC_TrashGenericGrey+7;
+SET @ICC_TrashDungeonNFinal := @ICC_TrashGenericGrey+8;
+SET @ICC_TrashGenericPurpleDUNH := @ICC_TrashGenericGrey+9;
+SET @ICC_TrashDungeonHFinal := @ICC_TrashGenericGrey+10;
+SET @ICC_TrashGenericPurple := @ICC_TrashGenericGrey+11;
+
+DELETE FROM `reference_loot_template` WHERE `entry` BETWEEN @ICC_TrashGenericGrey AND @ICC_TrashGenericGrey+11; 
+DELETE FROM `reference_loot_template` WHERE `entry` BETWEEN 35063 AND 35076; -- cleanup OLD loot
+INSERT INTO reference_loot_template (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES
+-- grey items (45)
+(@ICC_TrashGenericGrey,33430,0,1,1,1,1), -- Abandoned Greatsword
+(@ICC_TrashGenericGrey,33426,0,1,1,1,1), -- Chipped Timber Axe
+(@ICC_TrashGenericGrey,33424,0,1,1,1,1), -- Cracked Iron Staff
+(@ICC_TrashGenericGrey,33428,0,1,1,1,1), -- Dulled SHiv
+(@ICC_TrashGenericGrey,33397,0,1,1,1,1), -- Frigid Mail Armor
+(@ICC_TrashGenericGrey,33398,0,1,1,1,1), -- Frigid Mail Belt
+(@ICC_TrashGenericGrey,33399,0,1,1,1,1), -- Frigid Mail Boots
+(@ICC_TrashGenericGrey,33400,0,1,1,1,1), -- Frigid Mail Bracers
+(@ICC_TrashGenericGrey,33433,0,1,1,1,1), -- Frigid Mail Circlet
+(@ICC_TrashGenericGrey,33401,0,1,1,1,1), -- Frigid Mail Gloves
+(@ICC_TrashGenericGrey,33402,0,1,1,1,1), -- Frigid Mail Pants
+(@ICC_TrashGenericGrey,33403,0,1,1,1,1), -- Frigid Mail Shoulderpads
+(@ICC_TrashGenericGrey,33427,0,1,1,1,1), -- Frost-Encrusted Rifle
+(@ICC_TrashGenericGrey,33365,0,1,1,1,1), -- Frost-Rimed Cloth Belt
+(@ICC_TrashGenericGrey,33366,0,1,1,1,1), -- Frost-Rimed Cloth Boots
+(@ICC_TrashGenericGrey,33367,0,1,1,1,1), -- Frost-Rimed Cloth Bracers
+(@ICC_TrashGenericGrey,33368,0,1,1,1,1), -- Frost-Rimed Cloth Gloves
+(@ICC_TrashGenericGrey,33346,0,1,1,1,1), -- Frost-Rimed Cloth Hat
+(@ICC_TrashGenericGrey,33369,0,1,1,1,1), -- Frost-Rimed Cloth Pants
+(@ICC_TrashGenericGrey,33370,0,1,1,1,1), -- Frost-Rimed Cloth Shoulderpads
+(@ICC_TrashGenericGrey,33371,0,1,1,1,1), -- Frost-Rimed Cloth Vest
+(@ICC_TrashGenericGrey,33412,0,1,1,1,1), -- Frost-Worn Plate Belt
+(@ICC_TrashGenericGrey,33413,0,1,1,1,1), -- Frost-Worn Plate Boots
+(@ICC_TrashGenericGrey,33414,0,1,1,1,1), -- Frost-Worn Plate Bracers
+(@ICC_TrashGenericGrey,33415,0,1,1,1,1), -- Frost-Worn Plate Chestpiece
+(@ICC_TrashGenericGrey,33416,0,1,1,1,1), -- Frost-Worn Plate Gloves
+(@ICC_TrashGenericGrey,33435,0,1,1,1,1), -- Frost-Worn Plate Helmet
+(@ICC_TrashGenericGrey,33417,0,1,1,1,1), -- Frost-Worn Plate Pants
+(@ICC_TrashGenericGrey,33419,0,1,1,1,1), -- Frost-Worn Plate Shoulderpads
+(@ICC_TrashGenericGrey,33379,0,1,1,1,1), -- Frozen Armor
+(@ICC_TrashGenericGrey,33380,0,1,1,1,1), -- Frozen Belt
+(@ICC_TrashGenericGrey,33381,0,1,1,1,1), -- Frozen Boots
+(@ICC_TrashGenericGrey,33382,0,1,1,1,1), -- Frozen Bracers
+(@ICC_TrashGenericGrey,33383,0,1,1,1,1), -- Frozen Gloves
+(@ICC_TrashGenericGrey,33434,0,1,1,1,1), -- Frozen Leather Helmet
+(@ICC_TrashGenericGrey,33384,0,1,1,1,1), -- Frozen Pants
+(@ICC_TrashGenericGrey,33385,0,1,1,1,1), -- Frozen Shoulderpads
+(@ICC_TrashGenericGrey,33429,0,1,1,1,1), -- Ice Cleaver
+(@ICC_TrashGenericGrey,33425,0,1,1,1,1), -- Ice-Pitted Blade
+(@ICC_TrashGenericGrey,33431,0,1,1,1,1), -- Icesmashing Mace
+(@ICC_TrashGenericGrey,33423,0,1,1,1,1), -- Rime-Covered Mace
+(@ICC_TrashGenericGrey,33422,0,1,1,1,1), -- Shattered Bow
+(@ICC_TrashGenericGrey,43852,70,1,1,1,1), -- Thick Fur Clothing Scraps (drops more often)
+-- white items
+(@ICC_TrashGenericWhite,33470,0,1,1,2,7), -- Frostweave Cloth
+(@ICC_TrashGenericWhite,33445,0,1,1,1,1), -- Honeymint Tea
+(@ICC_TrashGenericWhite,33454,0,1,1,1,1), -- Salted Venison
+(@ICC_TrashGenericWhite,35947,0,1,1,1,1), -- Sparkling Frostcap
+(@ICC_TrashGenericWhite,33447,0,1,1,1,1), -- Runic Healing Potion
+(@ICC_TrashGenericWhite,33448,0,1,1,1,1), -- Runic Mana Potion
+-- Scroll items
+(@ICC_TrashGenericScroll,43463,0,1,1,1,1), -- Scroll of Agility VII
+(@ICC_TrashGenericScroll,37091,0,1,1,1,1), -- Scroll of Intellect VII
+(@ICC_TrashGenericScroll,37093,0,1,1,1,1), -- Scroll of Stamina VII
+(@ICC_TrashGenericScroll,43465,0,1,1,1,1), -- Scroll of Strength VII
+(@ICC_TrashGenericScroll,37097,0,1,1,1,1), -- Scroll of Spirit VII
+(@ICC_TrashGenericScroll,43464,0,1,1,1,1), -- Scroll of Agility VIII
+(@ICC_TrashGenericScroll,37092,0,1,1,1,1), -- Scroll of Intellect VIII
+(@ICC_TrashGenericScroll,37094,0,1,1,1,1), -- Scroll of Stamina VIII
+(@ICC_TrashGenericScroll,43466,0,1,1,1,1), -- Scroll of Strength VIII
+(@ICC_TrashGenericScroll,37098,0,1,1,1,1), -- Scroll of Spirit VIII
+-- green items (166)
+(@ICC_TrashGenericGreen,36609,0,1,1,1,1), -- Abandoned Spear
+(@ICC_TrashGenericGreen,36497,0,1,1,1,1), -- Adamant Mallet
+(@ICC_TrashGenericGreen,36511,0,1,1,1,1), -- Artic War Hammer
+(@ICC_TrashGenericGreen,36694,0,1,1,1,1), -- Beatific Mace
+(@ICC_TrashGenericGreen,36527,0,1,1,1,1), -- Blackened Blade
+(@ICC_TrashGenericGreen,36611,0,1,1,1,1), -- Black Scythe
+(@ICC_TrashGenericGreen,36638,0,1,1,1,1), -- Bloody Crossbow
+(@ICC_TrashGenericGreen,36428,0,1,1,1,1), -- Bouquet Ring
+(@ICC_TrashGenericGreen,36639,0,1,1,1,1), -- Brutal Ballista
+(@ICC_TrashGenericGreen,36707,0,1,1,1,1), -- Cascading Water Staff
+(@ICC_TrashGenericGreen,36539,0,1,1,1,1), -- Chilled Warblade
+(@ICC_TrashGenericGreen,36723,0,1,1,1,1), -- Clawed Shuriken
+(@ICC_TrashGenericGreen,36035,0,1,1,1,1), -- Condor Belt
+(@ICC_TrashGenericGreen,36042,0,1,1,1,1), -- Condor Bindings
+(@ICC_TrashGenericGreen,36038,0,1,1,1,1), -- Condor Gloves
+(@ICC_TrashGenericGreen,36039,0,1,1,1,1), -- Condor Headpiece
+(@ICC_TrashGenericGreen,36040,0,1,1,1,1), -- Condor Pants
+(@ICC_TrashGenericGreen,36037,0,1,1,1,1), -- Condor Robe
+(@ICC_TrashGenericGreen,36036,0,1,1,1,1), -- Condor Sandals
+(@ICC_TrashGenericGreen,36041,0,1,1,1,1), -- Condor Shoulderpads
+(@ICC_TrashGenericGreen,36266,0,1,1,1,1), -- Cormorant Bracelets
+(@ICC_TrashGenericGreen,36261,0,1,1,1,1), -- Cormorant Chain Vest
+(@ICC_TrashGenericGreen,36260,0,1,1,1,1), -- Cormorant Footwraps
+(@ICC_TrashGenericGreen,36262,0,1,1,1,1), -- Cormorant Gloves
+(@ICC_TrashGenericGreen,36263,0,1,1,1,1), -- Cormorant Helm
+(@ICC_TrashGenericGreen,36264,0,1,1,1,1), -- Cormorant Leggings
+(@ICC_TrashGenericGreen,36265,0,1,1,1,1), -- Cormorant Mantle
+(@ICC_TrashGenericGreen,36259,0,1,1,1,1), -- Cormorant Waistband
+(@ICC_TrashGenericGreen,36525,0,1,1,1,1), -- Craggy Machete
+(@ICC_TrashGenericGreen,36709,0,1,1,1,1), -- Crystal Woodstaff
+(@ICC_TrashGenericGreen,36050,0,1,1,1,1), -- Crystalsong Bracelets
+(@ICC_TrashGenericGreen,36047,0,1,1,1,1), -- Crystalsong Crown
+(@ICC_TrashGenericGreen,36046,0,1,1,1,1), -- Crystalsong Gloves
+(@ICC_TrashGenericGreen,36048,0,1,1,1,1), -- Crystalsong Leggings
+(@ICC_TrashGenericGreen,36049,0,1,1,1,1), -- Crystalsong Mantle
+(@ICC_TrashGenericGreen,36045,0,1,1,1,1), -- Crystalsong Robe
+(@ICC_TrashGenericGreen,36043,0,1,1,1,1), -- Crystalsong Sash
+(@ICC_TrashGenericGreen,36044,0,1,1,1,1), -- Crystalsong Slippers
+(@ICC_TrashGenericGreen,36554,0,1,1,1,1), -- Cursed Staff
+(@ICC_TrashGenericGreen,43297,0,1,1,1,1), -- Damaged Necklace
+(@ICC_TrashGenericGreen,36553,0,1,1,1,1), -- Desecrated Staff
+(@ICC_TrashGenericGreen,36695,0,1,1,1,1), -- Dogmatic Scepter
+(@ICC_TrashGenericGreen,36721,0,1,1,1,1), -- Dragon's Teeth
+(@ICC_TrashGenericGreen,36413,0,1,1,1,1), -- Dyed Taffeta Cape
+(@ICC_TrashGenericGreen,36427,0,1,1,1,1), -- Engraved Ring
+(@ICC_TrashGenericGreen,36484,0,1,1,1,1), -- Etched Dagger
+(@ICC_TrashGenericGreen,36499,0,1,1,1,1), -- Frigid War-Mace
+(@ICC_TrashGenericGreen,36470,0,1,1,1,1), -- Gilded Scepter
+(@ICC_TrashGenericGreen,36381,0,1,1,1,1), -- Golem Breastplate
+(@ICC_TrashGenericGreen,36382,0,1,1,1,1), -- Golem Gauntlets
+(@ICC_TrashGenericGreen,36379,0,1,1,1,1), -- Golem Girdle
+(@ICC_TrashGenericGreen,36383,0,1,1,1,1), -- Golem Helmet
+(@ICC_TrashGenericGreen,36384,0,1,1,1,1), -- Golem Legplates
+(@ICC_TrashGenericGreen,36385,0,1,1,1,1), -- Golem Pauldrons
+(@ICC_TrashGenericGreen,36380,0,1,1,1,1), -- Golem Sabatons
+(@ICC_TrashGenericGreen,36386,0,1,1,1,1), -- Golem Vambraces
+(@ICC_TrashGenericGreen,36623,0,1,1,1,1), -- Harnessed Longbow
+(@ICC_TrashGenericGreen,36568,0,1,1,1,1), -- Hollowed Bone Knuckles
+(@ICC_TrashGenericGreen,36637,0,1,1,1,1), -- Horrific Crossbow
+(@ICC_TrashGenericGreen,36471,0,1,1,1,1), -- Ice Crystal
+(@ICC_TrashGenericGreen,36582,0,1,1,1,1), -- Ice Pick
+(@ICC_TrashGenericGreen,36597,0,1,1,1,1), -- Ice-Splintering Axe
+(@ICC_TrashGenericGreen,36456,0,1,1,1,1), -- Ice Kite Shield
+(@ICC_TrashGenericGreen,36457,0,1,1,1,1), -- Ivory Shield
+(@ICC_TrashGenericGreen,36373,0,1,1,1,1), -- Kraken Breastplate
+(@ICC_TrashGenericGreen,36377,0,1,1,1,1), -- Kraken Epaulets
+(@ICC_TrashGenericGreen,36374,0,1,1,1,1), -- Kraken Gauntlets
+(@ICC_TrashGenericGreen,36371,0,1,1,1,1), -- Kraken Girdle
+(@ICC_TrashGenericGreen,36372,0,1,1,1,1), -- Kraken Greaves
+(@ICC_TrashGenericGreen,36375,0,1,1,1,1), -- Kraken Helm
+(@ICC_TrashGenericGreen,36376,0,1,1,1,1), -- Kraken Legplates
+(@ICC_TrashGenericGreen,36378,0,1,1,1,1), -- Kraken Vambraces
+(@ICC_TrashGenericGreen,36469,0,1,1,1,1), -- Lidless Orb
+(@ICC_TrashGenericGreen,36513,0,1,1,1,1), -- Lode-Headed Hammer
+(@ICC_TrashGenericGreen,36414,0,1,1,1,1), -- Mammoth Fur Cloack
+(@ICC_TrashGenericGreen,36483,0,1,1,1,1), -- Mandible Edge
+(@ICC_TrashGenericGreen,36625,0,1,1,1,1), -- Massive Recurved Bow
+(@ICC_TrashGenericGreen,36555,0,1,1,1,1), -- Minion Staff
+(@ICC_TrashGenericGreen,36651,0,1,1,1,1), -- Muzzled Musket
+(@ICC_TrashGenericGreen,36680,0,1,1,1,1), -- Mystic Fang
+(@ICC_TrashGenericGreen,36498,0,1,1,1,1), -- Nerubian Mace
+(@ICC_TrashGenericGreen,36512,0,1,1,1,1), -- Onerous Mallet
+(@ICC_TrashGenericGreen,36441,0,1,1,1,1), -- Pearl Woven Choker
+(@ICC_TrashGenericGreen,36540,0,1,1,1,1), -- Petrified Sword
+(@ICC_TrashGenericGreen,36610,0,1,1,1,1), -- Plagued Pike
+(@ICC_TrashGenericGreen,36595,0,1,1,1,1), -- Planate Broadaxe
+(@ICC_TrashGenericGreen,36455,0,1,1,1,1), -- Plated Bulwark
+(@ICC_TrashGenericGreen,36443,0,1,1,1,1), -- Platinum Medallion
+(@ICC_TrashGenericGreen,36666,0,1,1,1,1), -- Polar Wand
+(@ICC_TrashGenericGreen,36653,0,1,1,1,1), -- Precipice Longrifle
+(@ICC_TrashGenericGreen,36147,0,1,1,1,1), -- Pygmy Belt
+(@ICC_TrashGenericGreen,36154,0,1,1,1,1), -- Pygmy Bindings
+(@ICC_TrashGenericGreen,36148,0,1,1,1,1), -- Pygmy Boots
+(@ICC_TrashGenericGreen,36150,0,1,1,1,1), -- Pygmy Gloves
+(@ICC_TrashGenericGreen,36151,0,1,1,1,1), -- Pygmy Helmet
+(@ICC_TrashGenericGreen,36152,0,1,1,1,1), -- Pygmy Pants
+(@ICC_TrashGenericGreen,36153,0,1,1,1,1), -- Pygmy Shoulders
+(@ICC_TrashGenericGreen,36149,0,1,1,1,1), -- Pygmy Tunic
+(@ICC_TrashGenericGreen,36722,0,1,1,1,1), -- Pyramid Throwing Star
+(@ICC_TrashGenericGreen,36389,0,1,1,1,1), -- Revenant Armor
+(@ICC_TrashGenericGreen,36387,0,1,1,1,1), -- Revenant Belt
+(@ICC_TrashGenericGreen,36394,0,1,1,1,1), -- Revenant Bracers
+(@ICC_TrashGenericGreen,36393,0,1,1,1,1), -- Revenant Epaulets
+(@ICC_TrashGenericGreen,36390,0,1,1,1,1), -- Revenant Gauntlets
+(@ICC_TrashGenericGreen,36388,0,1,1,1,1), -- Revenant Greaves
+(@ICC_TrashGenericGreen,36391,0,1,1,1,1), -- Revenant Helmet
+(@ICC_TrashGenericGreen,36392,0,1,1,1,1), -- Revenant Legguards
+(@ICC_TrashGenericGreen,36596,0,1,1,1,1), -- Rupturing Axe
+(@ICC_TrashGenericGreen,36569,0,1,1,1,1), -- Savage Talons
+(@ICC_TrashGenericGreen,36693,0,1,1,1,1), -- Serene Hammer
+(@ICC_TrashGenericGreen,36624,0,1,1,1,1), -- Shrieking Bow
+(@ICC_TrashGenericGreen,36442,0,1,1,1,1), -- Silken Cord Amulet
+(@ICC_TrashGenericGreen,36679,0,1,1,1,1), -- Singing Dagger
+(@ICC_TrashGenericGreen,36485,0,1,1,1,1), -- Sinuous Keris
+(@ICC_TrashGenericGreen,36567,0,1,1,1,1), -- Six-Fingered Claws
+(@ICC_TrashGenericGreen,36583,0,1,1,1,1), -- Skeletal Hacker
+(@ICC_TrashGenericGreen,36526,0,1,1,1,1), -- SLeeted Longsword
+(@ICC_TrashGenericGreen,36708,0,1,1,1,1), -- Snow Blossom Staff
+(@ICC_TrashGenericGreen,36667,0,1,1,1,1), -- Solid Ice Wand
+(@ICC_TrashGenericGreen,36275,0,1,1,1,1), -- Spiderlord Belt
+(@ICC_TrashGenericGreen,36276,0,1,1,1,1), -- Spiderlord Boots
+(@ICC_TrashGenericGreen,36282,0,1,1,1,1), -- Spiderlord Bracers
+(@ICC_TrashGenericGreen,36277,0,1,1,1,1), -- Spiderlord Chestpiece
+(@ICC_TrashGenericGreen,36278,0,1,1,1,1), -- Spiderlord Gauntlets
+(@ICC_TrashGenericGreen,36279,0,1,1,1,1), -- Spiderlord Helm
+(@ICC_TrashGenericGreen,36280,0,1,1,1,1), -- Spiderlord Legguards
+(@ICC_TrashGenericGreen,36281,0,1,1,1,1), -- Spiderlord Spaulders
+(@ICC_TrashGenericGreen,36429,0,1,1,1,1), -- Spur Ring
+(@ICC_TrashGenericGreen,36652,0,1,1,1,1), -- Stocky Shotgun
+(@ICC_TrashGenericGreen,36274,0,1,1,1,1), -- Ulduar Bracers
+(@ICC_TrashGenericGreen,36269,0,1,1,1,1), -- Ulduar Breastplate
+(@ICC_TrashGenericGreen,36270,0,1,1,1,1), -- Ulduar Gauntlets
+(@ICC_TrashGenericGreen,36267,0,1,1,1,1), -- Ulduar Girdle
+(@ICC_TrashGenericGreen,36268,0,1,1,1,1), -- Ulduar Greaves
+(@ICC_TrashGenericGreen,36271,0,1,1,1,1), -- Ulduar Helm
+(@ICC_TrashGenericGreen,36272,0,1,1,1,1), -- Ulduar Legguards
+(@ICC_TrashGenericGreen,36273,0,1,1,1,1), -- Ulduar Shoulderguards
+(@ICC_TrashGenericGreen,36415,0,1,1,1,1), -- Vintage Satin Cloak
+(@ICC_TrashGenericGreen,36058,0,1,1,1,1), -- Vizier Bracelets
+(@ICC_TrashGenericGreen,36054,0,1,1,1,1), -- Vizier Gloves
+(@ICC_TrashGenericGreen,36055,0,1,1,1,1), -- Vizier Hood
+(@ICC_TrashGenericGreen,36056,0,1,1,1,1), -- Vizier Leggings
+(@ICC_TrashGenericGreen,36057,0,1,1,1,1), -- Vizier Mantle
+(@ICC_TrashGenericGreen,36053,0,1,1,1,1), -- Vizier Robe
+(@ICC_TrashGenericGreen,36051,0,1,1,1,1), -- Vizier Sash
+(@ICC_TrashGenericGreen,36052,0,1,1,1,1), -- Vizier SLippers
+(@ICC_TrashGenericGreen,36665,0,1,1,1,1), -- Wasteland Wand
+(@ICC_TrashGenericGreen,36170,0,1,1,1,1), -- Webspinner Bindings
+(@ICC_TrashGenericGreen,36164,0,1,1,1,1), -- Webspinner Boots
+(@ICC_TrashGenericGreen,36163,0,1,1,1,1), -- Webspinner Cord
+(@ICC_TrashGenericGreen,36166,0,1,1,1,1), -- Webspinner Gloves
+(@ICC_TrashGenericGreen,36167,0,1,1,1,1), -- Webspinner Hood
+(@ICC_TrashGenericGreen,36168,0,1,1,1,1), -- Webspinner Leggings
+(@ICC_TrashGenericGreen,36169,0,1,1,1,1), -- Webspinner Shoulderguards
+(@ICC_TrashGenericGreen,36165,0,1,1,1,1), -- Webspinner Vest
+(@ICC_TrashGenericGreen,36162,0,1,1,1,1), -- Wendigo Bands
+(@ICC_TrashGenericGreen,36156,0,1,1,1,1), -- Wendigo Boots
+(@ICC_TrashGenericGreen,36157,0,1,1,1,1), -- Wendigo Chestpiece
+(@ICC_TrashGenericGreen,36155,0,1,1,1,1), -- Wendigo Girdle
+(@ICC_TrashGenericGreen,36158,0,1,1,1,1), -- Wendigo Gloves
+(@ICC_TrashGenericGreen,36159,0,1,1,1,1), -- Wendigo Hood
+(@ICC_TrashGenericGreen,36160,0,1,1,1,1), -- Wendigo Legguards
+(@ICC_TrashGenericGreen,36161,0,1,1,1,1), -- Wendigo Pauldrons
+(@ICC_TrashGenericGreen,36541,0,1,1,1,1), -- Wintry Claymore
+(@ICC_TrashGenericGreen,36681,0,1,1,1,1), -- Wisdom Carver
+(@ICC_TrashGenericGreen,36581,0,1,1,1,1), -- Wolvar Handaxe
+-- blue items
+(@ICC_TrashGenericBlue,37792,0,1,1,1,1), -- Agin's Crushing Carapace
+(@ICC_TrashGenericBlue,37770,0,1,1,1,1), -- Bulge-Concealing Breastplate
+(@ICC_TrashGenericBlue,37780,0,1,1,1,1), -- Condor-Bone Chestguard
+(@ICC_TrashGenericBlue,37760,0,1,1,1,1), -- Cracklefire Wristguards
+(@ICC_TrashGenericBlue,37781,0,1,1,1,1), -- Grips of the Warming Heart
+(@ICC_TrashGenericBlue,37824,0,1,1,1,1), -- Gwyneth's Runed Dragonwand
+(@ICC_TrashGenericBlue,37761,0,1,1,1,1), -- Shimmerthread Girdle
+(@ICC_TrashGenericBlue,37793,0,1,1,1,1), -- Skullcage of Eternal Terror
+(@ICC_TrashGenericBlue,37794,0,1,1,1,1), -- Torta's Oversized Choker
+(@ICC_TrashGenericBlue,37822,0,1,1,1,1), -- Twisted Puzzle-Ring
+(@ICC_TrashGenericBlue,37771,0,1,1,1,1), -- Wristguard of Verdant Recovery
+-- Designs
+(@ICC_TrashGenericBlue,41788,0,1,1,1,1), -- Design: Beaming Earthsiege Diamond
+(@ICC_TrashGenericBlue,41780,0,1,1,1,1), -- Design: Champion's Monarch Topaz
+(@ICC_TrashGenericBlue,41786,0,1,1,1,1), -- Design: Destructive Skyflare Diamond
+(@ICC_TrashGenericBlue,41777,0,1,1,1,1), -- Design: Etched Monarch Topaz
+(@ICC_TrashGenericBlue,41789,0,1,1,1,1), -- Design: Inscribed Monarch Topaz
+(@ICC_TrashGenericBlue,41781,0,1,1,1,1), -- Design: Misty Forest Emerald
+(@ICC_TrashGenericBlue,41783,0,1,1,1,1), -- Design: Purified Twilight Opal
+(@ICC_TrashGenericBlue,41778,0,1,1,1,1), -- Design: Resolute MOnarch Topaz
+(@ICC_TrashGenericBlue,41782,0,1,1,1,1), -- Design: Shining Forest Emerald
+(@ICC_TrashGenericBlue,41784,0,1,1,1,1), -- Design: Sovereign Twilight Opal
+(@ICC_TrashGenericBlue,41779,0,1,1,1,1), -- Design: Stalwart Monarch Topaz
+(@ICC_TrashGenericBlue,41785,0,1,1,1,1), -- Design: Tenuous Twilight Opal
+(@ICC_TrashGenericBlue,41787,0,1,1,1,1), -- Design: Thundering Skyflare Diamond
+-- tailoring
+(@ICC_TrashGenericBlue,43876,0,1,1,1,1), -- A Guide to Northern Cloth Scavenging
+-- purple items icc (7)
+(@ICC_TrashGenericPurpleICC,50444,0,1,1,1,1), -- Rowan's Rifle of Silver Bullets
+(@ICC_TrashGenericPurpleICC,50451,0,1,1,1,1), -- Belt of the Lonely Noble
+(@ICC_TrashGenericPurpleICC,50450,0,1,1,1,1), -- Leggings of Dubious Charms
+(@ICC_TrashGenericPurpleICC,50449,0,1,1,1,1), -- Stiffened Corpse Shoulderpads
+(@ICC_TrashGenericPurpleICC,50453,0,1,1,1,1), -- Ring of Rotting Sinew
+(@ICC_TrashGenericPurpleICC,50447,0,1,1,1,1), -- Harbinger's Bone Band
+(@ICC_TrashGenericPurpleICC,50452,0,1,1,1,1), -- Wodin's Lucky Necklace
+-- Generic World Epics
+(@ICC_TrashGenericPurple,44311,0,1,1,1,1), -- Avool's Sword of Jin
+(@ICC_TrashGenericPurple,37835,0,1,1,1,1), -- Je'Tze's Bell
+(@ICC_TrashGenericPurple,44310,0,1,1,1,1), -- Namlak's Supernumerary Sticker
+(@ICC_TrashGenericPurple,44309,0,1,1,1,1), -- Sash of Jordan
+(@ICC_TrashGenericPurple,44308,0,1,1,1,1), -- Signet of Edward the Odd
+(@ICC_TrashGenericPurple,37254,0,1,1,1,1), -- Super Simian Sphere
+(@ICC_TrashGenericPurple,44312,0,1,1,1,1), -- Wapach's Spaulders of Solidarity
+(@ICC_TrashGenericPurple,44313,0,1,1,1,1), -- Zom's Crackling Bulwark
+-- purple items dungeon_N (4)
+(@ICC_TrashGenericPurpleDUNN,49852,0,1,1,1,1), -- Coffin Nail
+(@ICC_TrashGenericPurpleDUNN,49855,0,1,1,1,1), -- Plated Grips of Korth'azz
+(@ICC_TrashGenericPurpleDUNN,49853,0,1,1,1,1), -- Titanium Links of Lore
+(@ICC_TrashGenericPurpleDUNN,49854,0,1,1,1,1), -- Mantle of Tattered Feathers
+-- purple items dungeon_H (3)
+(@ICC_TrashGenericPurpleDUNH,50319,0,1,1,1,1), -- Unsharpened Ice Razor
+(@ICC_TrashGenericPurpleDUNH,50315,0,1,1,1,1), -- Seven-Fingered Claws
+(@ICC_TrashGenericPurpleDUNH,50318,0,1,1,1,1), -- Ghostly Wristwraps
+-- final output icc
+(@ICC_TrashCitadelFinal,1,40,1,0,-@ICC_TrashGenericGrey,1), -- 1 grey loot (40%)
+(@ICC_TrashCitadelFinal,2,40,1,0,-@ICC_TrashGenericGrey,1), -- 1 grey loot (40%)
+(@ICC_TrashCitadelFinal,3,20,1,0,-@ICC_TrashGenericWhite,1), -- 1 white loot (20%)
+(@ICC_TrashCitadelFinal,4,7,1,0,-@ICC_TrashGenericScroll,1), -- 1 scroll loot (7%)
+(@ICC_TrashCitadelFinal,5,10,1,0,-@ICC_TrashGenericGreen,1), -- 1 green loot (10%)
+(@ICC_TrashCitadelFinal,6,3,1,0,-@ICC_TrashGenericBlue,1), -- 1 blue loot (3%)
+(@ICC_TrashCitadelFinal,7,2,1,0,-@ICC_TrashGenericPurpleICC,1), -- 1 purple icc loot (2%)
+(@ICC_TrashCitadelFinal,8,1,1,0,-@ICC_TrashGenericPurple,1), -- 1 purple world loot (1%)
+-- final output dungeon_n
+(@ICC_TrashDungeonNFinal,1,40,1,0,-@ICC_TrashGenericGrey,1), -- 1 grey loot (40%)
+(@ICC_TrashDungeonNFinal,2,40,1,0,-@ICC_TrashGenericGrey,1), -- 1 grey loot (40%)
+(@ICC_TrashDungeonNFinal,3,20,1,0,-@ICC_TrashGenericWhite,1), -- 1 white loot (20%)
+(@ICC_TrashDungeonNFinal,4,7,1,0,-@ICC_TrashGenericScroll,1), -- 1 scroll loot (7%)
+(@ICC_TrashDungeonNFinal,5,10,1,0,-@ICC_TrashGenericGreen,1), -- 1 green loot (10%)
+(@ICC_TrashDungeonNFinal,6,3,1,0,-@ICC_TrashGenericBlue,1), -- 1 blue loot (3%)
+(@ICC_TrashDungeonNFinal,7,2,1,0,-@ICC_TrashGenericPurpleDUNN,1), -- 1 purple dungeon loot (2%)
+(@ICC_TrashDungeonNFinal,8,1,1,0,-@ICC_TrashGenericPurple,1), -- 1 purple world loot (1%)
+-- final output dungeon_h
+(@ICC_TrashDungeonHFinal,1,40,1,0,-@ICC_TrashGenericGrey,1), -- 1 grey loot (40%)
+(@ICC_TrashDungeonHFinal,2,40,1,0,-@ICC_TrashGenericGrey,1), -- 1 grey loot (40%)
+(@ICC_TrashDungeonHFinal,3,20,1,0,-@ICC_TrashGenericWhite,1), -- 1 white loot (20%)
+(@ICC_TrashDungeonHFinal,4,7,1,0,-@ICC_TrashGenericScroll,1), -- 1 scroll loot (7%)
+(@ICC_TrashDungeonHFinal,5,10,1,0,-@ICC_TrashGenericGreen,1), -- 1 green loot (10%)
+(@ICC_TrashDungeonHFinal,6,3,1,0,-@ICC_TrashGenericBlue,1), -- 1 blue loot (3%)
+(@ICC_TrashDungeonHFinal,7,2,1,0,-@ICC_TrashGenericPurpleDUNH,1), -- 1 purple heroicdungeon loot (1%)
+(@ICC_TrashDungeonHFinal,8,1,1,0,-@ICC_TrashGenericPurple,1); -- 1 purple world loot (1%)
+
+
+-- --------------------------------
+-- -- Apply Trash Loot Dungeon_N --
+-- --------------------------------
+SET @LootDUNGEON_N := 100000; -- needs official entry designated
+UPDATE `creature_template` SET `lootid`=@LootDUNGEON_N WHERE `entry` IN (36522,36620,36516,36564,36499,36478,36666); -- FoS
+UPDATE `creature_template` SET `lootid`=@LootDUNGEON_N WHERE `entry` IN (36896,36842,36830,36879,37711,36788,37712,37713); -- PoS
+UPDATE `creature_template` SET `lootid`=@LootDUNGEON_N WHERE `entry` IN (38176,38177,38173,38172,38175,36723); -- HoR
+DELETE FROM `creature_loot_template` WHERE `entry` IN (36522,36620,36516,36564,36499,36478,36666,36896,36842,36830,36879,37711,36788,37712,37713,38176,38177,38173,38172,38175,36723,@LootDUNGEON_N);
+INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES
+(@LootDUNGEON_N,1,100,1,0,-@ICC_TrashDungeonNFinal,2); -- 2 selection from reference
+
+-- --------------------------------
+-- -- Apply Trash Loot Dungeon_H --
+-- -------------------------------- 
+SET @LootDUNGEON_H := 100001; -- needs official entry designated
+UPDATE `creature_template` SET `lootid`=@LootDUNGEON_H WHERE `entry` IN (37569,37568,37567,37565,38193,37566,37563); -- FoS
+UPDATE `creature_template` SET `lootid`=@LootDUNGEON_H WHERE `entry` IN (37609,37638,37637,37635,37636,38249,38025,38026); -- PoS
+UPDATE `creature_template` SET `lootid`=@LootDUNGEON_H WHERE `entry` IN (37720,38524,38525,38563,38544,38564); -- HoR
+DELETE FROM `creature_loot_template` WHERE `entry` IN (37569,37568,37567,37565,38193,37566,37563,37609,37638,37637,37635,37636,38249,38025,38026,37720,38524,38525,38563,38544,38564,@LootDUNGEON_H);
+INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES
+(@LootDUNGEON_H,1,100,1,0,-@ICC_TrashDungeonHFinal,2); -- 2 selection from reference
+
+-- --------------------------
+-- -- Apply Trash Loot ICC --
+-- --------------------------
+SET @LootRAID := 100002; -- needs official entry designated
+UPDATE `creature_template` SET `lootid`=@LootRAID WHERE `entry` IN(37012,37022,37571,37664,37595,37662,37665,37663,37666,37007,36811,36807,36829,36805,36808,36880,37546,37531,37229,37228,36725,37501,37502,37023,10404,38494,38490,36724,37126,37544,37545,37098,37038);
+DELETE FROM `creature_loot_template` WHERE `entry` IN(37012,37022,37571,37664,37595,37662,37665,37663,37666,37007,36811,36807,36829,36805,36808,36880,37546,37531,37229,37228,36725,37501,37502,37023,10404,38494,38490,36724,37126,37544,37545,37098,37038,@LootRAID);
+INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES
+(@LootRAID,1,100,1,0,-@ICC_TrashCitadelFinal,2); -- 2 selection from reference
+
+-- --------------------
+-- -- Special Cases: --
+-- --------------------
+-- Specialids
+CALL `sp_set_npc_lootid_bylist` ('37217,37025,37230,37532,36891',NULL);
+-- Loot
+DELETE FROM `creature_loot_template` WHERE `entry` IN (37217,37025,37230,37532,36891);
+INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES
+-- Precious
+(37217,1,100,1,0,-@ICC_TrashCitadelFinal,2), -- 2 selection from reference
+(37217,52019,30,1,0,1,1), -- Precious Ribbon
+-- Stinky
+(37025,1,100,1,0,-@ICC_TrashCitadelFinal,2), -- 2 selection from reference
+-- Dragons (Spire Frostwyrm)
+(37230,1,100,1,0,-@ICC_TrashCitadelFinal,2), -- 2 selection from reference
+(37230,33631,65,1,1,2,3), -- Frosted Claw
+(37230,33632,35,1,1,2,3), -- Icicle Fang
+(37532,33631,65,1,1,2,3), -- Frosted Claw
+(37532,33632,35,1,1,2,3), -- Icicle Fang
+(36891,33631,65,1,1,2,3), -- Frosted Claw
+(36891,33632,35,1,1,2,3); -- Icicle Fang
diff --git a/sql/updates/world/2011_03_24_02_world_sai.sql b/sql/updates/world/2011_03_24_02_world_sai.sql
new file mode 100644
index 00000000000..b4ee24b0a31
--- /dev/null
+++ b/sql/updates/world/2011_03_24_02_world_sai.sql
@@ -0,0 +1,137 @@
+-- Jean Pierre Poulain SAI
+SET @ENTRY  := 34244;
+SET @GOSSIP := 10478;
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,62,0,100,0,@GOSSIP,0,0,0,11,64795,1,0,0,0,0,7,0,0,0,0,0,0,0, 'Jean Pierre Poulain - On gossip option select - cast spell');
+-- Cleanup gossip
+UPDATE `gossip_menu_option` SET `action_script_id`=0 WHERE `menu_id`=@GOSSIP;
+DELETE FROM `gossip_scripts` WHERE `id` IN (1047800);
+
+-- Fizzcrank Fullthrottle SAI
+SET @ENTRY  := 25590;
+SET @GOSSIP := 9182;
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,1,62,0,100,0,@GOSSIP,0,0,0,15,11708,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Fizzcrank Fullthrottle - On gossip option select - quest complete'),
+(@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, 'Fizzcrank Fullthrottle - On gossip option select - close gossip');
+-- Cleanup gossip
+UPDATE `gossip_menu_option` SET `action_script_id`=0 WHERE `menu_id`=@GOSSIP;
+DELETE FROM `gossip_scripts` WHERE `id` IN (918200);
+
+-- Keeper Remulos SAI
+SET @ENTRY  := 11832;
+SET @GOSSIP := 10215;
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,62,0,100,0,@GOSSIP,0,0,0,11,57413,1,0,0,0,0,7,0,0,0,0,0,0,0, 'Keeper Remulos - On gossip option select - cast spell'),
+(@ENTRY,0,1,2,62,0,100,0,@GOSSIP,1,0,0,11,57670,1,0,0,0,0,7,0,0,0,0,0,0,0, 'Keeper Remulos - On gossip option select - cast spell'),
+(@ENTRY,0,2,0,61,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Keeper Remulos - On gossip option select - close gossip');
+-- Cleanup gossip
+UPDATE `gossip_menu_option` SET `action_script_id`=0 WHERE `menu_id`=@GOSSIP;
+DELETE FROM `gossip_scripts` WHERE `id` IN (1021500,1021501);
+
+-- Fizzcrank Recon Pilot SAI
+SET @ENTRY  := 25841;
+SET @GOSSIP := 21248;
+SET @SCRIPT := 212481;
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,1,62,0,100,0,@GOSSIP,0,0,0,11,46362,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Fizzcrank Recon Pilot - On gossip option select - cast spell'),
+(@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, 'Fizzcrank Recon Pilot - On gossip option select - close gossip'),
+(@ENTRY,0,2,0,11,0,100,0,0,0,0,0,81,2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Fizzcrank Recon Pilot - On spawn - set gossip flag'),
+(@ENTRY,0,3,4,8,0,100,0,46362,0,0,0,11,46362,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Fizzcrank Recon Pilot - On spellhit - cast spell on envoker'),
+(@ENTRY,0,4,0,61,0,100,0,0,0,0,0,23,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Fizzcrank Recon Pilot - On spellhit - set phase 1'),
+(@ENTRY,0,5,0,1,1,100,0,3000,3000,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Fizzcrank Recon Pilot - OOC - wait 3 sec despawn (Phase 1)');
+-- Cleanup EAI
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY;
+-- Cleanup gossip
+UPDATE `gossip_menu_option` SET `action_script_id`=0 WHERE `menu_id`=@GOSSIP AND `id`=0;
+DELETE FROM `gossip_scripts` WHERE `id`=@SCRIPT;
+
+-- Glodrak Huntsniper SAI
+SET @ENTRY  := 24657;
+SET @GOSSIP := 10603;
+SET @SCRIPT := 1060400;
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,1,62,0,100,0,@GOSSIP,0,0,0,11,66592,1,0,0,0,0,7,0,0,0,0,0,0,0, 'Glodrak Huntsniper - On gossip option select - cast spell'),
+(@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, 'Glodrak Huntsniper - On gossip option select - close gossip');
+-- Cleanup gossip
+UPDATE `gossip_menu_option` SET `action_script_id`=0 WHERE `menu_id`=@GOSSIP AND `id`=0;
+DELETE FROM `gossip_scripts` WHERE `id`=@SCRIPT;
+-- Goldark Snipehunter SAI
+SET @ENTRY  := 23486;
+SET @GOSSIP := 10604;
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,1,62,0,100,0,@GOSSIP,0,0,0,11,66592,1,0,0,0,0,7,0,0,0,0,0,0,0, 'Goldark Snipehunter - On gossip option select - cast spell'),
+(@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, 'Goldark Snipehunter - On gossip option select - close gossip');
+-- Cleanup gossip
+UPDATE `gossip_menu_option` SET `action_script_id`=0 WHERE `menu_id`=@GOSSIP AND `id`=0;
+
+-- Pol Amberstill & Driz Tumblequick SAI
+SET @ENTRY   := 24468;
+SET @ENTRY1  := 24510;
+SET @GOSSIP  := 8958;
+SET @GOSSIP1 := 8960;
+SET @SCRIPT  := 895800;
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry` IN (@ENTRY,@ENTRY1);
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (@ENTRY,@ENTRY1);
+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
+-- Pol Amberstill
+(@ENTRY,0,0,1,62,0,100,0,@GOSSIP,6,0,0,11,44262,1,0,0,0,0,7,0,0,0,0,0,0,0, 'Pol Amberstill - On gossip option select - cast spell'),
+(@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, 'Pol Amberstill - On gossip option select - close gossip'),
+(@ENTRY,0,2,3,62,0,100,0,@GOSSIP1,0,0,0,11,44262,1,0,0,0,0,7,0,0,0,0,0,0,0, 'Pol Amberstill - On gossip option select - cast spell'),
+(@ENTRY,0,3,0,61,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Pol Amberstill - On gossip option select - close gossip'),
+-- Driz Tumblequick
+(@ENTRY1,0,0,1,62,0,100,0,@GOSSIP,6,0,0,11,44262,1,0,0,0,0,7,0,0,0,0,0,0,0, 'Driz Tumblequick - On gossip option select - cast spell'),
+(@ENTRY1,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, 'Driz Tumblequick - On gossip option select - close gossip'),
+(@ENTRY1,0,2,3,62,0,100,0,@GOSSIP1,0,0,0,11,44262,1,0,0,0,0,7,0,0,0,0,0,0,0, 'Driz Tumblequick - On gossip option select - cast spell'),
+(@ENTRY1,0,3,0,61,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Driz Tumblequick - On gossip option select - close gossip');
+-- Ckeanup gossip
+UPDATE `gossip_menu_option` SET `action_script_id`=0 WHERE `menu_id`=@GOSSIP AND `id`=6;
+UPDATE `gossip_menu_option` SET `action_script_id`=0 WHERE `menu_id`=@GOSSIP1 AND `id`=0;
+DELETE FROM `gossip_scripts` WHERE `id`=@SCRIPT;
+
+-- Steel Gate Chief Archaeologist SAI
+SET @ENTRY  := 24399;
+SET @GOSSIP := 8953;
+SET @SCRIPT := 895300;
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,1,62,0,100,0,@GOSSIP,0,0,0,11,43533,1,0,0,0,0,7,0,0,0,0,0,0,0, 'Steel Gate Chief Archaeologist - On gossip option select - cast spell'),
+(@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, 'Steel Gate Chief Archaeologist - On gossip option select - close gossip');
+-- Cleanup gossip
+UPDATE `gossip_menu_option` SET `action_script_id`=0 WHERE `menu_id`=@GOSSIP AND `id`=0;
+DELETE FROM `gossip_scripts` WHERE `id`=@SCRIPT;
+
+-- Drakuru SAI
+SET @ENTRY := 26423;
+SET @GOSSIP := 21249;
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,1,62,0,100,0,@GOSSIP,0,0,0,33,27921,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Drakuru - On gossip option select - killcredit'),
+(@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, 'Drakuru - On gossip option select - close gossip');
+-- Cleanup gossip
+UPDATE `gossip_menu_option` SET `action_script_id`=0 WHERE `menu_id`=@GOSSIP AND `id`=0;
+DELETE FROM `gossip_scripts` WHERE `id`=@GOSSIP;
+
+-- Dread Captain DeMeza SAI
+SET @ENTRY := 28048;
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,1,62,0,100,0,9647,0,0,0,11,50517,1,0,0,0,0,7,0,0,0,0,0,0,0, 'Dread Captain DeMeza - On gossip option select - cast spell'),
+(@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, 'Dread Captain DeMeza - On gossip option select - close gossip');
+-- Cleanup gossip
+UPDATE `gossip_menu_option` SET `action_script_id`=0 WHERE `menu_id`=9647 AND `id`=0;
+DELETE FROM `gossip_scripts` WHERE `id`=9647;
diff --git a/sql/updates/world/2011_03_24_03_world_sai.sql b/sql/updates/world/2011_03_24_03_world_sai.sql
new file mode 100644
index 00000000000..fa560592d06
--- /dev/null
+++ b/sql/updates/world/2011_03_24_03_world_sai.sql
@@ -0,0 +1,61 @@
+-- Scourge Deathspeaker SAI 
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=27615;
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=27615;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=27615;
+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
+(27615,0,0,1,1,0,100,1,1000,1000,1000,1000,11,49119,2,0,0,0,0,10,101497,27452,0,0,0,0,0,'Scourge Deathspeaker - Spawn & reset - channel Fire Beam'),
+(27615,0,1,0,61,0,100,1,0,0,0,0,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Scourge Deathspeaker - Spawn & reset - Prevent Combat Movement'),
+(27615,0,2,3,4,0,100,1,0,0,0,0,11,52282,2,0,0,0,0,2,0,0,0,0,0,0,0,'Scourge Deathspeaker - On aggro - Cast Fireball'),
+(27615,0,3,0,61,0,100,1,0,0,0,0,22,1,0,0,0,0,0,0,0,0,0,0,0,0,0,'Scourge Deathspeaker - On aggro - Set phase 1'),
+(27615,0,4,0,9,1,100,0,3000,3000,3400,4800,11,52282,1,0,0,0,0,2,0,0,0,0,0,0,0,'Scourge Deathspeaker - in combat - Cast Fireball (phase 1)'),
+(27615,0,5,0,9,1,100,0,35,80,1000,1000,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Scourge Deathspeaker - At 35 Yards - Start Combat Movement (phase 1)'),
+(27615,0,6,0,9,1,100,0,5,15,1000,1000,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Scourge Deathspeaker - At 15 Yards - Prevent Combat Movement (phase 1)'),
+(27615,0,7,0,9,1,100,0,0,5,1000,1000,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Scourge Deathspeaker - Below 5 Yards - Start Combat Movement (phase 1)'),
+(27615,0,8,0,3,1,100,1,0,7,0,0,22,2,0,0,0,0,0,0,0,0,0,0,0,0,0,'Scourge Deathspeaker - Mana at 7% - Set Phase 2 (phase 1)'),
+(27615,0,9,0,0,2,100,1,0,0,0,0,21,1,0,0,0,0,0,0,0,0,0,0,0,0,0,'Scourge Deathspeaker - In combat - Allow Combat Movement (phase 2)'),
+(27615,0,10,0,3,2,100,1,15,100,100,100,22,1,0,0,0,0,0,0,0,0,0,0,0,0,0,'Scourge Deathspeaker - Mana above 15% - Set Phase 1 (phase 2)'),
+(27615,0,11,0,2,0,100,1,0,30,120000,130000,11,52281,0,0,0,0,0,2,0,0,0,0,0,0,0,'Scourge Deathspeaker - At 15% HP - Cast Flame of the Seer'),
+(27615,0,12,0,2,0,100,1,0,15,0,0,22,3,0,0,0,0,0,0,0,0,0,0,0,0,0,'Scourge Deathspeaker - At 15% HP - Set Phase 3'),
+(27615,0,13,0,2,4,100,1,0,15,0,0,21,1,0,0,0,0,0,0,0,0,0,0,0,0,0,'Scourge Deathspeaker - At 15% HP - Allow Combat Movement (phase 3)'),
+(27615,0,14,15,2,4,100,1,0,15,0,0,25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'Scourge Deathspeaker - At 15% HP - Flee (phase 3)'),
+(27615,0,15,0,61,4,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Scourge Deathspeaker - At 15% HP - Say text0 (Phase 3)');
+
+-- NPC talk text insert
+DELETE FROM `creature_text` WHERE `entry` IN (27615);
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(27615,0,0, '%s attempts to run away in fear!',2,0,100,0,0,0, 'Scourge Deathspeaker');
+
+-- SET InhabitType for Invisible Stalker Grizzly Hills
+UPDATE `creature_template` SET `InhabitType`=7 WHERE `entry`=27452;
+
+-- SAI for Dark Conclave Ritualist
+SET @ENTRY := 22138;
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,1,0,100,1,1000,1000,1000,1000,11,38469,0,0,0,0,0,19,22139,0,0,0,0,0,0,'Dark Conclave Ritualist - OOC - Dark Conclave Ritualist Channel');
+
+-- Shattered Sun Marksman fixup (tested) 
+-- Console no longer spamming waypoint script errors in The Dawning Square
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=24938;
+-- Shattered Sun Marksman shoot at Bridge Marksman Target Dummy SAI
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (-65694,-65695,-65696,-65697,-65698,-65699,-65700,-65702);
+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
+(-65694,0,0,0,1,0,100,0,5000,5000,5000,7000,11,45223,0,0,0,0,0,10,62844,25192,0,0,0,0,0,'Shattered Sun Marksman - OOC 5-7 sec - Shoot at trigger'),
+(-65695,0,0,0,1,0,100,0,2000,2000,5000,7000,11,45223,0,0,0,0,0,10,62844,25192,0,0,0,0,0,'Shattered Sun Marksman - OOC 5-7 sec - Shoot at trigger'),
+(-65696,0,0,0,1,0,100,0,3000,3000,5000,7000,11,45223,0,0,0,0,0,10,62843,25192,0,0,0,0,0,'Shattered Sun Marksman - OOC 5-7 sec - Shoot at trigger'),
+(-65697,0,0,0,1,0,100,0,6000,6000,5000,7000,11,45223,0,0,0,0,0,10,62843,25192,0,0,0,0,0,'Shattered Sun Marksman - OOC 5-7 sec - Shoot at trigger'),
+(-65698,0,0,0,1,0,100,0,2000,2000,5000,7000,11,45223,0,0,0,0,0,10,59515,25192,0,0,0,0,0,'Shattered Sun Marksman - OOC 5-7 sec - Shoot at trigger'),
+(-65699,0,0,0,1,0,100,0,5000,5000,5000,7000,11,45223,0,0,0,0,0,10,62841,25192,0,0,0,0,0,'Shattered Sun Marksman - OOC 5-7 sec - Shoot at trigger'),
+(-65700,0,0,0,1,0,100,0,1000,1000,5000,7000,11,45223,0,0,0,0,0,10,62842,25192,0,0,0,0,0,'Shattered Sun Marksman - OOC 5-7 sec - Shoot at trigger'),
+(-65702,0,0,0,1,0,100,0,5000,5000,5000,7000,11,45223,0,0,0,0,0,10,59473,25192,0,0,0,0,0,'Shattered Sun Marksman - OOC 5-7 sec - Shoot at trigger');
+-- Remove path data and scripts from Shattered Sun Marksman
+DELETE FROM `waypoint_data` WHERE `id` IN (656940,656950,656960,656970,656980,656990,657000,657020);
+DELETE FROM `waypoint_scripts` WHERE `id` BETWEEN 80 AND 111;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=0 WHERE `guid` IN (65694,65695,65696,65697,65698,65699,65700,65702);
+UPDATE `creature_addon` SET `path_id`=0 WHERE `guid` IN (65694,65695,65696,65697,65698,65699,65700,65702);
+
+-- Fix Spell condition for Spell 45223 to target Bridge Marksman Target Dummy 25192 
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=45223;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(13,0,45223,0,18,1,25192,0,0,'','Spell 45223 targets Bridge Marksman Target Dummy');
diff --git a/sql/updates/world/2011_03_24_04_world_sai.sql b/sql/updates/world/2011_03_24_04_world_sai.sql
new file mode 100644
index 00000000000..e0c281fa559
--- /dev/null
+++ b/sql/updates/world/2011_03_24_04_world_sai.sql
@@ -0,0 +1,448 @@
+-- Quest 10895 "Zeth'Gor Must Burn!" (Alliance)
+-- Remove flame spawns from db
+DELETE FROM `gameobject` WHERE `guid` IN (32141,32142,32143,24683,24684,24685,24686);
+-- Remove Honor Hold Gryphon Brigadier, Foothill spawns from db
+DELETE FROM `creature` WHERE `guid` IN (78738,78739,78740,78741);
+-- Zeth'Gor Quest Credit Marker, They Must Burn & Remove Honor Hold Gryphon Brigadier have wrong inhabit type, fix flags
+UPDATE `creature_template` SET `InhabitType`=4 WHERE `entry` IN (21173,21170,22404,22405,22406);
+UPDATE `creature_template` SET `unit_flags`=`unit_flags`|2048 WHERE `entry` IN (21170,22404,22405,22406);
+
+-- Add missing Zeth'Gor Quest Credit Marker, They Must Burn
+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 
+(78738,21173,530,1,1,0,0,-1162.911377,2248.195313,152.24733,4.815845,120,0,0,1,0,0,0);
+
+-- Add missing Go
+DELETE FROM `gameobject_template` WHERE `entry`=183929;
+INSERT INTO `gameobject_template` (`entry`,`type`,`displayId`,`name`,`castBarCaption`,`unk1`,`faction`,`flags`,`size`,`data0`,`data1`,`data2`,`data3`,`data4`,`data5`,`data6`,`data7`,`data8`,`data9`,`data10`,`data11`,`data12`,`data13`,`data14`,`data15`,`data16`,`data17`,`data18`,`data19`,`data20`,`data21`,`data22`,`data23`,`ScriptName`,`WDBVerified`) VALUES 
+(183929,6,0, '', '', '',35,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, '',1);
+
+-- SAI add animation to GameObject Smoke Beacon
+SET @ENTRY := 184661;
+UPDATE `gameobject_template` SET `AIName`= 'SmartGameObjectAI' WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `source_type`=1 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,1,0,0,1,0,100,0,0,0,1000,1000,93,3,0,0,0,0,0,1,0,0,0,0,0,0,0, 'GameObject Smoke Beacon - On Spawn - Do Custom Animation');
+
+-- Add spell conditions for 36325
+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');
+
+-- SAI for Zeth'Gor Quest Credit Marker, They Must Burn, Tower South
+SET @ENTRY := 21182;
+UPDATE `creature_template` SET `minlevel`=1,`maxlevel`=1,`flags_extra`=`flags_extra`&~2,`InhabitType`=4,`AIName`='SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,11,0,100,0,0,0,0,0,53,0,@ENTRY,1,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On Spawn - Start WP movement'),
+(@ENTRY,0,1,2,8,0,100,0,36374,0,0,0,45,0,1,0,0,0,0,10,78738,21173,0,0,0,0,0,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On spell hit - Call Griphonriders'),
+(@ENTRY,0,2,0,61,0,100,0,0,0,0,0,11,34386,2,0,0,0,0,1,0,0,0,0,0,0,0,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On spell hit - Spawn fire');
+
+-- Waypoints for Zeth'Gor Quest Credit Marker, They Must Burn, Tower South from sniff
+DELETE FROM `waypoints` WHERE `entry`=@ENTRY;
+INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
+(@ENTRY,1,-1156.975,2109.627,83.51005,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South WP 1'),
+(@ENTRY,2,-1152.303,2112.098,90.67654,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South WP 2'),
+(@ENTRY,3,-1150.817,2103.74,89.81573,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South WP 3'),
+(@ENTRY,4,-1153.965,2107.031,97.06559,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South WP 4'),
+(@ENTRY,5,-1156.105,2107.421,93.06557,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South WP 5'),
+(@ENTRY,6,-1152.167,2107.406,83.17665,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South WP 6'),
+(@ENTRY,7,-1150.145,2102.392,75.23684,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South WP 7'),
+(@ENTRY,8,-1158.784,2102.993,76.98234,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South WP 8'),
+(@ENTRY,9,-1158.344,2112.019,79.20454,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South WP 9'),
+(@ENTRY,10,-1148.166,2113.343,77.0103,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South WP 10'),
+(@ENTRY,11,-1148.897,2102.624,69.67694,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South WP 11'),
+(@ENTRY,12,-1157.054,2104.975,82.9548,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South WP 12');
+-- Update Creature
+UPDATE `creature` SET `curhealth`=1,`spawndist`=0,`MovementType`=0,`position_x`=-1157.054,`position_y`=2104.975,`position_z`=82.9548,`orientation`=1.186824 WHERE `guid`=74299;
+
+-- SAI for Zeth'Gor Quest Credit Marker, They Must Burn, Tower North
+SET @ENTRY := 22401;
+UPDATE `creature_template` SET `minlevel`=1,`maxlevel`=1,`flags_extra`=`flags_extra`&~2,`InhabitType`=4,`AIName`='SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,11,0,100,0,0,0,0,0,53,0,@ENTRY,1,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower North - On Spawn - Start WP movement'),
+(@ENTRY,0,1,2,8,0,100,0,36374,0,0,0,45,0,2,0,0,0,0,10,74239,21173,0,0,0,0,0,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower North - On spell hit - Call Griphonriders'),
+(@ENTRY,0,2,0,61,0,100,0,0,0,0,0,11,34386,2,0,0,0,0,1,0,0,0,0,0,0,0,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower North - On spell hit - Spawn fire');
+
+-- Waypoints for Zeth'Gor Quest Credit Marker, They Must Burn, Tower North from sniff
+DELETE FROM `waypoints` WHERE `entry`=@ENTRY;
+INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
+(@ENTRY,1,-821.9919,2034.883,55.01843,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower North WP 1'),
+(@ENTRY,2,-820.9771,2027.591,63.68367,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower North WP 2'),
+(@ENTRY,3,-825.2185,2034.113,65.86314,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower North WP 3'),
+(@ENTRY,4,-816.8493,2028.659,49.75199,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower North WP 4'),
+(@ENTRY,5,-825.249,2026.351,46.58422,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower North WP 5');
+-- Update Creature
+UPDATE `creature` SET `curhealth`=1,`spawndist`=0,`MovementType`=0,`position_x`=-825.249,`position_y`=2026.351,`position_z`=46.58422,`orientation`=1.186824 WHERE `guid`=78735;
+
+-- SAI for Zeth'Gor Quest Credit Marker, They Must Burn, Tower Forge
+SET @ENTRY := 22402;
+UPDATE `creature_template` SET `minlevel`=1,`maxlevel`=1,`flags_extra`=`flags_extra`&~2,`InhabitType`=4,`AIName`='SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,11,0,100,0,0,0,0,0,53,0,@ENTRY,1,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower Forge - On Spawn - Start WP movement'),
+(@ENTRY,0,1,2,8,0,100,0,36374,0,0,0,45,0,3,0,0,0,0,10,74239,21173,0,0,0,0,0,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower Forge - On spell hit - Call Griphonriders'),
+(@ENTRY,0,2,0,61,0,100,0,0,0,0,0,11,34386,2,0,0,0,0,1,0,0,0,0,0,0,0,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower Forge - On spell hit - Spawn fire');
+
+-- Waypoints for Zeth'Gor Quest Credit Marker, They Must Burn, Tower Forge from sniff
+DELETE FROM `waypoints` WHERE `entry`=@ENTRY;
+INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
+(@ENTRY,1,-897.1001,1917.556,93.73737,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower Forge WP 1'),
+(@ENTRY,2,-903.386,1919.14,76.0997,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower Forge WP 2'),
+(@ENTRY,3,-898.1819,1920.161,82.67819,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower Forge WP 3'),
+(@ENTRY,4,-901.2836,1920.168,92.57269,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower Forge WP 4'),
+(@ENTRY,5,-894.9478,1924.78,75.48938,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower Forge WP 5'),
+(@ENTRY,6,-894.4704,1919.866,93.71019,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower Forge WP 6');
+-- Update Creature
+UPDATE `creature` SET `curhealth`=1,`spawndist`=0,`MovementType`=0,`position_x`=-894.4704,`position_y`=1919.866,`position_z`=93.71019,`orientation`=1.186824 WHERE `guid`=78736;
+
+-- SAI for Zeth'Gor Quest Credit Marker, They Must Burn, Tower Foothill
+SET @ENTRY := 22403;
+UPDATE `creature_template` SET `minlevel`=1,`maxlevel`=1,`flags_extra`=`flags_extra`&~2,`flags_extra`=`flags_extra`|128,`InhabitType`=4,`AIName`='SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,11,0,100,0,0,0,0,0,53,0,@ENTRY,1,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower Foothill - On Spawn - Start WP movement'),
+(@ENTRY,0,1,2,8,0,100,0,36374,0,0,0,45,0,4,0,0,0,0,10,74239,21173,0,0,0,0,0,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower Foothill - On spell hit - Call Griphonriders'),
+(@ENTRY,0,2,0,61,0,100,0,0,0,0,0,11,34386,2,0,0,0,0,1,0,0,0,0,0,0,0,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower Foothill - On spell hit - Spawn fire');
+
+-- Waypoints for Zeth'Gor Quest Credit Marker, They Must Burn, Tower Foothill from sniff
+DELETE FROM `waypoints` WHERE `entry`=@ENTRY;
+INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
+(@ENTRY,1,-978.3713,1883.556,104.3167,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower Foothill WP 1'),
+(@ENTRY,2,-974.3038,1878.926,109.6782,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower Foothill WP 2'),
+(@ENTRY,3,-974.1463,1874.819,121.9402,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower Foothill WP 3'),
+(@ENTRY,4,-982.4401,1875.441,100.4122,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower Foothill WP 4'),
+(@ENTRY,5,-975.1263,1882.178,118.0354,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower Foothill WP 5'),
+(@ENTRY,6,-979.3693,1876.667,121.5866,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower Foothill WP 6');
+-- Update Creature
+UPDATE `creature` SET `curhealth`=1,`spawndist`=0,`MovementType`=0,`position_x`=-979.3693,`position_y`=1876.667,`position_z`=121.5866,`orientation`=1.186824 WHERE `guid`=78737;
+
+-- SAI for Zeth'Gor Quest Credit Marker, They Must Burn
+SET @ENTRY  := 21173; -- Zeth'Gor Quest Credit Marker, They Must Burn
+SET @ENTRY1 := 21170; -- Honor Hold Gryphon Brigadier, South
+SET @ENTRY2 := 22404; -- Honor Hold Gryphon Brigadier, North
+SET @ENTRY3 := 22405; -- Honor Hold Gryphon Brigadier, Forge
+SET @ENTRY4 := 22406; -- Honor Hold Gryphon Brigadier, Foothills
+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` IN (@ENTRY*100, (@ENTRY*100)+1, (@ENTRY*100)+2, (@ENTRY*100)+3);
+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,38,0,100,0,0,1,0,0,80,(@ENTRY*100)+0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On dataset - load script'),
+(@ENTRY,0,1,0,38,0,100,0,0,2,0,0,80,(@ENTRY*100)+1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower North - On dataset - load script'),
+(@ENTRY,0,2,0,38,0,100,0,0,3,0,0,80,(@ENTRY*100)+2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower Forge - On dataset - load script'),
+(@ENTRY,0,3,0,38,0,100,0,0,4,0,0,80,(@ENTRY*100)+3,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower Foothill - On dataset - load script'),
+-- Script 0
+(@ENTRY*100,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,'Reset data 0'),
+(@ENTRY*100,9,1,0,0,0,100,0,1000,1000,0,0,11,36302,0,0,0,0,0,1,0,0,0,0,0,0,0, ' Summon Honor Hold Gryphon Brigadier, South'),
+(@ENTRY*100,9,2,0,0,0,100,0,3000,3000,0,0,45,0,1,0,0,0,0,19,@ENTRY1,0,0,0,0,0,0, ' Summon Honor Hold Gryphon Brigadier, South'),
+(@ENTRY*100,9,3,0,0,0,100,0,0,0,0,0,11,36302,0,0,0,0,0,1,0,0,0,0,0,0,0, ' Summon Honor Hold Gryphon Brigadier, South'),
+(@ENTRY*100,9,4,0,0,0,100,0,3000,3000,0,0,45,0,2,0,0,0,0,19,@ENTRY1,0,0,0,0,0,0, ' Summon Honor Hold Gryphon Brigadier, South'),
+(@ENTRY*100,9,5,0,0,0,100,0,0,0,0,0,11,36302,0,0,0,0,0,1,0,0,0,0,0,0,0, ' Summon Honor Hold Gryphon Brigadier, South'),
+(@ENTRY*100,9,6,0,0,0,100,0,3000,3000,0,0,45,0,3,0,0,0,0,19,@ENTRY1,0,0,0,0,0,0, ' Summon Honor Hold Gryphon Brigadier, South'),
+(@ENTRY*100,9,7,0,0,0,100,0,0,0,0,0,11,36302,0,0,0,0,0,1,0,0,0,0,0,0,0, ' Summon Honor Hold Gryphon Brigadier, South'),
+(@ENTRY*100,9,8,0,0,0,100,0,3000,3000,0,0,45,0,4,0,0,0,0,19,@ENTRY1,0,0,0,0,0,0, ' Summon Honor Hold Gryphon Brigadier, South'),
+-- Script 1
+((@ENTRY*100)+1,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, 'Reset data 0'),
+((@ENTRY*100)+1,9,1,0,0,0,100,0,0,0,0,0,11,39106,0,0,0,0,0,1,0,0,0,0,0,0,0, ' Summon Honor Hold Gryphon Brigadier, North'),
+((@ENTRY*100)+1,9,2,0,0,0,100,0,3000,3000,0,0,45,0,1,0,0,0,0,19,@ENTRY2,0,0,0,0,0,0, ' Summon Honor Hold Gryphon Brigadier, North'),
+((@ENTRY*100)+1,9,3,0,0,0,100,0,0,0,0,0,11,39106,0,0,0,0,0,1,0,0,0,0,0,0,0, ' Summon Honor Hold Gryphon Brigadier, North'),
+((@ENTRY*100)+1,9,4,0,0,0,100,0,3000,3000,0,0,45,0,2,0,0,0,0,19,@ENTRY2,0,0,0,0,0,0, ' Summon Honor Hold Gryphon Brigadier, North'),
+((@ENTRY*100)+1,9,5,0,0,0,100,0,0,0,0,0,11,39106,0,0,0,0,0,1,0,0,0,0,0,0,0, ' Summon Honor Hold Gryphon Brigadier, North'),
+((@ENTRY*100)+1,9,6,0,0,0,100,0,3000,3000,0,0,45,0,3,0,0,0,0,19,@ENTRY2,0,0,0,0,0,0, ' Summon Honor Hold Gryphon Brigadier, North'),
+((@ENTRY*100)+1,9,7,0,0,0,100,0,0,0,0,0,11,39106,0,0,0,0,0,1,0,0,0,0,0,0,0, ' Summon Honor Hold Gryphon Brigadier, North'),
+((@ENTRY*100)+1,9,8,0,0,0,100,0,3000,3000,0,0,45,0,3,0,0,0,0,19,@ENTRY2,0,0,0,0,0,0, ' Summon Honor Hold Gryphon Brigadier, North'),
+-- Script 2
+((@ENTRY*100)+2,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, 'Reset data 0'),
+((@ENTRY*100)+2,9,1,0,0,0,100,0,0,0,0,0,11,39107,0,0,0,0,0,1,0,0,0,0,0,0,0, ' Summon Honor Hold Gryphon Brigadier, Forge'),
+((@ENTRY*100)+2,9,2,0,0,0,100,0,3000,3000,0,0,45,0,1,0,0,0,0,19,@ENTRY3,0,0,0,0,0,0, ' Summon Honor Hold Gryphon Brigadier, Forge'),
+((@ENTRY*100)+2,9,3,0,0,0,100,0,0,0,0,0,11,39107,0,0,0,0,0,1,0,0,0,0,0,0,0, ' Summon Honor Hold Gryphon Brigadier, Forge'),
+((@ENTRY*100)+2,9,4,0,0,0,100,0,3000,3000,0,0,45,0,2,0,0,0,0,19,@ENTRY3,0,0,0,0,0,0, ' Summon Honor Hold Gryphon Brigadier, Forge'),
+((@ENTRY*100)+2,9,5,0,0,0,100,0,0,0,0,0,11,39107,0,0,0,0,0,1,0,0,0,0,0,0,0, ' Summon Honor Hold Gryphon Brigadier, Forge'),
+((@ENTRY*100)+2,9,6,0,0,0,100,0,3000,3000,0,0,45,0,3,0,0,0,0,19,@ENTRY3,0,0,0,0,0,0, ' Summon Honor Hold Gryphon Brigadier, Forge'),
+((@ENTRY*100)+2,9,7,0,0,0,100,0,0,0,0,0,11,39107,0,0,0,0,0,1,0,0,0,0,0,0,0, ' Summon Honor Hold Gryphon Brigadier, Forge'),
+((@ENTRY*100)+2,9,8,0,0,0,100,0,3000,3000,0,0,45,0,3,0,0,0,0,19,@ENTRY3,0,0,0,0,0,0, ' Summon Honor Hold Gryphon Brigadier, Forge'),
+-- Script 3
+((@ENTRY*100)+3,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, 'Reset data 0'),
+((@ENTRY*100)+3,9,1,0,0,0,100,0,0,0,0,0,11,39108,0,0,0,0,0,1,0,0,0,0,0,0,0, ' Summon Honor Hold Gryphon Brigadier, Foothill'),
+((@ENTRY*100)+3,9,2,0,0,0,100,0,3000,3000,0,0,45,0,1,0,0,0,0,19,@ENTRY4,0,0,0,0,0,0, ' Summon Honor Hold Gryphon Brigadier, Foothill'),
+((@ENTRY*100)+3,9,3,0,0,0,100,0,0,0,0,0,11,39108,0,0,0,0,0,1,0,0,0,0,0,0,0, ' Summon Honor Hold Gryphon Brigadier, Foothill'),
+((@ENTRY*100)+3,9,4,0,0,0,100,0,3000,3000,0,0,45,0,2,0,0,0,0,19,@ENTRY4,0,0,0,0,0,0, ' Summon Honor Hold Gryphon Brigadier, Foothill'),
+((@ENTRY*100)+3,9,5,0,0,0,100,0,0,0,0,0,11,39108,0,0,0,0,0,1,0,0,0,0,0,0,0, ' Summon Honor Hold Gryphon Brigadier, Foothill'),
+((@ENTRY*100)+3,9,6,0,0,0,100,0,3000,3000,0,0,45,0,3,0,0,0,0,19,@ENTRY4,0,0,0,0,0,0, ' Summon Honor Hold Gryphon Brigadier, Foothill'),
+((@ENTRY*100)+3,9,7,0,0,0,100,0,0,0,0,0,11,39108,0,0,0,0,0,1,0,0,0,0,0,0,0, ' Summon Honor Hold Gryphon Brigadier, Foothill'),
+((@ENTRY*100)+3,9,8,0,0,0,100,0,3000,3000,0,0,45,0,1,0,0,0,0,19,@ENTRY4,0,0,0,0,0,0, ' Summon Honor Hold Gryphon Brigadier, Foothill');
+
+-- SAI for Honor Hold Gryphon Brigadier, South
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY1;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY1;
+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
+(@ENTRY1,0,0,0,11,0,100,0,0,0,0,0,11,36350,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On Spawn - Add aura'),
+(@ENTRY1,0,1,0,38,0,100,0,0,1,0,0,53,1,@ENTRY1*100,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On data set - Start WP movement'),
+(@ENTRY1,0,2,0,38,0,100,0,0,2,0,0,53,1,(@ENTRY1*100)+1,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On data set - Start WP movement'),
+(@ENTRY1,0,3,0,38,0,100,0,0,3,0,0,53,1,(@ENTRY1*100)+2,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On data set - Start WP movement'),
+(@ENTRY1,0,4,0,38,0,100,0,0,4,0,0,53,1,(@ENTRY1*100)+3,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On data set - Start WP movement'),
+(@ENTRY1,0,5,0,40,0,100,0,10,@ENTRY1*100,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On Reach WP - Despawn'),
+(@ENTRY1,0,6,0,40,0,100,0,10,(@ENTRY1*100)+1,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On Reach WP - Despawn'),
+(@ENTRY1,0,7,0,40,0,100,0,11,(@ENTRY1*100)+2,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On Reach WP - Despawn'),
+(@ENTRY1,0,8,0,40,0,100,0,11,(@ENTRY1*100)+3,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On Reach WP - Despawn');
+
+-- SAI for Honor Hold Gryphon Brigadier, North
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY2;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY2;
+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
+(@ENTRY2,0,0,0,11,0,100,0,0,0,0,0,11,36350,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On Spawn - Add aura'),
+(@ENTRY2,0,1,0,38,0,100,0,0,1,0,0,53,1,@ENTRY2*100,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On data set - Start WP movement'),
+(@ENTRY2,0,2,0,38,0,100,0,0,2,0,0,53,1,(@ENTRY2*100)+1,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On data set - Start WP movement'),
+(@ENTRY2,0,3,0,38,0,100,0,0,3,0,0,53,1,(@ENTRY2*100)+2,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On data set - Start WP movement'),
+(@ENTRY2,0,4,0,38,0,100,0,0,4,0,0,53,1,(@ENTRY2*100)+3,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On data set - Start WP movement'),
+(@ENTRY2,0,5,0,40,0,100,0,12,@ENTRY2*100,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On Reach WP - Despawn'),
+(@ENTRY2,0,6,0,40,0,100,0,11,(@ENTRY2*100)+1,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On Reach WP - Despawn'),
+(@ENTRY2,0,7,0,40,0,100,0,12,(@ENTRY2*100)+2,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On Reach WP - Despawn'),
+(@ENTRY2,0,8,0,40,0,100,0,12,(@ENTRY2*100)+3,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On Reach WP - Despawn');
+
+-- SAI for Honor Hold Gryphon Brigadier, Forge
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY3;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY3;
+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
+(@ENTRY3,0,0,0,11,0,100,0,0,0,0,0,11,36350,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On Spawn - Add aura'),
+(@ENTRY3,0,1,0,38,0,100,0,0,1,0,0,53,1,@ENTRY3*100,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On data set - Start WP movement'),
+(@ENTRY3,0,2,0,38,0,100,0,0,2,0,0,53,1,(@ENTRY3*100)+1,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On data set - Start WP movement'),
+(@ENTRY3,0,3,0,38,0,100,0,0,3,0,0,53,1,(@ENTRY3*100)+2,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On data set - Start WP movement'),
+(@ENTRY3,0,4,0,38,0,100,0,0,4,0,0,53,1,(@ENTRY3*100)+3,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On data set - Start WP movement'),
+(@ENTRY3,0,5,0,40,0,100,0,13,@ENTRY3*100,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On Reach WP - Despawn'),
+(@ENTRY3,0,6,0,40,0,100,0,13,(@ENTRY3*100)+1,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On Reach WP - Despawn'),
+(@ENTRY3,0,7,0,40,0,100,0,12,(@ENTRY3*100)+2,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On Reach WP - Despawn'),
+(@ENTRY3,0,8,0,40,0,100,0,14,(@ENTRY3*100)+3,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On Reach WP - Despawn');
+
+-- SAI for Honor Hold Gryphon Brigadier, Foothill
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY4;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY4;
+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
+(@ENTRY4,0,0,0,11,0,100,0,0,0,0,0,11,36350,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On Spawn - Add aura'),
+(@ENTRY4,0,1,0,38,0,100,0,0,1,0,0,53,1,@ENTRY4*100,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On data set - Start WP movement'),
+(@ENTRY4,0,2,0,38,0,100,0,0,2,0,0,53,1,(@ENTRY4*100)+1,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On data set - Start WP movement'),
+(@ENTRY4,0,3,0,38,0,100,0,0,3,0,0,53,1,(@ENTRY4*100)+2,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On data set - Start WP movement'),
+(@ENTRY4,0,4,0,40,0,100,0,15,@ENTRY4*100,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On Reach WP - Despawn'),
+(@ENTRY4,0,5,0,40,0,100,0,15,(@ENTRY4*100)+1,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On Reach WP - Despawn'),
+(@ENTRY4,0,6,0,40,0,100,0,15,(@ENTRY4*100)+2,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On Reach WP - Despawn');
+
+-- Honor Hold Gryphon Brigadier, South Pathing
+DELETE FROM `waypoints` WHERE `entry` IN (@ENTRY1*100, (@ENTRY1*100)+1, (@ENTRY1*100)+2, (@ENTRY1*100)+3);
+INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
+-- Honor Hold Gryphon Brigadier, South Path 1
+(@ENTRY1*100,1,-1166.146,2232.443,154.4811,'Honor Hold Gryphon Brigadier, South Path 1 WP 1'),
+(@ENTRY1*100,2,-1166.439,2233.399,154.4811,'Honor Hold Gryphon Brigadier, South Path 1 WP 2'),
+(@ENTRY1*100,3,-1162.907,2207.568,140.9076,'Honor Hold Gryphon Brigadier, South Path 1 WP 3'),
+(@ENTRY1*100,4,-1165.149,2160.382,126.1298,'Honor Hold Gryphon Brigadier, South Path 1 WP 4'),
+(@ENTRY1*100,5,-1171.198,2119.914,110.0741,'Honor Hold Gryphon Brigadier, South Path 1 WP 5'),
+(@ENTRY1*100,6,-1152.598,2108.961,101.9074,'Honor Hold Gryphon Brigadier, South Path 1 WP 6'),
+(@ENTRY1*100,7,-1126.18,2129.599,118.6573,'Honor Hold Gryphon Brigadier, South Path 1 WP 7'),
+(@ENTRY1*100,8,-1113.314,2146.836,135.1296,'Honor Hold Gryphon Brigadier, South Path 1 WP 8'),
+(@ENTRY1*100,9,-1105.45,2173.646,171.0185,'Honor Hold Gryphon Brigadier, South Path 1 WP 9'),
+(@ENTRY1*100,10,-1107.9,2202.193,195.935,'Honor Hold Gryphon Brigadier, South Path 1 WP 10'),
+-- Honor Hold Gryphon Brigadier, South Path 2
+((@ENTRY1*100)+1,1,-1166.146,2232.443,154.4811,'Honor Hold Gryphon Brigadier, South Path 2 WP 1'),
+((@ENTRY1*100)+1,2,-1166.439,2233.399,154.4811,'Honor Hold Gryphon Brigadier, South Path 2 WP 2'),
+((@ENTRY1*100)+1,3,-1182.963,2208.794,125.3797,'Honor Hold Gryphon Brigadier, South Path 2 WP 3'),
+((@ENTRY1*100)+1,4,-1182.292,2161.906,114.2409,'Honor Hold Gryphon Brigadier, South Path 2 WP 4'),
+((@ENTRY1*100)+1,5,-1175.9,2113.828,105.1853,'Honor Hold Gryphon Brigadier, South Path 2 WP 5'),
+((@ENTRY1*100)+1,6,-1152.598,2108.961,104.5463,'Honor Hold Gryphon Brigadier, South Path 2 WP 6'),
+((@ENTRY1*100)+1,7,-1126.18,2129.599,117.0184,'Honor Hold Gryphon Brigadier, South Path 2 WP 7'),
+((@ENTRY1*100)+1,8,-1097.298,2159.928,136.074,'Honor Hold Gryphon Brigadier, South Path 2 WP 8'),
+((@ENTRY1*100)+1,9,-1084.76,2185.17,157.8796,'Honor Hold Gryphon Brigadier, South Path 2 WP 9'),
+((@ENTRY1*100)+1,10,-1074.359,2208.386,178.1295,'Honor Hold Gryphon Brigadier, South Path 2 WP 10'),
+-- Honor Hold Gryphon Brigadier, South Path 3
+((@ENTRY1*100)+2,1,-1166.146,2232.443,154.4811,'Honor Hold Gryphon Brigadier, South Path 3 WP 1'),
+((@ENTRY1*100)+2,2,-1166.439,2233.399,154.4811,'Honor Hold Gryphon Brigadier, South Path 3 WP 2'),
+((@ENTRY1*100)+2,3,-1150.548,2194.858,120.9303,'Honor Hold Gryphon Brigadier, South Path 3 WP 3'),
+((@ENTRY1*100)+2,4,-1151.814,2161.048,110.9858,'Honor Hold Gryphon Brigadier, South Path 3 WP 4'),
+((@ENTRY1*100)+2,5,-1152.937,2131.728,105.9581,'Honor Hold Gryphon Brigadier, South Path 3 WP 5'),
+((@ENTRY1*100)+2,6,-1151.148,2107.598,99.458,'Honor Hold Gryphon Brigadier, South Path 3 WP 6'),
+((@ENTRY1*100)+2,7,-1165.406,2089.037,115.6802,'Honor Hold Gryphon Brigadier, South Path 3 WP 7'),
+((@ENTRY1*100)+2,8,-1174.068,2083.782,125.0691,'Honor Hold Gryphon Brigadier, South Path 3 WP 8'),
+((@ENTRY1*100)+2,9,-1205.327,2083.083,164.097,'Honor Hold Gryphon Brigadier, South Path 3 WP 9'),
+((@ENTRY1*100)+2,10,-1232.793,2084.872,183.4025,'Honor Hold Gryphon Brigadier, South Path 3 WP 10'),
+((@ENTRY1*100)+2,11,-1264.571,2093.127,197.5136,'Honor Hold Gryphon Brigadier, South Path 3 WP 11'),
+-- Honor Hold Gryphon Brigadier, South Path 4
+((@ENTRY1*100)+3,1,-1166.146,2232.443,154.4811,'Honor Hold Gryphon Brigadier, South Path 4 WP 1'),
+((@ENTRY1*100)+3,2,-1166.439,2233.399,154.4811,'Honor Hold Gryphon Brigadier, South Path 4 WP 2'),
+((@ENTRY1*100)+3,3,-1152.79,2211.288,120.9303,'Honor Hold Gryphon Brigadier, South Path 4 WP 3'),
+((@ENTRY1*100)+3,4,-1146.584,2178.448,110.9858,'Honor Hold Gryphon Brigadier, South Path 4 WP 4'),
+((@ENTRY1*100)+3,5,-1155.939,2146.783,105.9581,'Honor Hold Gryphon Brigadier, South Path 4 WP 5'),
+((@ENTRY1*100)+3,6,-1151.148,2107.598,99.68026,'Honor Hold Gryphon Brigadier, South Path 4 WP 6'),
+((@ENTRY1*100)+3,7,-1142.785,2094.159,103.5414,'Honor Hold Gryphon Brigadier, South Path 4 WP 7'),
+((@ENTRY1*100)+3,8,-1136.896,2085.377,109.1246,'Honor Hold Gryphon Brigadier, South Path 4 WP 8'),
+((@ENTRY1*100)+3,9,-1119.036,2071.976,118.8748,'Honor Hold Gryphon Brigadier, South Path 4 WP 9'),
+((@ENTRY1*100)+3,10,-1103.594,2050.397,128.2081,'Honor Hold Gryphon Brigadier, South Path 4 WP 10'),
+((@ENTRY1*100)+3,11,-1080.568,2022.377,137.5138,'Honor Hold Gryphon Brigadier, South Path 4 WP 11');
+
+-- Honor Hold Gryphon Brigadier, North Pathing
+DELETE FROM `waypoints` WHERE `entry` IN (@ENTRY2*100, (@ENTRY2*100)+1, (@ENTRY2*100)+2, (@ENTRY2*100)+3);
+INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
+-- Honor Hold Gryphon Brigadier, North Path 1
+(@ENTRY2*100,1,-739.3298,1922.589,100.9578,'Honor Hold Gryphon Brigadier, North Path 1 WP'),
+(@ENTRY2*100,2,-738.3353,1922.693,100.9578,'Honor Hold Gryphon Brigadier, North Path 1 WP'),
+(@ENTRY2*100,3,-750.1168,1929.094,99.47905,'Honor Hold Gryphon Brigadier, North Path 1 WP'),
+(@ENTRY2*100,4,-774.873,1952.79,99.47905,'Honor Hold Gryphon Brigadier, North Path 1 WP'),
+(@ENTRY2*100,5,-786.8572,1972.59,99.47905,'Honor Hold Gryphon Brigadier, North Path 1 WP'),
+(@ENTRY2*100,6,-799.9429,2000.454,78.95126,'Honor Hold Gryphon Brigadier, North Path 1 WP'),
+(@ENTRY2*100,7,-806.1043,2017.675,73.36794,'Honor Hold Gryphon Brigadier, North Path 1 WP'),
+(@ENTRY2*100,8,-819.2725,2032.523,73.17354,'Honor Hold Gryphon Brigadier, North Path 1 WP'),
+(@ENTRY2*100,9,-831.7571,2046.865,80.61793,'Honor Hold Gryphon Brigadier, North Path 1 WP'),
+(@ENTRY2*100,10,-844.0977,2058.49,83.64579,'Honor Hold Gryphon Brigadier, North Path 1 WP'),
+(@ENTRY2*100,11,-859.0389,2080.072,95.78463,'Honor Hold Gryphon Brigadier, North Path 1 WP'),
+(@ENTRY2*100,12,-883.3383,2095.611,107.5624,'Honor Hold Gryphon Brigadier, North Path 1 WP'),
+-- Honor Hold Gryphon Brigadier, North Path 2
+((@ENTRY2*100)+1,1,-739.3298,1922.589,100.9578,'Honor Hold Gryphon Brigadier, North Path 2 WP'),
+((@ENTRY2*100)+1,2,-738.3353,1922.693,100.9578,'Honor Hold Gryphon Brigadier, North Path 2 WP'),
+((@ENTRY2*100)+1,3,-750.1168,1929.094,99.47905,'Honor Hold Gryphon Brigadier, North Path 2 WP'),
+((@ENTRY2*100)+1,4,-773.3017,1941.179,99.47905,'Honor Hold Gryphon Brigadier, North Path 2 WP'),
+((@ENTRY2*100)+1,5,-792.3573,1953.981,99.47905,'Honor Hold Gryphon Brigadier, North Path 2 WP'),
+((@ENTRY2*100)+1,6,-812.7388,1993.078,78.95126,'Honor Hold Gryphon Brigadier, North Path 2 WP'),
+((@ENTRY2*100)+1,7,-823.2512,2008.549,73.36794,'Honor Hold Gryphon Brigadier, North Path 2 WP'),
+((@ENTRY2*100)+1,8,-823.4645,2030.833,73.17354,'Honor Hold Gryphon Brigadier, North Path 2 WP'),
+((@ENTRY2*100)+1,9,-812.5039,2051.152,80.61793,'Honor Hold Gryphon Brigadier, North Path 2 WP'),
+((@ENTRY2*100)+1,10,-775.5078,2066.004,83.64579,'Honor Hold Gryphon Brigadier, North Path 2 WP'),
+((@ENTRY2*100)+1,11,-728.4387,2072.975,87.72904,'Honor Hold Gryphon Brigadier, North Path 2 WP'),
+-- Honor Hold Gryphon Brigadier, North Path 3
+((@ENTRY2*100)+2,1,-739.3298,1922.589,100.9578,'Honor Hold Gryphon Brigadier, North Path 3 WP'),
+((@ENTRY2*100)+2,2,-738.3353,1922.693,100.9578,'Honor Hold Gryphon Brigadier, North Path 3 WP'),
+((@ENTRY2*100)+2,3,-750.1168,1929.094,99.47905,'Honor Hold Gryphon Brigadier, North Path 3 WP'),
+((@ENTRY2*100)+2,4,-773.3017,1941.179,99.47905,'Honor Hold Gryphon Brigadier, North Path 3 WP'),
+((@ENTRY2*100)+2,5,-798.551,1950.061,99.47905,'Honor Hold Gryphon Brigadier, North Path 3 WP'),
+((@ENTRY2*100)+2,6,-822.979,1966.302,78.95126,'Honor Hold Gryphon Brigadier, North Path 3 WP'),
+((@ENTRY2*100)+2,7,-829.1212,1999.823,73.36794,'Honor Hold Gryphon Brigadier, North Path 3 WP'),
+((@ENTRY2*100)+2,8,-823.4645,2030.833,73.17354,'Honor Hold Gryphon Brigadier, North Path 3 WP'),
+((@ENTRY2*100)+2,9,-822.0243,2049.509,80.61793,'Honor Hold Gryphon Brigadier, North Path 3 WP'),
+((@ENTRY2*100)+2,10,-838.6264,2088.113,83.64579,'Honor Hold Gryphon Brigadier, North Path 3 WP'),
+((@ENTRY2*100)+2,11,-857.7249,2123.352,87.72904,'Honor Hold Gryphon Brigadier, North Path 3 WP'),
+((@ENTRY2*100)+2,12,-856.7349,2157.759,99.95123,'Honor Hold Gryphon Brigadier, North Path 3 WP'),
+-- Honor Hold Gryphon Brigadier, North Path 4
+((@ENTRY2*100)+3,1,-739.3298,1922.589,100.9578,'Honor Hold Gryphon Brigadier, North Path 4 WP'),
+((@ENTRY2*100)+3,2,-738.3353,1922.693,100.9578,'Honor Hold Gryphon Brigadier, North Path 4 WP'),
+((@ENTRY2*100)+3,3,-750.1168,1929.094,99.47905,'Honor Hold Gryphon Brigadier, North Path 4 WP'),
+((@ENTRY2*100)+3,4,-773.3017,1941.179,99.47905,'Honor Hold Gryphon Brigadier, North Path 4 WP'),
+((@ENTRY2*100)+3,5,-792.3573,1953.981,99.47905,'Honor Hold Gryphon Brigadier, North Path 4 WP'),
+((@ENTRY2*100)+3,6,-812.7388,1993.078,78.95126,'Honor Hold Gryphon Brigadier, North Path 4 WP'),
+((@ENTRY2*100)+3,7,-823.2512,2008.549,73.36794,'Honor Hold Gryphon Brigadier, North Path 4 WP'),
+((@ENTRY2*100)+3,8,-823.4645,2030.833,73.17354,'Honor Hold Gryphon Brigadier, North Path 4 WP'),
+((@ENTRY2*100)+3,9,-812.5039,2051.152,80.61793,'Honor Hold Gryphon Brigadier, North Path 4 WP'),
+((@ENTRY2*100)+3,10,-838.6264,2088.113,83.64579,'Honor Hold Gryphon Brigadier, North Path 4 WP'),
+((@ENTRY2*100)+3,11,-857.7249,2123.352,87.72904,'Honor Hold Gryphon Brigadier, North Path 4 WP'),
+((@ENTRY2*100)+3,12,-891.1043,2149.23,87.72904,'Honor Hold Gryphon Brigadier, North Path 4 WP');
+
+-- Honor Hold Gryphon Brigadier, Forge Pathing
+DELETE FROM `waypoints` WHERE `entry` IN (@ENTRY3*100, (@ENTRY3*100)+1, (@ENTRY3*100)+2, (@ENTRY3*100)+3);
+INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
+-- Honor Hold Gryphon Brigadier, Forge Path 1
+(@ENTRY3*100,1,-739.3298,1922.589,100.9578,'Honor Hold Gryphon Brigadier, Forge Path 1 WP'),
+(@ENTRY3*100,2,-738.3353,1922.693,100.9578,'Honor Hold Gryphon Brigadier, Forge Path 1 WP'),
+(@ENTRY3*100,3,-750.1168,1929.094,99.47905,'Honor Hold Gryphon Brigadier, Forge Path 1 WP'),
+(@ENTRY3*100,4,-779.0291,1934.054,99.47905,'Honor Hold Gryphon Brigadier, Forge Path 1 WP'),
+(@ENTRY3*100,5,-805.9227,1932.241,104.2291,'Honor Hold Gryphon Brigadier, Forge Path 1 WP'),
+(@ENTRY3*100,6,-837.3495,1926.666,101.0902,'Honor Hold Gryphon Brigadier, Forge Path 1 WP'),
+(@ENTRY3*100,7,-862.7343,1923.357,97.618,'Honor Hold Gryphon Brigadier, Forge Path 1 WP'),
+(@ENTRY3*100,8,-897.9168,1921.757,99.59021,'Honor Hold Gryphon Brigadier, Forge Path 1 WP'),
+(@ENTRY3*100,9,-914.8586,1930.438,97.67357,'Honor Hold Gryphon Brigadier, Forge Path 1 WP'),
+(@ENTRY3*100,10,-932.5103,1940.806,109.0624,'Honor Hold Gryphon Brigadier, Forge Path 1 WP'),
+(@ENTRY3*100,11,-945.1282,1950.602,122.7846,'Honor Hold Gryphon Brigadier, Forge Path 1 WP'),
+(@ENTRY3*100,12,-966.2561,1954.868,135.8124,'Honor Hold Gryphon Brigadier, Forge Path 1 WP'),
+(@ENTRY3*100,13,-993.241,1956.073,157.4512,'Honor Hold Gryphon Brigadier, Forge Path 1 WP'),
+-- Honor Hold Gryphon Brigadier, Forge Path 2
+((@ENTRY3*100)+1,1,-739.3298,1922.589,100.9578,'Honor Hold Gryphon Brigadier, Forge Path 2 WP'),
+((@ENTRY3*100)+1,2,-738.3353,1922.693,100.9578,'Honor Hold Gryphon Brigadier, Forge Path 2 WP'),
+((@ENTRY3*100)+1,3,-750.1168,1929.094,99.47905,'Honor Hold Gryphon Brigadier, Forge Path 2 WP'),
+((@ENTRY3*100)+1,4,-780.6625,1927.177,99.47905,'Honor Hold Gryphon Brigadier, Forge Path 2 WP'),
+((@ENTRY3*100)+1,5,-811.2864,1921.429,104.2291,'Honor Hold Gryphon Brigadier, Forge Path 2 WP'),
+((@ENTRY3*100)+1,6,-834.9781,1920.712,101.0902,'Honor Hold Gryphon Brigadier, Forge Path 2 WP'),
+((@ENTRY3*100)+1,7,-866.0516,1916.696,97.618,'Honor Hold Gryphon Brigadier, Forge Path 2 WP'),
+((@ENTRY3*100)+1,8,-895.7596,1922.273,99.59021,'Honor Hold Gryphon Brigadier, Forge Path 2 WP'),
+((@ENTRY3*100)+1,9,-923.1928,1916.771,97.67357,'Honor Hold Gryphon Brigadier, Forge Path 2 WP'),
+((@ENTRY3*100)+1,10,-948.4045,1901.38,98.9791,'Honor Hold Gryphon Brigadier, Forge Path 2 WP'),
+((@ENTRY3*100)+1,11,-966.732,1893.369,110.0068,'Honor Hold Gryphon Brigadier, Forge Path 2 WP'),
+((@ENTRY3*100)+1,12,-989.9695,1893.078,135.8124,'Honor Hold Gryphon Brigadier, Forge Path 2 WP'),
+((@ENTRY3*100)+1,13,-1025.913,1875.034,164.979,'Honor Hold Gryphon Brigadier, Forge Path 2 WP'),
+-- Honor Hold Gryphon Brigadier, Forge Path 3
+((@ENTRY3*100)+2,1,-739.3298,1922.589,100.9578,'Honor Hold Gryphon Brigadier, Forge Path 3 WP'),
+((@ENTRY3*100)+2,2,-738.3353,1922.693,100.9578,'Honor Hold Gryphon Brigadier, Forge Path 3 WP'),
+((@ENTRY3*100)+2,3,-750.1168,1929.094,99.47905,'Honor Hold Gryphon Brigadier, Forge Path 3 WP'),
+((@ENTRY3*100)+2,4,-773.3017,1941.179,99.47905,'Honor Hold Gryphon Brigadier, Forge Path 3 WP'),
+((@ENTRY3*100)+2,5,-799.0213,1938.265,104.2291,'Honor Hold Gryphon Brigadier, Forge Path 3 WP'),
+((@ENTRY3*100)+2,6,-821.9453,1929.91,101.0902,'Honor Hold Gryphon Brigadier, Forge Path 3 WP'),
+((@ENTRY3*100)+2,7,-847.0975,1925.127,97.618,'Honor Hold Gryphon Brigadier, Forge Path 3 WP'),
+((@ENTRY3*100)+2,8,-884.1627,1919.391,99.59021,'Honor Hold Gryphon Brigadier, Forge Path 3 WP'),
+((@ENTRY3*100)+2,9,-910.0975,1918.052,97.67357,'Honor Hold Gryphon Brigadier, Forge Path 3 WP'),
+((@ENTRY3*100)+2,10,-931.7395,1901.312,98.9791,'Honor Hold Gryphon Brigadier, Forge Path 3 WP'),
+((@ENTRY3*100)+2,11,-938.8629,1883.565,110.0068,'Honor Hold Gryphon Brigadier, Forge Path 3 WP'),
+((@ENTRY3*100)+2,12,-948.2704,1857.24,135.8124,'Honor Hold Gryphon Brigadier, Forge Path 3 WP'),
+-- Honor Hold Gryphon Brigadier, Forge Path 4
+((@ENTRY3*100)+3,1,-739.3298,1922.589,100.9578,'Honor Hold Gryphon Brigadier, Forge Path 4 WP'),
+((@ENTRY3*100)+3,2,-738.3353,1922.693,100.9578,'Honor Hold Gryphon Brigadier, Forge Path 4 WP'),
+((@ENTRY3*100)+3,3,-750.1168,1929.094,99.47905,'Honor Hold Gryphon Brigadier, Forge Path 4 WP'),
+((@ENTRY3*100)+3,4,-773.3017,1941.179,99.47905,'Honor Hold Gryphon Brigadier, Forge Path 4 WP'),
+((@ENTRY3*100)+3,5,-799.0213,1938.265,104.2291,'Honor Hold Gryphon Brigadier, Forge Path 4 WP'),
+((@ENTRY3*100)+3,6,-821.9453,1929.91,101.0902,'Honor Hold Gryphon Brigadier, Forge Path 4 WP'),
+((@ENTRY3*100)+3,7,-847.0975,1925.127,97.618,'Honor Hold Gryphon Brigadier, Forge Path 4 WP'),
+((@ENTRY3*100)+3,8,-884.1627,1919.391,99.59021,'Honor Hold Gryphon Brigadier, Forge Path 4 WP'),
+((@ENTRY3*100)+3,9,-898.5378,1920.82,97.67357,'Honor Hold Gryphon Brigadier, Forge Path 4 WP'),
+((@ENTRY3*100)+3,10,-909.0667,1943.895,98.9791,'Honor Hold Gryphon Brigadier, Forge Path 4 WP'),
+((@ENTRY3*100)+3,11,-882.7237,1983.156,110.0068,'Honor Hold Gryphon Brigadier, Forge Path 4 WP'),
+((@ENTRY3*100)+3,12,-857.6995,1997.67,135.8124,'Honor Hold Gryphon Brigadier, Forge Path 4 WP'),
+((@ENTRY3*100)+3,13,-834.7382,1999.236,151.1734,'Honor Hold Gryphon Brigadier, Forge Path 4 WP'),
+((@ENTRY3*100)+3,14,-797.808,1990.238,154.7012,'Honor Hold Gryphon Brigadier, Forge Path 4 WP');
+
+-- Honor Hold Gryphon Brigadier, Foothill Pathing
+DELETE FROM `waypoints` WHERE `entry` IN (@ENTRY4*100, (@ENTRY4*100)+1, (@ENTRY4*100)+2);
+INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
+-- Honor Hold Gryphon Brigadier, Foothill Path 1
+(@ENTRY4*100,1,-739.3298,1922.589,100.9578,'Honor Hold Gryphon Brigadier, Foothill Path 1 WP 1'),
+(@ENTRY4*100,2,-738.3353,1922.693,100.9578,'Honor Hold Gryphon Brigadier, Foothill Path 1 WP 2'),
+(@ENTRY4*100,3,-750.1168,1929.094,115.7846,'Honor Hold Gryphon Brigadier, Foothill Path 1 WP 3'),
+(@ENTRY4*100,4,-780.6038,1912.869,111.4513,'Honor Hold Gryphon Brigadier, Foothill Path 1 WP 4'),
+(@ENTRY4*100,5,-812.3557,1903.761,119.8957,'Honor Hold Gryphon Brigadier, Foothill Path 1 WP 5'),
+(@ENTRY4*100,6,-844.3373,1894.094,121.1179,'Honor Hold Gryphon Brigadier, Foothill Path 1 WP 6'),
+(@ENTRY4*100,7,-875.8698,1888.307,134.0069,'Honor Hold Gryphon Brigadier, Foothill Path 1 WP 7'),
+(@ENTRY4*100,8,-908.7481,1889.962,139.368,'Honor Hold Gryphon Brigadier, Foothill Path 1 WP 8'),
+(@ENTRY4*100,9,-936.4296,1891.453,135.5625,'Honor Hold Gryphon Brigadier, Foothill Path 1 WP 9'),
+(@ENTRY4*100,10,-956.9449,1888.206,129.8402,'Honor Hold Gryphon Brigadier, Foothill Path 1 WP 10'),
+(@ENTRY4*100,11,-976.4232,1879.735,128.3126,'Honor Hold Gryphon Brigadier, Foothill Path 1 WP 11'),
+(@ENTRY4*100,12,-999.7429,1861.678,156.9511,'Honor Hold Gryphon Brigadier, Foothill Path 1 WP 12'),
+(@ENTRY4*100,13,-1019.369,1838.22,181.4233,'Honor Hold Gryphon Brigadier, Foothill Path 1 WP 13'),
+(@ENTRY4*100,14,-1015.93,1818.592,198.4232,'Honor Hold Gryphon Brigadier, Foothill Path 1 WP 14'),
+(@ENTRY4*100,15,-1003.392,1791.963,211.84,'Honor Hold Gryphon Brigadier, Foothill Path 1 WP 15'),
+-- Honor Hold Gryphon Brigadier, Foothill Path 2
+((@ENTRY4*100)+1,1,-739.3298,1922.589,100.9578,'Honor Hold Gryphon Brigadier, Foothill Path 2 WP 1'),
+((@ENTRY4*100)+1,2,-738.3353,1922.693,100.9578,'Honor Hold Gryphon Brigadier, Foothill Path 2 WP 2'),
+((@ENTRY4*100)+1,3,-750.1168,1929.094,115.7846,'Honor Hold Gryphon Brigadier, Foothill Path 2 WP 3'),
+((@ENTRY4*100)+1,4,-780.6038,1912.869,111.4513,'Honor Hold Gryphon Brigadier, Foothill Path 2 WP 4'),
+((@ENTRY4*100)+1,5,-812.3557,1903.761,119.8957,'Honor Hold Gryphon Brigadier, Foothill Path 2 WP 5'),
+((@ENTRY4*100)+1,6,-844.3373,1894.094,121.1179,'Honor Hold Gryphon Brigadier, Foothill Path 2 WP 6'),
+((@ENTRY4*100)+1,7,-875.8698,1888.307,134.0069,'Honor Hold Gryphon Brigadier, Foothill Path 2 WP 7'),
+((@ENTRY4*100)+1,8,-905.6191,1885.849,139.368,'Honor Hold Gryphon Brigadier, Foothill Path 2 WP 8'),
+((@ENTRY4*100)+1,9,-933.7491,1881.107,135.5625,'Honor Hold Gryphon Brigadier, Foothill Path 2 WP 9'),
+((@ENTRY4*100)+1,10,-957.0587,1876.275,129.8402,'Honor Hold Gryphon Brigadier, Foothill Path 2 WP 10'),
+((@ENTRY4*100)+1,11,-976.4232,1879.735,128.3126,'Honor Hold Gryphon Brigadier, Foothill Path 2 WP 11'),
+((@ENTRY4*100)+1,12,-1001.597,1896.851,136.0901,'Honor Hold Gryphon Brigadier, Foothill Path 2 WP 12'),
+((@ENTRY4*100)+1,13,-1026.942,1912.217,153.8956,'Honor Hold Gryphon Brigadier, Foothill Path 2 WP 13'),
+((@ENTRY4*100)+1,14,-1046.058,1925.075,168.2844,'Honor Hold Gryphon Brigadier, Foothill Path 2 WP 14'),
+((@ENTRY4*100)+1,15,-1065.902,1940.892,183.0622,'Honor Hold Gryphon Brigadier, Foothill Path 2 WP 15'),
+-- Honor Hold Gryphon Brigadier, Foothill Path 3
+((@ENTRY4*100)+2,1,-739.3298,1922.589,100.9578,'Honor Hold Gryphon Brigadier, Foothill Path 3 WP 1'),
+((@ENTRY4*100)+2,2,-738.3353,1922.693,100.9578,'Honor Hold Gryphon Brigadier, Foothill Path 3 WP 2'),
+((@ENTRY4*100)+2,3,-750.1168,1929.094,115.7846,'Honor Hold Gryphon Brigadier, Foothill Path 3 WP 3'),
+((@ENTRY4*100)+2,4,-780.6038,1912.869,111.4513,'Honor Hold Gryphon Brigadier, Foothill Path 3 WP 4'),
+((@ENTRY4*100)+2,5,-812.3557,1903.761,119.8957,'Honor Hold Gryphon Brigadier, Foothill Path 3 WP 5'),
+((@ENTRY4*100)+2,6,-852.6487,1887.492,134.7291,'Honor Hold Gryphon Brigadier, Foothill Path 3 WP 6'),
+((@ENTRY4*100)+2,7,-885.8631,1878.916,144.8403,'Honor Hold Gryphon Brigadier, Foothill Path 3 WP 7'),
+((@ENTRY4*100)+2,8,-910.2131,1876.215,149.118,'Honor Hold Gryphon Brigadier, Foothill Path 3 WP 8'),
+((@ENTRY4*100)+2,9,-933.7659,1874.894,145.9792,'Honor Hold Gryphon Brigadier, Foothill Path 3 WP 9'),
+((@ENTRY4*100)+2,10,-957.0587,1876.275,129.8402,'Honor Hold Gryphon Brigadier, Foothill Path 3 WP 10'),
+((@ENTRY4*100)+2,11,-976.4232,1879.735,128.3126,'Honor Hold Gryphon Brigadier, Foothill Path 3 WP 11'),
+((@ENTRY4*100)+2,12,-1003.331,1901.21,136.0901,'Honor Hold Gryphon Brigadier, Foothill Path 3 WP 12'),
+((@ENTRY4*100)+2,13,-1019.146,1920.588,153.8956,'Honor Hold Gryphon Brigadier, Foothill Path 3 WP 13'),
+((@ENTRY4*100)+2,14,-1035.73,1937.606,168.2844,'Honor Hold Gryphon Brigadier, Foothill Path 3 WP 14'),
+((@ENTRY4*100)+2,15,-1055.794,1959.019,183.0622,'Honor Hold Gryphon Brigadier, Foothill Path 3 WP 15');
diff --git a/sql/updates/world/2011_03_24_0_world_creature_template.sql b/sql/updates/world/2011_03_24_0_world_creature_template.sql
deleted file mode 100644
index d1dd1653f33..00000000000
--- a/sql/updates/world/2011_03_24_0_world_creature_template.sql
+++ /dev/null
@@ -1,69 +0,0 @@
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=10404; -- Pustulating Horror 
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=34606; -- Frost Sphere
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=36724; -- Servant of the Throne
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=36725; -- Nerub'ar Broodkeeper
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=36805; -- Deathspeaker Servant
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=36807; -- Deathspeaker Disciple
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=36808; -- Deathspeaker Zealot
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=36811; -- Deathspeaker Attendant
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=36829; -- Deathspeaker High Priest
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=36839; -- Horde Gunship Cannon
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=36844; -- Risen Deathspeaker Servant
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=36998; -- Skybreaker Protector
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37003; -- Skybreaker Vindicator
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37004; -- Skybreaker Dreadblade
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37007; -- Deathbound Ward
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37011; -- The Damned
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37012; -- Ancient Skeletal Soldier
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37016; -- Skybreaker Luminary
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37017; -- Skybreaker Assassin
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37021; -- Skybreaker Vicar
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37027; -- Skybreaker Hierophant
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37030; -- Kor'kron Primalist
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37031; -- Kor'kron Oracle
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37032; -- Kor'kron Defender
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37033; -- Kor'kron Invoker
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37035; -- Kor'kron Vanquisher
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37144; -- Skybreaker Marksman
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37146; -- Kor'kron Sniper
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37148; -- Skybreaker Summoner
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37149; -- Kor'kron Necrolyte
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37230; -- Spire Frostwyrm
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37544; -- Spire Gargoyle
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37545; -- Spire Minion
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37546; -- Frenzied Abomination
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=36880; -- Decaying Colossus
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=36897; -- Little Ooze
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=36899; -- Big Ooze
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37022; -- Blighted Abomination
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37023; -- Plague Scientist
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37025; -- Stinky
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37038; -- Vengeful Fleshreaper
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37098; -- Val'kyr Herald
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37217; -- Precious
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37571; -- Darkfallen Advisor
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37595; -- Darkfallen Blood Knight
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37662; -- Darkfallen Commander
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37663; -- Darkfallen Noble
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37664; -- Darkfallen Archmage
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37665; -- Darkfallen Lieutenant
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37666; -- Darkfallen Tactician
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37782; -- Flesh-eating Insect
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37901; -- Vampiric Fiend
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=38104; -- Plagued Zombie
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=38410; -- Severed Essence
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37034; -- Kor'kron Templar
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37501; -- Nerub'ar Champion
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37502; -- Nerub'ar Webweaver
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=38184; -- Corrupted Ymirjar
-UPDATE `creature_template` SET `difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37232; -- Nerub'ar Broodling
-UPDATE `creature_template` SET `difficulty_entry_1`=0,`difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=36990; -- Lady Sylvanas Windrunner
-UPDATE `creature_template` SET `difficulty_entry_1`=0,`difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37068; -- Spiritual Reflection
-UPDATE `creature_template` SET `difficulty_entry_1`=0,`difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37107; -- Spiritual Reflection
-UPDATE `creature_template` SET `difficulty_entry_1`=0,`difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=37920; -- Kor'kron Reaver
-UPDATE `creature_template` SET `difficulty_entry_1`=0,`difficulty_entry_2`=0,`difficulty_entry_3`=0 WHERE `entry`=38456; -- Frozen Orb
-
--- Delete all the fake/temp diffentry templates
-DELETE FROM `creature_template` WHERE `entry` BETWEEN 3460602 AND 3845601 OR `entry` IN (1040402,1040403);
-DELETE FROM `creature_loot_template` WHERE `entry` IN (3672402,3672403,3672502,3672503,3680502,3680503,3680702,3680703,3680802,3680803,3681102,3681103,3682902,3682903,3688002,3688003,3699802,3699803,3700302,3700303,3700402,3700403,3700702,3700703,3701102,3701103,3701202,3701203,3701602,3701603,3701702,3701703,3702102,3702103,3702202,3702203,3702302,3702303,3702502,3702503,3702702,3702703,3703002,3703003,3703102,3703103,3703202,3703203,3703302,3703303,3703402,3703403,3703502,3703503,3703802,3703803,3709802,3709803,3714402,3714403,3714602,3714603,3714802,3714803,3714902,3714903,3721702,3721703,3723002,3723003,3750102,3750103,3750202,3750203,3754402,3754403,3754502,3754503,3754602,3754603,3757102,3757103,3759502,3759503,3766202,3766203,3766302,3766303,3766402,3766403,3766502,3766503,3766602,3766603);
-DELETE FROM `creature_onkill_reputation` WHERE `creature_id` BETWEEN 3460602 AND 3845601 OR `creature_id` IN (1040402,1040403);
diff --git a/sql/updates/world/2011_03_24_1_world_loot_template.sql b/sql/updates/world/2011_03_24_1_world_loot_template.sql
deleted file mode 100644
index a039b5d1933..00000000000
--- a/sql/updates/world/2011_03_24_1_world_loot_template.sql
+++ /dev/null
@@ -1,382 +0,0 @@
--- Trashloot for ICC/FoS/PoS/HoR
--- Generic
-SET @ICC_TrashGenericGrey := 35063; -- Set by TDB (need x)
-SET @ICC_TrashGenericWhite := @ICC_TrashGenericGrey+1;
-SET @ICC_TrashGenericScroll := @ICC_TrashGenericGrey+2;
-SET @ICC_TrashGenericGreen := @ICC_TrashGenericGrey+3;
-SET @ICC_TrashGenericBlue := @ICC_TrashGenericGrey+4;
-SET @ICC_TrashGenericPurpleICC := @ICC_TrashGenericGrey+5;
-SET @ICC_TrashCitadelFinal := @ICC_TrashGenericGrey+6;
-SET @ICC_TrashGenericPurpleDUNN := @ICC_TrashGenericGrey+7;
-SET @ICC_TrashDungeonNFinal := @ICC_TrashGenericGrey+8;
-SET @ICC_TrashGenericPurpleDUNH := @ICC_TrashGenericGrey+9;
-SET @ICC_TrashDungeonHFinal := @ICC_TrashGenericGrey+10;
-SET @ICC_TrashGenericPurple := @ICC_TrashGenericGrey+11;
-
-DELETE FROM `reference_loot_template` WHERE `entry` BETWEEN @ICC_TrashGenericGrey AND @ICC_TrashGenericGrey+11; 
-DELETE FROM `reference_loot_template` WHERE `entry` BETWEEN 35063 AND 35076; -- cleanup OLD loot
-INSERT INTO reference_loot_template (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES
--- grey items (45)
-(@ICC_TrashGenericGrey,33430,0,1,1,1,1), -- Abandoned Greatsword
-(@ICC_TrashGenericGrey,33426,0,1,1,1,1), -- Chipped Timber Axe
-(@ICC_TrashGenericGrey,33424,0,1,1,1,1), -- Cracked Iron Staff
-(@ICC_TrashGenericGrey,33428,0,1,1,1,1), -- Dulled SHiv
-(@ICC_TrashGenericGrey,33397,0,1,1,1,1), -- Frigid Mail Armor
-(@ICC_TrashGenericGrey,33398,0,1,1,1,1), -- Frigid Mail Belt
-(@ICC_TrashGenericGrey,33399,0,1,1,1,1), -- Frigid Mail Boots
-(@ICC_TrashGenericGrey,33400,0,1,1,1,1), -- Frigid Mail Bracers
-(@ICC_TrashGenericGrey,33433,0,1,1,1,1), -- Frigid Mail Circlet
-(@ICC_TrashGenericGrey,33401,0,1,1,1,1), -- Frigid Mail Gloves
-(@ICC_TrashGenericGrey,33402,0,1,1,1,1), -- Frigid Mail Pants
-(@ICC_TrashGenericGrey,33403,0,1,1,1,1), -- Frigid Mail Shoulderpads
-(@ICC_TrashGenericGrey,33427,0,1,1,1,1), -- Frost-Encrusted Rifle
-(@ICC_TrashGenericGrey,33365,0,1,1,1,1), -- Frost-Rimed Cloth Belt
-(@ICC_TrashGenericGrey,33366,0,1,1,1,1), -- Frost-Rimed Cloth Boots
-(@ICC_TrashGenericGrey,33367,0,1,1,1,1), -- Frost-Rimed Cloth Bracers
-(@ICC_TrashGenericGrey,33368,0,1,1,1,1), -- Frost-Rimed Cloth Gloves
-(@ICC_TrashGenericGrey,33346,0,1,1,1,1), -- Frost-Rimed Cloth Hat
-(@ICC_TrashGenericGrey,33369,0,1,1,1,1), -- Frost-Rimed Cloth Pants
-(@ICC_TrashGenericGrey,33370,0,1,1,1,1), -- Frost-Rimed Cloth Shoulderpads
-(@ICC_TrashGenericGrey,33371,0,1,1,1,1), -- Frost-Rimed Cloth Vest
-(@ICC_TrashGenericGrey,33412,0,1,1,1,1), -- Frost-Worn Plate Belt
-(@ICC_TrashGenericGrey,33413,0,1,1,1,1), -- Frost-Worn Plate Boots
-(@ICC_TrashGenericGrey,33414,0,1,1,1,1), -- Frost-Worn Plate Bracers
-(@ICC_TrashGenericGrey,33415,0,1,1,1,1), -- Frost-Worn Plate Chestpiece
-(@ICC_TrashGenericGrey,33416,0,1,1,1,1), -- Frost-Worn Plate Gloves
-(@ICC_TrashGenericGrey,33435,0,1,1,1,1), -- Frost-Worn Plate Helmet
-(@ICC_TrashGenericGrey,33417,0,1,1,1,1), -- Frost-Worn Plate Pants
-(@ICC_TrashGenericGrey,33419,0,1,1,1,1), -- Frost-Worn Plate Shoulderpads
-(@ICC_TrashGenericGrey,33379,0,1,1,1,1), -- Frozen Armor
-(@ICC_TrashGenericGrey,33380,0,1,1,1,1), -- Frozen Belt
-(@ICC_TrashGenericGrey,33381,0,1,1,1,1), -- Frozen Boots
-(@ICC_TrashGenericGrey,33382,0,1,1,1,1), -- Frozen Bracers
-(@ICC_TrashGenericGrey,33383,0,1,1,1,1), -- Frozen Gloves
-(@ICC_TrashGenericGrey,33434,0,1,1,1,1), -- Frozen Leather Helmet
-(@ICC_TrashGenericGrey,33384,0,1,1,1,1), -- Frozen Pants
-(@ICC_TrashGenericGrey,33385,0,1,1,1,1), -- Frozen Shoulderpads
-(@ICC_TrashGenericGrey,33429,0,1,1,1,1), -- Ice Cleaver
-(@ICC_TrashGenericGrey,33425,0,1,1,1,1), -- Ice-Pitted Blade
-(@ICC_TrashGenericGrey,33431,0,1,1,1,1), -- Icesmashing Mace
-(@ICC_TrashGenericGrey,33423,0,1,1,1,1), -- Rime-Covered Mace
-(@ICC_TrashGenericGrey,33422,0,1,1,1,1), -- Shattered Bow
-(@ICC_TrashGenericGrey,43852,70,1,1,1,1), -- Thick Fur Clothing Scraps (drops more often)
--- white items
-(@ICC_TrashGenericWhite,33470,0,1,1,2,7), -- Frostweave Cloth
-(@ICC_TrashGenericWhite,33445,0,1,1,1,1), -- Honeymint Tea
-(@ICC_TrashGenericWhite,33454,0,1,1,1,1), -- Salted Venison
-(@ICC_TrashGenericWhite,35947,0,1,1,1,1), -- Sparkling Frostcap
-(@ICC_TrashGenericWhite,33447,0,1,1,1,1), -- Runic Healing Potion
-(@ICC_TrashGenericWhite,33448,0,1,1,1,1), -- Runic Mana Potion
--- Scroll items
-(@ICC_TrashGenericScroll,43463,0,1,1,1,1), -- Scroll of Agility VII
-(@ICC_TrashGenericScroll,37091,0,1,1,1,1), -- Scroll of Intellect VII
-(@ICC_TrashGenericScroll,37093,0,1,1,1,1), -- Scroll of Stamina VII
-(@ICC_TrashGenericScroll,43465,0,1,1,1,1), -- Scroll of Strength VII
-(@ICC_TrashGenericScroll,37097,0,1,1,1,1), -- Scroll of Spirit VII
-(@ICC_TrashGenericScroll,43464,0,1,1,1,1), -- Scroll of Agility VIII
-(@ICC_TrashGenericScroll,37092,0,1,1,1,1), -- Scroll of Intellect VIII
-(@ICC_TrashGenericScroll,37094,0,1,1,1,1), -- Scroll of Stamina VIII
-(@ICC_TrashGenericScroll,43466,0,1,1,1,1), -- Scroll of Strength VIII
-(@ICC_TrashGenericScroll,37098,0,1,1,1,1), -- Scroll of Spirit VIII
--- green items (166)
-(@ICC_TrashGenericGreen,36609,0,1,1,1,1), -- Abandoned Spear
-(@ICC_TrashGenericGreen,36497,0,1,1,1,1), -- Adamant Mallet
-(@ICC_TrashGenericGreen,36511,0,1,1,1,1), -- Artic War Hammer
-(@ICC_TrashGenericGreen,36694,0,1,1,1,1), -- Beatific Mace
-(@ICC_TrashGenericGreen,36527,0,1,1,1,1), -- Blackened Blade
-(@ICC_TrashGenericGreen,36611,0,1,1,1,1), -- Black Scythe
-(@ICC_TrashGenericGreen,36638,0,1,1,1,1), -- Bloody Crossbow
-(@ICC_TrashGenericGreen,36428,0,1,1,1,1), -- Bouquet Ring
-(@ICC_TrashGenericGreen,36639,0,1,1,1,1), -- Brutal Ballista
-(@ICC_TrashGenericGreen,36707,0,1,1,1,1), -- Cascading Water Staff
-(@ICC_TrashGenericGreen,36539,0,1,1,1,1), -- Chilled Warblade
-(@ICC_TrashGenericGreen,36723,0,1,1,1,1), -- Clawed Shuriken
-(@ICC_TrashGenericGreen,36035,0,1,1,1,1), -- Condor Belt
-(@ICC_TrashGenericGreen,36042,0,1,1,1,1), -- Condor Bindings
-(@ICC_TrashGenericGreen,36038,0,1,1,1,1), -- Condor Gloves
-(@ICC_TrashGenericGreen,36039,0,1,1,1,1), -- Condor Headpiece
-(@ICC_TrashGenericGreen,36040,0,1,1,1,1), -- Condor Pants
-(@ICC_TrashGenericGreen,36037,0,1,1,1,1), -- Condor Robe
-(@ICC_TrashGenericGreen,36036,0,1,1,1,1), -- Condor Sandals
-(@ICC_TrashGenericGreen,36041,0,1,1,1,1), -- Condor Shoulderpads
-(@ICC_TrashGenericGreen,36266,0,1,1,1,1), -- Cormorant Bracelets
-(@ICC_TrashGenericGreen,36261,0,1,1,1,1), -- Cormorant Chain Vest
-(@ICC_TrashGenericGreen,36260,0,1,1,1,1), -- Cormorant Footwraps
-(@ICC_TrashGenericGreen,36262,0,1,1,1,1), -- Cormorant Gloves
-(@ICC_TrashGenericGreen,36263,0,1,1,1,1), -- Cormorant Helm
-(@ICC_TrashGenericGreen,36264,0,1,1,1,1), -- Cormorant Leggings
-(@ICC_TrashGenericGreen,36265,0,1,1,1,1), -- Cormorant Mantle
-(@ICC_TrashGenericGreen,36259,0,1,1,1,1), -- Cormorant Waistband
-(@ICC_TrashGenericGreen,36525,0,1,1,1,1), -- Craggy Machete
-(@ICC_TrashGenericGreen,36709,0,1,1,1,1), -- Crystal Woodstaff
-(@ICC_TrashGenericGreen,36050,0,1,1,1,1), -- Crystalsong Bracelets
-(@ICC_TrashGenericGreen,36047,0,1,1,1,1), -- Crystalsong Crown
-(@ICC_TrashGenericGreen,36046,0,1,1,1,1), -- Crystalsong Gloves
-(@ICC_TrashGenericGreen,36048,0,1,1,1,1), -- Crystalsong Leggings
-(@ICC_TrashGenericGreen,36049,0,1,1,1,1), -- Crystalsong Mantle
-(@ICC_TrashGenericGreen,36045,0,1,1,1,1), -- Crystalsong Robe
-(@ICC_TrashGenericGreen,36043,0,1,1,1,1), -- Crystalsong Sash
-(@ICC_TrashGenericGreen,36044,0,1,1,1,1), -- Crystalsong Slippers
-(@ICC_TrashGenericGreen,36554,0,1,1,1,1), -- Cursed Staff
-(@ICC_TrashGenericGreen,43297,0,1,1,1,1), -- Damaged Necklace
-(@ICC_TrashGenericGreen,36553,0,1,1,1,1), -- Desecrated Staff
-(@ICC_TrashGenericGreen,36695,0,1,1,1,1), -- Dogmatic Scepter
-(@ICC_TrashGenericGreen,36721,0,1,1,1,1), -- Dragon's Teeth
-(@ICC_TrashGenericGreen,36413,0,1,1,1,1), -- Dyed Taffeta Cape
-(@ICC_TrashGenericGreen,36427,0,1,1,1,1), -- Engraved Ring
-(@ICC_TrashGenericGreen,36484,0,1,1,1,1), -- Etched Dagger
-(@ICC_TrashGenericGreen,36499,0,1,1,1,1), -- Frigid War-Mace
-(@ICC_TrashGenericGreen,36470,0,1,1,1,1), -- Gilded Scepter
-(@ICC_TrashGenericGreen,36381,0,1,1,1,1), -- Golem Breastplate
-(@ICC_TrashGenericGreen,36382,0,1,1,1,1), -- Golem Gauntlets
-(@ICC_TrashGenericGreen,36379,0,1,1,1,1), -- Golem Girdle
-(@ICC_TrashGenericGreen,36383,0,1,1,1,1), -- Golem Helmet
-(@ICC_TrashGenericGreen,36384,0,1,1,1,1), -- Golem Legplates
-(@ICC_TrashGenericGreen,36385,0,1,1,1,1), -- Golem Pauldrons
-(@ICC_TrashGenericGreen,36380,0,1,1,1,1), -- Golem Sabatons
-(@ICC_TrashGenericGreen,36386,0,1,1,1,1), -- Golem Vambraces
-(@ICC_TrashGenericGreen,36623,0,1,1,1,1), -- Harnessed Longbow
-(@ICC_TrashGenericGreen,36568,0,1,1,1,1), -- Hollowed Bone Knuckles
-(@ICC_TrashGenericGreen,36637,0,1,1,1,1), -- Horrific Crossbow
-(@ICC_TrashGenericGreen,36471,0,1,1,1,1), -- Ice Crystal
-(@ICC_TrashGenericGreen,36582,0,1,1,1,1), -- Ice Pick
-(@ICC_TrashGenericGreen,36597,0,1,1,1,1), -- Ice-Splintering Axe
-(@ICC_TrashGenericGreen,36456,0,1,1,1,1), -- Ice Kite Shield
-(@ICC_TrashGenericGreen,36457,0,1,1,1,1), -- Ivory Shield
-(@ICC_TrashGenericGreen,36373,0,1,1,1,1), -- Kraken Breastplate
-(@ICC_TrashGenericGreen,36377,0,1,1,1,1), -- Kraken Epaulets
-(@ICC_TrashGenericGreen,36374,0,1,1,1,1), -- Kraken Gauntlets
-(@ICC_TrashGenericGreen,36371,0,1,1,1,1), -- Kraken Girdle
-(@ICC_TrashGenericGreen,36372,0,1,1,1,1), -- Kraken Greaves
-(@ICC_TrashGenericGreen,36375,0,1,1,1,1), -- Kraken Helm
-(@ICC_TrashGenericGreen,36376,0,1,1,1,1), -- Kraken Legplates
-(@ICC_TrashGenericGreen,36378,0,1,1,1,1), -- Kraken Vambraces
-(@ICC_TrashGenericGreen,36469,0,1,1,1,1), -- Lidless Orb
-(@ICC_TrashGenericGreen,36513,0,1,1,1,1), -- Lode-Headed Hammer
-(@ICC_TrashGenericGreen,36414,0,1,1,1,1), -- Mammoth Fur Cloack
-(@ICC_TrashGenericGreen,36483,0,1,1,1,1), -- Mandible Edge
-(@ICC_TrashGenericGreen,36625,0,1,1,1,1), -- Massive Recurved Bow
-(@ICC_TrashGenericGreen,36555,0,1,1,1,1), -- Minion Staff
-(@ICC_TrashGenericGreen,36651,0,1,1,1,1), -- Muzzled Musket
-(@ICC_TrashGenericGreen,36680,0,1,1,1,1), -- Mystic Fang
-(@ICC_TrashGenericGreen,36498,0,1,1,1,1), -- Nerubian Mace
-(@ICC_TrashGenericGreen,36512,0,1,1,1,1), -- Onerous Mallet
-(@ICC_TrashGenericGreen,36441,0,1,1,1,1), -- Pearl Woven Choker
-(@ICC_TrashGenericGreen,36540,0,1,1,1,1), -- Petrified Sword
-(@ICC_TrashGenericGreen,36610,0,1,1,1,1), -- Plagued Pike
-(@ICC_TrashGenericGreen,36595,0,1,1,1,1), -- Planate Broadaxe
-(@ICC_TrashGenericGreen,36455,0,1,1,1,1), -- Plated Bulwark
-(@ICC_TrashGenericGreen,36443,0,1,1,1,1), -- Platinum Medallion
-(@ICC_TrashGenericGreen,36666,0,1,1,1,1), -- Polar Wand
-(@ICC_TrashGenericGreen,36653,0,1,1,1,1), -- Precipice Longrifle
-(@ICC_TrashGenericGreen,36147,0,1,1,1,1), -- Pygmy Belt
-(@ICC_TrashGenericGreen,36154,0,1,1,1,1), -- Pygmy Bindings
-(@ICC_TrashGenericGreen,36148,0,1,1,1,1), -- Pygmy Boots
-(@ICC_TrashGenericGreen,36150,0,1,1,1,1), -- Pygmy Gloves
-(@ICC_TrashGenericGreen,36151,0,1,1,1,1), -- Pygmy Helmet
-(@ICC_TrashGenericGreen,36152,0,1,1,1,1), -- Pygmy Pants
-(@ICC_TrashGenericGreen,36153,0,1,1,1,1), -- Pygmy Shoulders
-(@ICC_TrashGenericGreen,36149,0,1,1,1,1), -- Pygmy Tunic
-(@ICC_TrashGenericGreen,36722,0,1,1,1,1), -- Pyramid Throwing Star
-(@ICC_TrashGenericGreen,36389,0,1,1,1,1), -- Revenant Armor
-(@ICC_TrashGenericGreen,36387,0,1,1,1,1), -- Revenant Belt
-(@ICC_TrashGenericGreen,36394,0,1,1,1,1), -- Revenant Bracers
-(@ICC_TrashGenericGreen,36393,0,1,1,1,1), -- Revenant Epaulets
-(@ICC_TrashGenericGreen,36390,0,1,1,1,1), -- Revenant Gauntlets
-(@ICC_TrashGenericGreen,36388,0,1,1,1,1), -- Revenant Greaves
-(@ICC_TrashGenericGreen,36391,0,1,1,1,1), -- Revenant Helmet
-(@ICC_TrashGenericGreen,36392,0,1,1,1,1), -- Revenant Legguards
-(@ICC_TrashGenericGreen,36596,0,1,1,1,1), -- Rupturing Axe
-(@ICC_TrashGenericGreen,36569,0,1,1,1,1), -- Savage Talons
-(@ICC_TrashGenericGreen,36693,0,1,1,1,1), -- Serene Hammer
-(@ICC_TrashGenericGreen,36624,0,1,1,1,1), -- Shrieking Bow
-(@ICC_TrashGenericGreen,36442,0,1,1,1,1), -- Silken Cord Amulet
-(@ICC_TrashGenericGreen,36679,0,1,1,1,1), -- Singing Dagger
-(@ICC_TrashGenericGreen,36485,0,1,1,1,1), -- Sinuous Keris
-(@ICC_TrashGenericGreen,36567,0,1,1,1,1), -- Six-Fingered Claws
-(@ICC_TrashGenericGreen,36583,0,1,1,1,1), -- Skeletal Hacker
-(@ICC_TrashGenericGreen,36526,0,1,1,1,1), -- SLeeted Longsword
-(@ICC_TrashGenericGreen,36708,0,1,1,1,1), -- Snow Blossom Staff
-(@ICC_TrashGenericGreen,36667,0,1,1,1,1), -- Solid Ice Wand
-(@ICC_TrashGenericGreen,36275,0,1,1,1,1), -- Spiderlord Belt
-(@ICC_TrashGenericGreen,36276,0,1,1,1,1), -- Spiderlord Boots
-(@ICC_TrashGenericGreen,36282,0,1,1,1,1), -- Spiderlord Bracers
-(@ICC_TrashGenericGreen,36277,0,1,1,1,1), -- Spiderlord Chestpiece
-(@ICC_TrashGenericGreen,36278,0,1,1,1,1), -- Spiderlord Gauntlets
-(@ICC_TrashGenericGreen,36279,0,1,1,1,1), -- Spiderlord Helm
-(@ICC_TrashGenericGreen,36280,0,1,1,1,1), -- Spiderlord Legguards
-(@ICC_TrashGenericGreen,36281,0,1,1,1,1), -- Spiderlord Spaulders
-(@ICC_TrashGenericGreen,36429,0,1,1,1,1), -- Spur Ring
-(@ICC_TrashGenericGreen,36652,0,1,1,1,1), -- Stocky Shotgun
-(@ICC_TrashGenericGreen,36274,0,1,1,1,1), -- Ulduar Bracers
-(@ICC_TrashGenericGreen,36269,0,1,1,1,1), -- Ulduar Breastplate
-(@ICC_TrashGenericGreen,36270,0,1,1,1,1), -- Ulduar Gauntlets
-(@ICC_TrashGenericGreen,36267,0,1,1,1,1), -- Ulduar Girdle
-(@ICC_TrashGenericGreen,36268,0,1,1,1,1), -- Ulduar Greaves
-(@ICC_TrashGenericGreen,36271,0,1,1,1,1), -- Ulduar Helm
-(@ICC_TrashGenericGreen,36272,0,1,1,1,1), -- Ulduar Legguards
-(@ICC_TrashGenericGreen,36273,0,1,1,1,1), -- Ulduar Shoulderguards
-(@ICC_TrashGenericGreen,36415,0,1,1,1,1), -- Vintage Satin Cloak
-(@ICC_TrashGenericGreen,36058,0,1,1,1,1), -- Vizier Bracelets
-(@ICC_TrashGenericGreen,36054,0,1,1,1,1), -- Vizier Gloves
-(@ICC_TrashGenericGreen,36055,0,1,1,1,1), -- Vizier Hood
-(@ICC_TrashGenericGreen,36056,0,1,1,1,1), -- Vizier Leggings
-(@ICC_TrashGenericGreen,36057,0,1,1,1,1), -- Vizier Mantle
-(@ICC_TrashGenericGreen,36053,0,1,1,1,1), -- Vizier Robe
-(@ICC_TrashGenericGreen,36051,0,1,1,1,1), -- Vizier Sash
-(@ICC_TrashGenericGreen,36052,0,1,1,1,1), -- Vizier SLippers
-(@ICC_TrashGenericGreen,36665,0,1,1,1,1), -- Wasteland Wand
-(@ICC_TrashGenericGreen,36170,0,1,1,1,1), -- Webspinner Bindings
-(@ICC_TrashGenericGreen,36164,0,1,1,1,1), -- Webspinner Boots
-(@ICC_TrashGenericGreen,36163,0,1,1,1,1), -- Webspinner Cord
-(@ICC_TrashGenericGreen,36166,0,1,1,1,1), -- Webspinner Gloves
-(@ICC_TrashGenericGreen,36167,0,1,1,1,1), -- Webspinner Hood
-(@ICC_TrashGenericGreen,36168,0,1,1,1,1), -- Webspinner Leggings
-(@ICC_TrashGenericGreen,36169,0,1,1,1,1), -- Webspinner Shoulderguards
-(@ICC_TrashGenericGreen,36165,0,1,1,1,1), -- Webspinner Vest
-(@ICC_TrashGenericGreen,36162,0,1,1,1,1), -- Wendigo Bands
-(@ICC_TrashGenericGreen,36156,0,1,1,1,1), -- Wendigo Boots
-(@ICC_TrashGenericGreen,36157,0,1,1,1,1), -- Wendigo Chestpiece
-(@ICC_TrashGenericGreen,36155,0,1,1,1,1), -- Wendigo Girdle
-(@ICC_TrashGenericGreen,36158,0,1,1,1,1), -- Wendigo Gloves
-(@ICC_TrashGenericGreen,36159,0,1,1,1,1), -- Wendigo Hood
-(@ICC_TrashGenericGreen,36160,0,1,1,1,1), -- Wendigo Legguards
-(@ICC_TrashGenericGreen,36161,0,1,1,1,1), -- Wendigo Pauldrons
-(@ICC_TrashGenericGreen,36541,0,1,1,1,1), -- Wintry Claymore
-(@ICC_TrashGenericGreen,36681,0,1,1,1,1), -- Wisdom Carver
-(@ICC_TrashGenericGreen,36581,0,1,1,1,1), -- Wolvar Handaxe
--- blue items
-(@ICC_TrashGenericBlue,37792,0,1,1,1,1), -- Agin's Crushing Carapace
-(@ICC_TrashGenericBlue,37770,0,1,1,1,1), -- Bulge-Concealing Breastplate
-(@ICC_TrashGenericBlue,37780,0,1,1,1,1), -- Condor-Bone Chestguard
-(@ICC_TrashGenericBlue,37760,0,1,1,1,1), -- Cracklefire Wristguards
-(@ICC_TrashGenericBlue,37781,0,1,1,1,1), -- Grips of the Warming Heart
-(@ICC_TrashGenericBlue,37824,0,1,1,1,1), -- Gwyneth's Runed Dragonwand
-(@ICC_TrashGenericBlue,37761,0,1,1,1,1), -- Shimmerthread Girdle
-(@ICC_TrashGenericBlue,37793,0,1,1,1,1), -- Skullcage of Eternal Terror
-(@ICC_TrashGenericBlue,37794,0,1,1,1,1), -- Torta's Oversized Choker
-(@ICC_TrashGenericBlue,37822,0,1,1,1,1), -- Twisted Puzzle-Ring
-(@ICC_TrashGenericBlue,37771,0,1,1,1,1), -- Wristguard of Verdant Recovery
--- Designs
-(@ICC_TrashGenericBlue,41788,0,1,1,1,1), -- Design: Beaming Earthsiege Diamond
-(@ICC_TrashGenericBlue,41780,0,1,1,1,1), -- Design: Champion's Monarch Topaz
-(@ICC_TrashGenericBlue,41786,0,1,1,1,1), -- Design: Destructive Skyflare Diamond
-(@ICC_TrashGenericBlue,41777,0,1,1,1,1), -- Design: Etched Monarch Topaz
-(@ICC_TrashGenericBlue,41789,0,1,1,1,1), -- Design: Inscribed Monarch Topaz
-(@ICC_TrashGenericBlue,41781,0,1,1,1,1), -- Design: Misty Forest Emerald
-(@ICC_TrashGenericBlue,41783,0,1,1,1,1), -- Design: Purified Twilight Opal
-(@ICC_TrashGenericBlue,41778,0,1,1,1,1), -- Design: Resolute MOnarch Topaz
-(@ICC_TrashGenericBlue,41782,0,1,1,1,1), -- Design: Shining Forest Emerald
-(@ICC_TrashGenericBlue,41784,0,1,1,1,1), -- Design: Sovereign Twilight Opal
-(@ICC_TrashGenericBlue,41779,0,1,1,1,1), -- Design: Stalwart Monarch Topaz
-(@ICC_TrashGenericBlue,41785,0,1,1,1,1), -- Design: Tenuous Twilight Opal
-(@ICC_TrashGenericBlue,41787,0,1,1,1,1), -- Design: Thundering Skyflare Diamond
--- tailoring
-(@ICC_TrashGenericBlue,43876,0,1,1,1,1), -- A Guide to Northern Cloth Scavenging
--- purple items icc (7)
-(@ICC_TrashGenericPurpleICC,50444,0,1,1,1,1), -- Rowan's Rifle of Silver Bullets
-(@ICC_TrashGenericPurpleICC,50451,0,1,1,1,1), -- Belt of the Lonely Noble
-(@ICC_TrashGenericPurpleICC,50450,0,1,1,1,1), -- Leggings of Dubious Charms
-(@ICC_TrashGenericPurpleICC,50449,0,1,1,1,1), -- Stiffened Corpse Shoulderpads
-(@ICC_TrashGenericPurpleICC,50453,0,1,1,1,1), -- Ring of Rotting Sinew
-(@ICC_TrashGenericPurpleICC,50447,0,1,1,1,1), -- Harbinger's Bone Band
-(@ICC_TrashGenericPurpleICC,50452,0,1,1,1,1), -- Wodin's Lucky Necklace
--- Generic World Epics
-(@ICC_TrashGenericPurple,44311,0,1,1,1,1), -- Avool's Sword of Jin
-(@ICC_TrashGenericPurple,37835,0,1,1,1,1), -- Je'Tze's Bell
-(@ICC_TrashGenericPurple,44310,0,1,1,1,1), -- Namlak's Supernumerary Sticker
-(@ICC_TrashGenericPurple,44309,0,1,1,1,1), -- Sash of Jordan
-(@ICC_TrashGenericPurple,44308,0,1,1,1,1), -- Signet of Edward the Odd
-(@ICC_TrashGenericPurple,37254,0,1,1,1,1), -- Super Simian Sphere
-(@ICC_TrashGenericPurple,44312,0,1,1,1,1), -- Wapach's Spaulders of Solidarity
-(@ICC_TrashGenericPurple,44313,0,1,1,1,1), -- Zom's Crackling Bulwark
--- purple items dungeon_N (4)
-(@ICC_TrashGenericPurpleDUNN,49852,0,1,1,1,1), -- Coffin Nail
-(@ICC_TrashGenericPurpleDUNN,49855,0,1,1,1,1), -- Plated Grips of Korth'azz
-(@ICC_TrashGenericPurpleDUNN,49853,0,1,1,1,1), -- Titanium Links of Lore
-(@ICC_TrashGenericPurpleDUNN,49854,0,1,1,1,1), -- Mantle of Tattered Feathers
--- purple items dungeon_H (3)
-(@ICC_TrashGenericPurpleDUNH,50319,0,1,1,1,1), -- Unsharpened Ice Razor
-(@ICC_TrashGenericPurpleDUNH,50315,0,1,1,1,1), -- Seven-Fingered Claws
-(@ICC_TrashGenericPurpleDUNH,50318,0,1,1,1,1), -- Ghostly Wristwraps
--- final output icc
-(@ICC_TrashCitadelFinal,1,40,1,0,-@ICC_TrashGenericGrey,1), -- 1 grey loot (40%)
-(@ICC_TrashCitadelFinal,2,40,1,0,-@ICC_TrashGenericGrey,1), -- 1 grey loot (40%)
-(@ICC_TrashCitadelFinal,3,20,1,0,-@ICC_TrashGenericWhite,1), -- 1 white loot (20%)
-(@ICC_TrashCitadelFinal,4,7,1,0,-@ICC_TrashGenericScroll,1), -- 1 scroll loot (7%)
-(@ICC_TrashCitadelFinal,5,10,1,0,-@ICC_TrashGenericGreen,1), -- 1 green loot (10%)
-(@ICC_TrashCitadelFinal,6,3,1,0,-@ICC_TrashGenericBlue,1), -- 1 blue loot (3%)
-(@ICC_TrashCitadelFinal,7,2,1,0,-@ICC_TrashGenericPurpleICC,1), -- 1 purple icc loot (2%)
-(@ICC_TrashCitadelFinal,8,1,1,0,-@ICC_TrashGenericPurple,1), -- 1 purple world loot (1%)
--- final output dungeon_n
-(@ICC_TrashDungeonNFinal,1,40,1,0,-@ICC_TrashGenericGrey,1), -- 1 grey loot (40%)
-(@ICC_TrashDungeonNFinal,2,40,1,0,-@ICC_TrashGenericGrey,1), -- 1 grey loot (40%)
-(@ICC_TrashDungeonNFinal,3,20,1,0,-@ICC_TrashGenericWhite,1), -- 1 white loot (20%)
-(@ICC_TrashDungeonNFinal,4,7,1,0,-@ICC_TrashGenericScroll,1), -- 1 scroll loot (7%)
-(@ICC_TrashDungeonNFinal,5,10,1,0,-@ICC_TrashGenericGreen,1), -- 1 green loot (10%)
-(@ICC_TrashDungeonNFinal,6,3,1,0,-@ICC_TrashGenericBlue,1), -- 1 blue loot (3%)
-(@ICC_TrashDungeonNFinal,7,2,1,0,-@ICC_TrashGenericPurpleDUNN,1), -- 1 purple dungeon loot (2%)
-(@ICC_TrashDungeonNFinal,8,1,1,0,-@ICC_TrashGenericPurple,1), -- 1 purple world loot (1%)
--- final output dungeon_h
-(@ICC_TrashDungeonHFinal,1,40,1,0,-@ICC_TrashGenericGrey,1), -- 1 grey loot (40%)
-(@ICC_TrashDungeonHFinal,2,40,1,0,-@ICC_TrashGenericGrey,1), -- 1 grey loot (40%)
-(@ICC_TrashDungeonHFinal,3,20,1,0,-@ICC_TrashGenericWhite,1), -- 1 white loot (20%)
-(@ICC_TrashDungeonHFinal,4,7,1,0,-@ICC_TrashGenericScroll,1), -- 1 scroll loot (7%)
-(@ICC_TrashDungeonHFinal,5,10,1,0,-@ICC_TrashGenericGreen,1), -- 1 green loot (10%)
-(@ICC_TrashDungeonHFinal,6,3,1,0,-@ICC_TrashGenericBlue,1), -- 1 blue loot (3%)
-(@ICC_TrashDungeonHFinal,7,2,1,0,-@ICC_TrashGenericPurpleDUNH,1), -- 1 purple heroicdungeon loot (1%)
-(@ICC_TrashDungeonHFinal,8,1,1,0,-@ICC_TrashGenericPurple,1); -- 1 purple world loot (1%)
-
-
--- --------------------------------
--- -- Apply Trash Loot Dungeon_N --
--- --------------------------------
-SET @LootDUNGEON_N := 100000; -- needs official entry designated
-UPDATE `creature_template` SET `lootid`=@LootDUNGEON_N WHERE `entry` IN (36522,36620,36516,36564,36499,36478,36666); -- FoS
-UPDATE `creature_template` SET `lootid`=@LootDUNGEON_N WHERE `entry` IN (36896,36842,36830,36879,37711,36788,37712,37713); -- PoS
-UPDATE `creature_template` SET `lootid`=@LootDUNGEON_N WHERE `entry` IN (38176,38177,38173,38172,38175,36723); -- HoR
-DELETE FROM `creature_loot_template` WHERE `entry` IN (36522,36620,36516,36564,36499,36478,36666,36896,36842,36830,36879,37711,36788,37712,37713,38176,38177,38173,38172,38175,36723,@LootDUNGEON_N);
-INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES
-(@LootDUNGEON_N,1,100,1,0,-@ICC_TrashDungeonNFinal,2); -- 2 selection from reference
-
--- --------------------------------
--- -- Apply Trash Loot Dungeon_H --
--- -------------------------------- 
-SET @LootDUNGEON_H := 100001; -- needs official entry designated
-UPDATE `creature_template` SET `lootid`=@LootDUNGEON_H WHERE `entry` IN (37569,37568,37567,37565,38193,37566,37563); -- FoS
-UPDATE `creature_template` SET `lootid`=@LootDUNGEON_H WHERE `entry` IN (37609,37638,37637,37635,37636,38249,38025,38026); -- PoS
-UPDATE `creature_template` SET `lootid`=@LootDUNGEON_H WHERE `entry` IN (37720,38524,38525,38563,38544,38564); -- HoR
-DELETE FROM `creature_loot_template` WHERE `entry` IN (37569,37568,37567,37565,38193,37566,37563,37609,37638,37637,37635,37636,38249,38025,38026,37720,38524,38525,38563,38544,38564,@LootDUNGEON_H);
-INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES
-(@LootDUNGEON_H,1,100,1,0,-@ICC_TrashDungeonHFinal,2); -- 2 selection from reference
-
--- --------------------------
--- -- Apply Trash Loot ICC --
--- --------------------------
-SET @LootRAID := 100002; -- needs official entry designated
-UPDATE `creature_template` SET `lootid`=@LootRAID WHERE `entry` IN(37012,37022,37571,37664,37595,37662,37665,37663,37666,37007,36811,36807,36829,36805,36808,36880,37546,37531,37229,37228,36725,37501,37502,37023,10404,38494,38490,36724,37126,37544,37545,37098,37038);
-DELETE FROM `creature_loot_template` WHERE `entry` IN(37012,37022,37571,37664,37595,37662,37665,37663,37666,37007,36811,36807,36829,36805,36808,36880,37546,37531,37229,37228,36725,37501,37502,37023,10404,38494,38490,36724,37126,37544,37545,37098,37038,@LootRAID);
-INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES
-(@LootRAID,1,100,1,0,-@ICC_TrashCitadelFinal,2); -- 2 selection from reference
-
--- --------------------
--- -- Special Cases: --
--- --------------------
--- Specialids
-CALL `sp_set_npc_lootid_bylist` ('37217,37025,37230,37532,36891',NULL);
--- Loot
-DELETE FROM `creature_loot_template` WHERE `entry` IN (37217,37025,37230,37532,36891);
-INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES
--- Precious
-(37217,1,100,1,0,-@ICC_TrashCitadelFinal,2), -- 2 selection from reference
-(37217,52019,30,1,0,1,1), -- Precious Ribbon
--- Stinky
-(37025,1,100,1,0,-@ICC_TrashCitadelFinal,2), -- 2 selection from reference
--- Dragons (Spire Frostwyrm)
-(37230,1,100,1,0,-@ICC_TrashCitadelFinal,2), -- 2 selection from reference
-(37230,33631,65,1,1,2,3), -- Frosted Claw
-(37230,33632,35,1,1,2,3), -- Icicle Fang
-(37532,33631,65,1,1,2,3), -- Frosted Claw
-(37532,33632,35,1,1,2,3), -- Icicle Fang
-(36891,33631,65,1,1,2,3), -- Frosted Claw
-(36891,33632,35,1,1,2,3); -- Icicle Fang
diff --git a/sql/updates/world/2011_03_24_2_world_sai.sql b/sql/updates/world/2011_03_24_2_world_sai.sql
deleted file mode 100644
index b4ee24b0a31..00000000000
--- a/sql/updates/world/2011_03_24_2_world_sai.sql
+++ /dev/null
@@ -1,137 +0,0 @@
--- Jean Pierre Poulain SAI
-SET @ENTRY  := 34244;
-SET @GOSSIP := 10478;
-UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY;
-DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY;
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
-(@ENTRY,0,0,0,62,0,100,0,@GOSSIP,0,0,0,11,64795,1,0,0,0,0,7,0,0,0,0,0,0,0, 'Jean Pierre Poulain - On gossip option select - cast spell');
--- Cleanup gossip
-UPDATE `gossip_menu_option` SET `action_script_id`=0 WHERE `menu_id`=@GOSSIP;
-DELETE FROM `gossip_scripts` WHERE `id` IN (1047800);
-
--- Fizzcrank Fullthrottle SAI
-SET @ENTRY  := 25590;
-SET @GOSSIP := 9182;
-UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY;
-DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY;
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
-(@ENTRY,0,0,1,62,0,100,0,@GOSSIP,0,0,0,15,11708,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Fizzcrank Fullthrottle - On gossip option select - quest complete'),
-(@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, 'Fizzcrank Fullthrottle - On gossip option select - close gossip');
--- Cleanup gossip
-UPDATE `gossip_menu_option` SET `action_script_id`=0 WHERE `menu_id`=@GOSSIP;
-DELETE FROM `gossip_scripts` WHERE `id` IN (918200);
-
--- Keeper Remulos SAI
-SET @ENTRY  := 11832;
-SET @GOSSIP := 10215;
-UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY;
-DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY;
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
-(@ENTRY,0,0,0,62,0,100,0,@GOSSIP,0,0,0,11,57413,1,0,0,0,0,7,0,0,0,0,0,0,0, 'Keeper Remulos - On gossip option select - cast spell'),
-(@ENTRY,0,1,2,62,0,100,0,@GOSSIP,1,0,0,11,57670,1,0,0,0,0,7,0,0,0,0,0,0,0, 'Keeper Remulos - On gossip option select - cast spell'),
-(@ENTRY,0,2,0,61,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Keeper Remulos - On gossip option select - close gossip');
--- Cleanup gossip
-UPDATE `gossip_menu_option` SET `action_script_id`=0 WHERE `menu_id`=@GOSSIP;
-DELETE FROM `gossip_scripts` WHERE `id` IN (1021500,1021501);
-
--- Fizzcrank Recon Pilot SAI
-SET @ENTRY  := 25841;
-SET @GOSSIP := 21248;
-SET @SCRIPT := 212481;
-UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY;
-DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY;
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
-(@ENTRY,0,0,1,62,0,100,0,@GOSSIP,0,0,0,11,46362,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Fizzcrank Recon Pilot - On gossip option select - cast spell'),
-(@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, 'Fizzcrank Recon Pilot - On gossip option select - close gossip'),
-(@ENTRY,0,2,0,11,0,100,0,0,0,0,0,81,2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Fizzcrank Recon Pilot - On spawn - set gossip flag'),
-(@ENTRY,0,3,4,8,0,100,0,46362,0,0,0,11,46362,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Fizzcrank Recon Pilot - On spellhit - cast spell on envoker'),
-(@ENTRY,0,4,0,61,0,100,0,0,0,0,0,23,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Fizzcrank Recon Pilot - On spellhit - set phase 1'),
-(@ENTRY,0,5,0,1,1,100,0,3000,3000,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Fizzcrank Recon Pilot - OOC - wait 3 sec despawn (Phase 1)');
--- Cleanup EAI
-DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY;
--- Cleanup gossip
-UPDATE `gossip_menu_option` SET `action_script_id`=0 WHERE `menu_id`=@GOSSIP AND `id`=0;
-DELETE FROM `gossip_scripts` WHERE `id`=@SCRIPT;
-
--- Glodrak Huntsniper SAI
-SET @ENTRY  := 24657;
-SET @GOSSIP := 10603;
-SET @SCRIPT := 1060400;
-UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY;
-DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY;
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
-(@ENTRY,0,0,1,62,0,100,0,@GOSSIP,0,0,0,11,66592,1,0,0,0,0,7,0,0,0,0,0,0,0, 'Glodrak Huntsniper - On gossip option select - cast spell'),
-(@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, 'Glodrak Huntsniper - On gossip option select - close gossip');
--- Cleanup gossip
-UPDATE `gossip_menu_option` SET `action_script_id`=0 WHERE `menu_id`=@GOSSIP AND `id`=0;
-DELETE FROM `gossip_scripts` WHERE `id`=@SCRIPT;
--- Goldark Snipehunter SAI
-SET @ENTRY  := 23486;
-SET @GOSSIP := 10604;
-UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY;
-DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY;
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
-(@ENTRY,0,0,1,62,0,100,0,@GOSSIP,0,0,0,11,66592,1,0,0,0,0,7,0,0,0,0,0,0,0, 'Goldark Snipehunter - On gossip option select - cast spell'),
-(@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, 'Goldark Snipehunter - On gossip option select - close gossip');
--- Cleanup gossip
-UPDATE `gossip_menu_option` SET `action_script_id`=0 WHERE `menu_id`=@GOSSIP AND `id`=0;
-
--- Pol Amberstill & Driz Tumblequick SAI
-SET @ENTRY   := 24468;
-SET @ENTRY1  := 24510;
-SET @GOSSIP  := 8958;
-SET @GOSSIP1 := 8960;
-SET @SCRIPT  := 895800;
-UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry` IN (@ENTRY,@ENTRY1);
-DELETE FROM `smart_scripts` WHERE `entryorguid` IN (@ENTRY,@ENTRY1);
-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
--- Pol Amberstill
-(@ENTRY,0,0,1,62,0,100,0,@GOSSIP,6,0,0,11,44262,1,0,0,0,0,7,0,0,0,0,0,0,0, 'Pol Amberstill - On gossip option select - cast spell'),
-(@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, 'Pol Amberstill - On gossip option select - close gossip'),
-(@ENTRY,0,2,3,62,0,100,0,@GOSSIP1,0,0,0,11,44262,1,0,0,0,0,7,0,0,0,0,0,0,0, 'Pol Amberstill - On gossip option select - cast spell'),
-(@ENTRY,0,3,0,61,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Pol Amberstill - On gossip option select - close gossip'),
--- Driz Tumblequick
-(@ENTRY1,0,0,1,62,0,100,0,@GOSSIP,6,0,0,11,44262,1,0,0,0,0,7,0,0,0,0,0,0,0, 'Driz Tumblequick - On gossip option select - cast spell'),
-(@ENTRY1,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, 'Driz Tumblequick - On gossip option select - close gossip'),
-(@ENTRY1,0,2,3,62,0,100,0,@GOSSIP1,0,0,0,11,44262,1,0,0,0,0,7,0,0,0,0,0,0,0, 'Driz Tumblequick - On gossip option select - cast spell'),
-(@ENTRY1,0,3,0,61,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Driz Tumblequick - On gossip option select - close gossip');
--- Ckeanup gossip
-UPDATE `gossip_menu_option` SET `action_script_id`=0 WHERE `menu_id`=@GOSSIP AND `id`=6;
-UPDATE `gossip_menu_option` SET `action_script_id`=0 WHERE `menu_id`=@GOSSIP1 AND `id`=0;
-DELETE FROM `gossip_scripts` WHERE `id`=@SCRIPT;
-
--- Steel Gate Chief Archaeologist SAI
-SET @ENTRY  := 24399;
-SET @GOSSIP := 8953;
-SET @SCRIPT := 895300;
-UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY;
-DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY;
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
-(@ENTRY,0,0,1,62,0,100,0,@GOSSIP,0,0,0,11,43533,1,0,0,0,0,7,0,0,0,0,0,0,0, 'Steel Gate Chief Archaeologist - On gossip option select - cast spell'),
-(@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, 'Steel Gate Chief Archaeologist - On gossip option select - close gossip');
--- Cleanup gossip
-UPDATE `gossip_menu_option` SET `action_script_id`=0 WHERE `menu_id`=@GOSSIP AND `id`=0;
-DELETE FROM `gossip_scripts` WHERE `id`=@SCRIPT;
-
--- Drakuru SAI
-SET @ENTRY := 26423;
-SET @GOSSIP := 21249;
-UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY;
-DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY;
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
-(@ENTRY,0,0,1,62,0,100,0,@GOSSIP,0,0,0,33,27921,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Drakuru - On gossip option select - killcredit'),
-(@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, 'Drakuru - On gossip option select - close gossip');
--- Cleanup gossip
-UPDATE `gossip_menu_option` SET `action_script_id`=0 WHERE `menu_id`=@GOSSIP AND `id`=0;
-DELETE FROM `gossip_scripts` WHERE `id`=@GOSSIP;
-
--- Dread Captain DeMeza SAI
-SET @ENTRY := 28048;
-UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY;
-DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY;
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
-(@ENTRY,0,0,1,62,0,100,0,9647,0,0,0,11,50517,1,0,0,0,0,7,0,0,0,0,0,0,0, 'Dread Captain DeMeza - On gossip option select - cast spell'),
-(@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, 'Dread Captain DeMeza - On gossip option select - close gossip');
--- Cleanup gossip
-UPDATE `gossip_menu_option` SET `action_script_id`=0 WHERE `menu_id`=9647 AND `id`=0;
-DELETE FROM `gossip_scripts` WHERE `id`=9647;
diff --git a/sql/updates/world/2011_03_24_3_world_sai.sql b/sql/updates/world/2011_03_24_3_world_sai.sql
deleted file mode 100644
index fa560592d06..00000000000
--- a/sql/updates/world/2011_03_24_3_world_sai.sql
+++ /dev/null
@@ -1,61 +0,0 @@
--- Scourge Deathspeaker SAI 
-UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=27615;
-DELETE FROM `creature_ai_scripts` WHERE `creature_id`=27615;
-DELETE FROM `smart_scripts` WHERE `entryorguid`=27615;
-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
-(27615,0,0,1,1,0,100,1,1000,1000,1000,1000,11,49119,2,0,0,0,0,10,101497,27452,0,0,0,0,0,'Scourge Deathspeaker - Spawn & reset - channel Fire Beam'),
-(27615,0,1,0,61,0,100,1,0,0,0,0,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Scourge Deathspeaker - Spawn & reset - Prevent Combat Movement'),
-(27615,0,2,3,4,0,100,1,0,0,0,0,11,52282,2,0,0,0,0,2,0,0,0,0,0,0,0,'Scourge Deathspeaker - On aggro - Cast Fireball'),
-(27615,0,3,0,61,0,100,1,0,0,0,0,22,1,0,0,0,0,0,0,0,0,0,0,0,0,0,'Scourge Deathspeaker - On aggro - Set phase 1'),
-(27615,0,4,0,9,1,100,0,3000,3000,3400,4800,11,52282,1,0,0,0,0,2,0,0,0,0,0,0,0,'Scourge Deathspeaker - in combat - Cast Fireball (phase 1)'),
-(27615,0,5,0,9,1,100,0,35,80,1000,1000,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Scourge Deathspeaker - At 35 Yards - Start Combat Movement (phase 1)'),
-(27615,0,6,0,9,1,100,0,5,15,1000,1000,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Scourge Deathspeaker - At 15 Yards - Prevent Combat Movement (phase 1)'),
-(27615,0,7,0,9,1,100,0,0,5,1000,1000,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Scourge Deathspeaker - Below 5 Yards - Start Combat Movement (phase 1)'),
-(27615,0,8,0,3,1,100,1,0,7,0,0,22,2,0,0,0,0,0,0,0,0,0,0,0,0,0,'Scourge Deathspeaker - Mana at 7% - Set Phase 2 (phase 1)'),
-(27615,0,9,0,0,2,100,1,0,0,0,0,21,1,0,0,0,0,0,0,0,0,0,0,0,0,0,'Scourge Deathspeaker - In combat - Allow Combat Movement (phase 2)'),
-(27615,0,10,0,3,2,100,1,15,100,100,100,22,1,0,0,0,0,0,0,0,0,0,0,0,0,0,'Scourge Deathspeaker - Mana above 15% - Set Phase 1 (phase 2)'),
-(27615,0,11,0,2,0,100,1,0,30,120000,130000,11,52281,0,0,0,0,0,2,0,0,0,0,0,0,0,'Scourge Deathspeaker - At 15% HP - Cast Flame of the Seer'),
-(27615,0,12,0,2,0,100,1,0,15,0,0,22,3,0,0,0,0,0,0,0,0,0,0,0,0,0,'Scourge Deathspeaker - At 15% HP - Set Phase 3'),
-(27615,0,13,0,2,4,100,1,0,15,0,0,21,1,0,0,0,0,0,0,0,0,0,0,0,0,0,'Scourge Deathspeaker - At 15% HP - Allow Combat Movement (phase 3)'),
-(27615,0,14,15,2,4,100,1,0,15,0,0,25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'Scourge Deathspeaker - At 15% HP - Flee (phase 3)'),
-(27615,0,15,0,61,4,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Scourge Deathspeaker - At 15% HP - Say text0 (Phase 3)');
-
--- NPC talk text insert
-DELETE FROM `creature_text` WHERE `entry` IN (27615);
-INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
-(27615,0,0, '%s attempts to run away in fear!',2,0,100,0,0,0, 'Scourge Deathspeaker');
-
--- SET InhabitType for Invisible Stalker Grizzly Hills
-UPDATE `creature_template` SET `InhabitType`=7 WHERE `entry`=27452;
-
--- SAI for Dark Conclave Ritualist
-SET @ENTRY := 22138;
-UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
-DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
-(@ENTRY,0,0,0,1,0,100,1,1000,1000,1000,1000,11,38469,0,0,0,0,0,19,22139,0,0,0,0,0,0,'Dark Conclave Ritualist - OOC - Dark Conclave Ritualist Channel');
-
--- Shattered Sun Marksman fixup (tested) 
--- Console no longer spamming waypoint script errors in The Dawning Square
-UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=24938;
--- Shattered Sun Marksman shoot at Bridge Marksman Target Dummy SAI
-DELETE FROM `smart_scripts` WHERE `entryorguid` IN (-65694,-65695,-65696,-65697,-65698,-65699,-65700,-65702);
-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
-(-65694,0,0,0,1,0,100,0,5000,5000,5000,7000,11,45223,0,0,0,0,0,10,62844,25192,0,0,0,0,0,'Shattered Sun Marksman - OOC 5-7 sec - Shoot at trigger'),
-(-65695,0,0,0,1,0,100,0,2000,2000,5000,7000,11,45223,0,0,0,0,0,10,62844,25192,0,0,0,0,0,'Shattered Sun Marksman - OOC 5-7 sec - Shoot at trigger'),
-(-65696,0,0,0,1,0,100,0,3000,3000,5000,7000,11,45223,0,0,0,0,0,10,62843,25192,0,0,0,0,0,'Shattered Sun Marksman - OOC 5-7 sec - Shoot at trigger'),
-(-65697,0,0,0,1,0,100,0,6000,6000,5000,7000,11,45223,0,0,0,0,0,10,62843,25192,0,0,0,0,0,'Shattered Sun Marksman - OOC 5-7 sec - Shoot at trigger'),
-(-65698,0,0,0,1,0,100,0,2000,2000,5000,7000,11,45223,0,0,0,0,0,10,59515,25192,0,0,0,0,0,'Shattered Sun Marksman - OOC 5-7 sec - Shoot at trigger'),
-(-65699,0,0,0,1,0,100,0,5000,5000,5000,7000,11,45223,0,0,0,0,0,10,62841,25192,0,0,0,0,0,'Shattered Sun Marksman - OOC 5-7 sec - Shoot at trigger'),
-(-65700,0,0,0,1,0,100,0,1000,1000,5000,7000,11,45223,0,0,0,0,0,10,62842,25192,0,0,0,0,0,'Shattered Sun Marksman - OOC 5-7 sec - Shoot at trigger'),
-(-65702,0,0,0,1,0,100,0,5000,5000,5000,7000,11,45223,0,0,0,0,0,10,59473,25192,0,0,0,0,0,'Shattered Sun Marksman - OOC 5-7 sec - Shoot at trigger');
--- Remove path data and scripts from Shattered Sun Marksman
-DELETE FROM `waypoint_data` WHERE `id` IN (656940,656950,656960,656970,656980,656990,657000,657020);
-DELETE FROM `waypoint_scripts` WHERE `id` BETWEEN 80 AND 111;
-UPDATE `creature` SET `spawndist`=0,`MovementType`=0 WHERE `guid` IN (65694,65695,65696,65697,65698,65699,65700,65702);
-UPDATE `creature_addon` SET `path_id`=0 WHERE `guid` IN (65694,65695,65696,65697,65698,65699,65700,65702);
-
--- Fix Spell condition for Spell 45223 to target Bridge Marksman Target Dummy 25192 
-DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=45223;
-INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
-(13,0,45223,0,18,1,25192,0,0,'','Spell 45223 targets Bridge Marksman Target Dummy');
diff --git a/sql/updates/world/2011_03_24_4_world_sai.sql b/sql/updates/world/2011_03_24_4_world_sai.sql
deleted file mode 100644
index e0c281fa559..00000000000
--- a/sql/updates/world/2011_03_24_4_world_sai.sql
+++ /dev/null
@@ -1,448 +0,0 @@
--- Quest 10895 "Zeth'Gor Must Burn!" (Alliance)
--- Remove flame spawns from db
-DELETE FROM `gameobject` WHERE `guid` IN (32141,32142,32143,24683,24684,24685,24686);
--- Remove Honor Hold Gryphon Brigadier, Foothill spawns from db
-DELETE FROM `creature` WHERE `guid` IN (78738,78739,78740,78741);
--- Zeth'Gor Quest Credit Marker, They Must Burn & Remove Honor Hold Gryphon Brigadier have wrong inhabit type, fix flags
-UPDATE `creature_template` SET `InhabitType`=4 WHERE `entry` IN (21173,21170,22404,22405,22406);
-UPDATE `creature_template` SET `unit_flags`=`unit_flags`|2048 WHERE `entry` IN (21170,22404,22405,22406);
-
--- Add missing Zeth'Gor Quest Credit Marker, They Must Burn
-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 
-(78738,21173,530,1,1,0,0,-1162.911377,2248.195313,152.24733,4.815845,120,0,0,1,0,0,0);
-
--- Add missing Go
-DELETE FROM `gameobject_template` WHERE `entry`=183929;
-INSERT INTO `gameobject_template` (`entry`,`type`,`displayId`,`name`,`castBarCaption`,`unk1`,`faction`,`flags`,`size`,`data0`,`data1`,`data2`,`data3`,`data4`,`data5`,`data6`,`data7`,`data8`,`data9`,`data10`,`data11`,`data12`,`data13`,`data14`,`data15`,`data16`,`data17`,`data18`,`data19`,`data20`,`data21`,`data22`,`data23`,`ScriptName`,`WDBVerified`) VALUES 
-(183929,6,0, '', '', '',35,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, '',1);
-
--- SAI add animation to GameObject Smoke Beacon
-SET @ENTRY := 184661;
-UPDATE `gameobject_template` SET `AIName`= 'SmartGameObjectAI' WHERE `entry`=@ENTRY;
-DELETE FROM `smart_scripts` WHERE `source_type`=1 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,1,0,0,1,0,100,0,0,0,1000,1000,93,3,0,0,0,0,0,1,0,0,0,0,0,0,0, 'GameObject Smoke Beacon - On Spawn - Do Custom Animation');
-
--- Add spell conditions for 36325
-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');
-
--- SAI for Zeth'Gor Quest Credit Marker, They Must Burn, Tower South
-SET @ENTRY := 21182;
-UPDATE `creature_template` SET `minlevel`=1,`maxlevel`=1,`flags_extra`=`flags_extra`&~2,`InhabitType`=4,`AIName`='SmartAI' WHERE `entry`=@ENTRY;
-DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
-(@ENTRY,0,0,0,11,0,100,0,0,0,0,0,53,0,@ENTRY,1,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On Spawn - Start WP movement'),
-(@ENTRY,0,1,2,8,0,100,0,36374,0,0,0,45,0,1,0,0,0,0,10,78738,21173,0,0,0,0,0,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On spell hit - Call Griphonriders'),
-(@ENTRY,0,2,0,61,0,100,0,0,0,0,0,11,34386,2,0,0,0,0,1,0,0,0,0,0,0,0,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On spell hit - Spawn fire');
-
--- Waypoints for Zeth'Gor Quest Credit Marker, They Must Burn, Tower South from sniff
-DELETE FROM `waypoints` WHERE `entry`=@ENTRY;
-INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
-(@ENTRY,1,-1156.975,2109.627,83.51005,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South WP 1'),
-(@ENTRY,2,-1152.303,2112.098,90.67654,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South WP 2'),
-(@ENTRY,3,-1150.817,2103.74,89.81573,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South WP 3'),
-(@ENTRY,4,-1153.965,2107.031,97.06559,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South WP 4'),
-(@ENTRY,5,-1156.105,2107.421,93.06557,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South WP 5'),
-(@ENTRY,6,-1152.167,2107.406,83.17665,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South WP 6'),
-(@ENTRY,7,-1150.145,2102.392,75.23684,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South WP 7'),
-(@ENTRY,8,-1158.784,2102.993,76.98234,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South WP 8'),
-(@ENTRY,9,-1158.344,2112.019,79.20454,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South WP 9'),
-(@ENTRY,10,-1148.166,2113.343,77.0103,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South WP 10'),
-(@ENTRY,11,-1148.897,2102.624,69.67694,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South WP 11'),
-(@ENTRY,12,-1157.054,2104.975,82.9548,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South WP 12');
--- Update Creature
-UPDATE `creature` SET `curhealth`=1,`spawndist`=0,`MovementType`=0,`position_x`=-1157.054,`position_y`=2104.975,`position_z`=82.9548,`orientation`=1.186824 WHERE `guid`=74299;
-
--- SAI for Zeth'Gor Quest Credit Marker, They Must Burn, Tower North
-SET @ENTRY := 22401;
-UPDATE `creature_template` SET `minlevel`=1,`maxlevel`=1,`flags_extra`=`flags_extra`&~2,`InhabitType`=4,`AIName`='SmartAI' WHERE `entry`=@ENTRY;
-DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
-(@ENTRY,0,0,0,11,0,100,0,0,0,0,0,53,0,@ENTRY,1,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower North - On Spawn - Start WP movement'),
-(@ENTRY,0,1,2,8,0,100,0,36374,0,0,0,45,0,2,0,0,0,0,10,74239,21173,0,0,0,0,0,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower North - On spell hit - Call Griphonriders'),
-(@ENTRY,0,2,0,61,0,100,0,0,0,0,0,11,34386,2,0,0,0,0,1,0,0,0,0,0,0,0,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower North - On spell hit - Spawn fire');
-
--- Waypoints for Zeth'Gor Quest Credit Marker, They Must Burn, Tower North from sniff
-DELETE FROM `waypoints` WHERE `entry`=@ENTRY;
-INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
-(@ENTRY,1,-821.9919,2034.883,55.01843,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower North WP 1'),
-(@ENTRY,2,-820.9771,2027.591,63.68367,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower North WP 2'),
-(@ENTRY,3,-825.2185,2034.113,65.86314,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower North WP 3'),
-(@ENTRY,4,-816.8493,2028.659,49.75199,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower North WP 4'),
-(@ENTRY,5,-825.249,2026.351,46.58422,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower North WP 5');
--- Update Creature
-UPDATE `creature` SET `curhealth`=1,`spawndist`=0,`MovementType`=0,`position_x`=-825.249,`position_y`=2026.351,`position_z`=46.58422,`orientation`=1.186824 WHERE `guid`=78735;
-
--- SAI for Zeth'Gor Quest Credit Marker, They Must Burn, Tower Forge
-SET @ENTRY := 22402;
-UPDATE `creature_template` SET `minlevel`=1,`maxlevel`=1,`flags_extra`=`flags_extra`&~2,`InhabitType`=4,`AIName`='SmartAI' WHERE `entry`=@ENTRY;
-DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
-(@ENTRY,0,0,0,11,0,100,0,0,0,0,0,53,0,@ENTRY,1,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower Forge - On Spawn - Start WP movement'),
-(@ENTRY,0,1,2,8,0,100,0,36374,0,0,0,45,0,3,0,0,0,0,10,74239,21173,0,0,0,0,0,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower Forge - On spell hit - Call Griphonriders'),
-(@ENTRY,0,2,0,61,0,100,0,0,0,0,0,11,34386,2,0,0,0,0,1,0,0,0,0,0,0,0,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower Forge - On spell hit - Spawn fire');
-
--- Waypoints for Zeth'Gor Quest Credit Marker, They Must Burn, Tower Forge from sniff
-DELETE FROM `waypoints` WHERE `entry`=@ENTRY;
-INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
-(@ENTRY,1,-897.1001,1917.556,93.73737,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower Forge WP 1'),
-(@ENTRY,2,-903.386,1919.14,76.0997,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower Forge WP 2'),
-(@ENTRY,3,-898.1819,1920.161,82.67819,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower Forge WP 3'),
-(@ENTRY,4,-901.2836,1920.168,92.57269,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower Forge WP 4'),
-(@ENTRY,5,-894.9478,1924.78,75.48938,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower Forge WP 5'),
-(@ENTRY,6,-894.4704,1919.866,93.71019,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower Forge WP 6');
--- Update Creature
-UPDATE `creature` SET `curhealth`=1,`spawndist`=0,`MovementType`=0,`position_x`=-894.4704,`position_y`=1919.866,`position_z`=93.71019,`orientation`=1.186824 WHERE `guid`=78736;
-
--- SAI for Zeth'Gor Quest Credit Marker, They Must Burn, Tower Foothill
-SET @ENTRY := 22403;
-UPDATE `creature_template` SET `minlevel`=1,`maxlevel`=1,`flags_extra`=`flags_extra`&~2,`flags_extra`=`flags_extra`|128,`InhabitType`=4,`AIName`='SmartAI' WHERE `entry`=@ENTRY;
-DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
-(@ENTRY,0,0,0,11,0,100,0,0,0,0,0,53,0,@ENTRY,1,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower Foothill - On Spawn - Start WP movement'),
-(@ENTRY,0,1,2,8,0,100,0,36374,0,0,0,45,0,4,0,0,0,0,10,74239,21173,0,0,0,0,0,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower Foothill - On spell hit - Call Griphonriders'),
-(@ENTRY,0,2,0,61,0,100,0,0,0,0,0,11,34386,2,0,0,0,0,1,0,0,0,0,0,0,0,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower Foothill - On spell hit - Spawn fire');
-
--- Waypoints for Zeth'Gor Quest Credit Marker, They Must Burn, Tower Foothill from sniff
-DELETE FROM `waypoints` WHERE `entry`=@ENTRY;
-INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
-(@ENTRY,1,-978.3713,1883.556,104.3167,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower Foothill WP 1'),
-(@ENTRY,2,-974.3038,1878.926,109.6782,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower Foothill WP 2'),
-(@ENTRY,3,-974.1463,1874.819,121.9402,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower Foothill WP 3'),
-(@ENTRY,4,-982.4401,1875.441,100.4122,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower Foothill WP 4'),
-(@ENTRY,5,-975.1263,1882.178,118.0354,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower Foothill WP 5'),
-(@ENTRY,6,-979.3693,1876.667,121.5866,'Zeth''Gor Quest Credit Marker, They Must Burn, Tower Foothill WP 6');
--- Update Creature
-UPDATE `creature` SET `curhealth`=1,`spawndist`=0,`MovementType`=0,`position_x`=-979.3693,`position_y`=1876.667,`position_z`=121.5866,`orientation`=1.186824 WHERE `guid`=78737;
-
--- SAI for Zeth'Gor Quest Credit Marker, They Must Burn
-SET @ENTRY  := 21173; -- Zeth'Gor Quest Credit Marker, They Must Burn
-SET @ENTRY1 := 21170; -- Honor Hold Gryphon Brigadier, South
-SET @ENTRY2 := 22404; -- Honor Hold Gryphon Brigadier, North
-SET @ENTRY3 := 22405; -- Honor Hold Gryphon Brigadier, Forge
-SET @ENTRY4 := 22406; -- Honor Hold Gryphon Brigadier, Foothills
-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` IN (@ENTRY*100, (@ENTRY*100)+1, (@ENTRY*100)+2, (@ENTRY*100)+3);
-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,38,0,100,0,0,1,0,0,80,(@ENTRY*100)+0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On dataset - load script'),
-(@ENTRY,0,1,0,38,0,100,0,0,2,0,0,80,(@ENTRY*100)+1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower North - On dataset - load script'),
-(@ENTRY,0,2,0,38,0,100,0,0,3,0,0,80,(@ENTRY*100)+2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower Forge - On dataset - load script'),
-(@ENTRY,0,3,0,38,0,100,0,0,4,0,0,80,(@ENTRY*100)+3,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower Foothill - On dataset - load script'),
--- Script 0
-(@ENTRY*100,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,'Reset data 0'),
-(@ENTRY*100,9,1,0,0,0,100,0,1000,1000,0,0,11,36302,0,0,0,0,0,1,0,0,0,0,0,0,0, ' Summon Honor Hold Gryphon Brigadier, South'),
-(@ENTRY*100,9,2,0,0,0,100,0,3000,3000,0,0,45,0,1,0,0,0,0,19,@ENTRY1,0,0,0,0,0,0, ' Summon Honor Hold Gryphon Brigadier, South'),
-(@ENTRY*100,9,3,0,0,0,100,0,0,0,0,0,11,36302,0,0,0,0,0,1,0,0,0,0,0,0,0, ' Summon Honor Hold Gryphon Brigadier, South'),
-(@ENTRY*100,9,4,0,0,0,100,0,3000,3000,0,0,45,0,2,0,0,0,0,19,@ENTRY1,0,0,0,0,0,0, ' Summon Honor Hold Gryphon Brigadier, South'),
-(@ENTRY*100,9,5,0,0,0,100,0,0,0,0,0,11,36302,0,0,0,0,0,1,0,0,0,0,0,0,0, ' Summon Honor Hold Gryphon Brigadier, South'),
-(@ENTRY*100,9,6,0,0,0,100,0,3000,3000,0,0,45,0,3,0,0,0,0,19,@ENTRY1,0,0,0,0,0,0, ' Summon Honor Hold Gryphon Brigadier, South'),
-(@ENTRY*100,9,7,0,0,0,100,0,0,0,0,0,11,36302,0,0,0,0,0,1,0,0,0,0,0,0,0, ' Summon Honor Hold Gryphon Brigadier, South'),
-(@ENTRY*100,9,8,0,0,0,100,0,3000,3000,0,0,45,0,4,0,0,0,0,19,@ENTRY1,0,0,0,0,0,0, ' Summon Honor Hold Gryphon Brigadier, South'),
--- Script 1
-((@ENTRY*100)+1,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, 'Reset data 0'),
-((@ENTRY*100)+1,9,1,0,0,0,100,0,0,0,0,0,11,39106,0,0,0,0,0,1,0,0,0,0,0,0,0, ' Summon Honor Hold Gryphon Brigadier, North'),
-((@ENTRY*100)+1,9,2,0,0,0,100,0,3000,3000,0,0,45,0,1,0,0,0,0,19,@ENTRY2,0,0,0,0,0,0, ' Summon Honor Hold Gryphon Brigadier, North'),
-((@ENTRY*100)+1,9,3,0,0,0,100,0,0,0,0,0,11,39106,0,0,0,0,0,1,0,0,0,0,0,0,0, ' Summon Honor Hold Gryphon Brigadier, North'),
-((@ENTRY*100)+1,9,4,0,0,0,100,0,3000,3000,0,0,45,0,2,0,0,0,0,19,@ENTRY2,0,0,0,0,0,0, ' Summon Honor Hold Gryphon Brigadier, North'),
-((@ENTRY*100)+1,9,5,0,0,0,100,0,0,0,0,0,11,39106,0,0,0,0,0,1,0,0,0,0,0,0,0, ' Summon Honor Hold Gryphon Brigadier, North'),
-((@ENTRY*100)+1,9,6,0,0,0,100,0,3000,3000,0,0,45,0,3,0,0,0,0,19,@ENTRY2,0,0,0,0,0,0, ' Summon Honor Hold Gryphon Brigadier, North'),
-((@ENTRY*100)+1,9,7,0,0,0,100,0,0,0,0,0,11,39106,0,0,0,0,0,1,0,0,0,0,0,0,0, ' Summon Honor Hold Gryphon Brigadier, North'),
-((@ENTRY*100)+1,9,8,0,0,0,100,0,3000,3000,0,0,45,0,3,0,0,0,0,19,@ENTRY2,0,0,0,0,0,0, ' Summon Honor Hold Gryphon Brigadier, North'),
--- Script 2
-((@ENTRY*100)+2,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, 'Reset data 0'),
-((@ENTRY*100)+2,9,1,0,0,0,100,0,0,0,0,0,11,39107,0,0,0,0,0,1,0,0,0,0,0,0,0, ' Summon Honor Hold Gryphon Brigadier, Forge'),
-((@ENTRY*100)+2,9,2,0,0,0,100,0,3000,3000,0,0,45,0,1,0,0,0,0,19,@ENTRY3,0,0,0,0,0,0, ' Summon Honor Hold Gryphon Brigadier, Forge'),
-((@ENTRY*100)+2,9,3,0,0,0,100,0,0,0,0,0,11,39107,0,0,0,0,0,1,0,0,0,0,0,0,0, ' Summon Honor Hold Gryphon Brigadier, Forge'),
-((@ENTRY*100)+2,9,4,0,0,0,100,0,3000,3000,0,0,45,0,2,0,0,0,0,19,@ENTRY3,0,0,0,0,0,0, ' Summon Honor Hold Gryphon Brigadier, Forge'),
-((@ENTRY*100)+2,9,5,0,0,0,100,0,0,0,0,0,11,39107,0,0,0,0,0,1,0,0,0,0,0,0,0, ' Summon Honor Hold Gryphon Brigadier, Forge'),
-((@ENTRY*100)+2,9,6,0,0,0,100,0,3000,3000,0,0,45,0,3,0,0,0,0,19,@ENTRY3,0,0,0,0,0,0, ' Summon Honor Hold Gryphon Brigadier, Forge'),
-((@ENTRY*100)+2,9,7,0,0,0,100,0,0,0,0,0,11,39107,0,0,0,0,0,1,0,0,0,0,0,0,0, ' Summon Honor Hold Gryphon Brigadier, Forge'),
-((@ENTRY*100)+2,9,8,0,0,0,100,0,3000,3000,0,0,45,0,3,0,0,0,0,19,@ENTRY3,0,0,0,0,0,0, ' Summon Honor Hold Gryphon Brigadier, Forge'),
--- Script 3
-((@ENTRY*100)+3,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, 'Reset data 0'),
-((@ENTRY*100)+3,9,1,0,0,0,100,0,0,0,0,0,11,39108,0,0,0,0,0,1,0,0,0,0,0,0,0, ' Summon Honor Hold Gryphon Brigadier, Foothill'),
-((@ENTRY*100)+3,9,2,0,0,0,100,0,3000,3000,0,0,45,0,1,0,0,0,0,19,@ENTRY4,0,0,0,0,0,0, ' Summon Honor Hold Gryphon Brigadier, Foothill'),
-((@ENTRY*100)+3,9,3,0,0,0,100,0,0,0,0,0,11,39108,0,0,0,0,0,1,0,0,0,0,0,0,0, ' Summon Honor Hold Gryphon Brigadier, Foothill'),
-((@ENTRY*100)+3,9,4,0,0,0,100,0,3000,3000,0,0,45,0,2,0,0,0,0,19,@ENTRY4,0,0,0,0,0,0, ' Summon Honor Hold Gryphon Brigadier, Foothill'),
-((@ENTRY*100)+3,9,5,0,0,0,100,0,0,0,0,0,11,39108,0,0,0,0,0,1,0,0,0,0,0,0,0, ' Summon Honor Hold Gryphon Brigadier, Foothill'),
-((@ENTRY*100)+3,9,6,0,0,0,100,0,3000,3000,0,0,45,0,3,0,0,0,0,19,@ENTRY4,0,0,0,0,0,0, ' Summon Honor Hold Gryphon Brigadier, Foothill'),
-((@ENTRY*100)+3,9,7,0,0,0,100,0,0,0,0,0,11,39108,0,0,0,0,0,1,0,0,0,0,0,0,0, ' Summon Honor Hold Gryphon Brigadier, Foothill'),
-((@ENTRY*100)+3,9,8,0,0,0,100,0,3000,3000,0,0,45,0,1,0,0,0,0,19,@ENTRY4,0,0,0,0,0,0, ' Summon Honor Hold Gryphon Brigadier, Foothill');
-
--- SAI for Honor Hold Gryphon Brigadier, South
-UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY1;
-DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY1;
-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
-(@ENTRY1,0,0,0,11,0,100,0,0,0,0,0,11,36350,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On Spawn - Add aura'),
-(@ENTRY1,0,1,0,38,0,100,0,0,1,0,0,53,1,@ENTRY1*100,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On data set - Start WP movement'),
-(@ENTRY1,0,2,0,38,0,100,0,0,2,0,0,53,1,(@ENTRY1*100)+1,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On data set - Start WP movement'),
-(@ENTRY1,0,3,0,38,0,100,0,0,3,0,0,53,1,(@ENTRY1*100)+2,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On data set - Start WP movement'),
-(@ENTRY1,0,4,0,38,0,100,0,0,4,0,0,53,1,(@ENTRY1*100)+3,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On data set - Start WP movement'),
-(@ENTRY1,0,5,0,40,0,100,0,10,@ENTRY1*100,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On Reach WP - Despawn'),
-(@ENTRY1,0,6,0,40,0,100,0,10,(@ENTRY1*100)+1,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On Reach WP - Despawn'),
-(@ENTRY1,0,7,0,40,0,100,0,11,(@ENTRY1*100)+2,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On Reach WP - Despawn'),
-(@ENTRY1,0,8,0,40,0,100,0,11,(@ENTRY1*100)+3,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On Reach WP - Despawn');
-
--- SAI for Honor Hold Gryphon Brigadier, North
-UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY2;
-DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY2;
-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
-(@ENTRY2,0,0,0,11,0,100,0,0,0,0,0,11,36350,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On Spawn - Add aura'),
-(@ENTRY2,0,1,0,38,0,100,0,0,1,0,0,53,1,@ENTRY2*100,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On data set - Start WP movement'),
-(@ENTRY2,0,2,0,38,0,100,0,0,2,0,0,53,1,(@ENTRY2*100)+1,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On data set - Start WP movement'),
-(@ENTRY2,0,3,0,38,0,100,0,0,3,0,0,53,1,(@ENTRY2*100)+2,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On data set - Start WP movement'),
-(@ENTRY2,0,4,0,38,0,100,0,0,4,0,0,53,1,(@ENTRY2*100)+3,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On data set - Start WP movement'),
-(@ENTRY2,0,5,0,40,0,100,0,12,@ENTRY2*100,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On Reach WP - Despawn'),
-(@ENTRY2,0,6,0,40,0,100,0,11,(@ENTRY2*100)+1,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On Reach WP - Despawn'),
-(@ENTRY2,0,7,0,40,0,100,0,12,(@ENTRY2*100)+2,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On Reach WP - Despawn'),
-(@ENTRY2,0,8,0,40,0,100,0,12,(@ENTRY2*100)+3,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On Reach WP - Despawn');
-
--- SAI for Honor Hold Gryphon Brigadier, Forge
-UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY3;
-DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY3;
-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
-(@ENTRY3,0,0,0,11,0,100,0,0,0,0,0,11,36350,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On Spawn - Add aura'),
-(@ENTRY3,0,1,0,38,0,100,0,0,1,0,0,53,1,@ENTRY3*100,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On data set - Start WP movement'),
-(@ENTRY3,0,2,0,38,0,100,0,0,2,0,0,53,1,(@ENTRY3*100)+1,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On data set - Start WP movement'),
-(@ENTRY3,0,3,0,38,0,100,0,0,3,0,0,53,1,(@ENTRY3*100)+2,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On data set - Start WP movement'),
-(@ENTRY3,0,4,0,38,0,100,0,0,4,0,0,53,1,(@ENTRY3*100)+3,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On data set - Start WP movement'),
-(@ENTRY3,0,5,0,40,0,100,0,13,@ENTRY3*100,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On Reach WP - Despawn'),
-(@ENTRY3,0,6,0,40,0,100,0,13,(@ENTRY3*100)+1,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On Reach WP - Despawn'),
-(@ENTRY3,0,7,0,40,0,100,0,12,(@ENTRY3*100)+2,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On Reach WP - Despawn'),
-(@ENTRY3,0,8,0,40,0,100,0,14,(@ENTRY3*100)+3,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On Reach WP - Despawn');
-
--- SAI for Honor Hold Gryphon Brigadier, Foothill
-UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY4;
-DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY4;
-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
-(@ENTRY4,0,0,0,11,0,100,0,0,0,0,0,11,36350,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On Spawn - Add aura'),
-(@ENTRY4,0,1,0,38,0,100,0,0,1,0,0,53,1,@ENTRY4*100,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On data set - Start WP movement'),
-(@ENTRY4,0,2,0,38,0,100,0,0,2,0,0,53,1,(@ENTRY4*100)+1,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On data set - Start WP movement'),
-(@ENTRY4,0,3,0,38,0,100,0,0,3,0,0,53,1,(@ENTRY4*100)+2,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On data set - Start WP movement'),
-(@ENTRY4,0,4,0,40,0,100,0,15,@ENTRY4*100,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On Reach WP - Despawn'),
-(@ENTRY4,0,5,0,40,0,100,0,15,(@ENTRY4*100)+1,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On Reach WP - Despawn'),
-(@ENTRY4,0,6,0,40,0,100,0,15,(@ENTRY4*100)+2,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Zeth''Gor Quest Credit Marker, They Must Burn, Tower South - On Reach WP - Despawn');
-
--- Honor Hold Gryphon Brigadier, South Pathing
-DELETE FROM `waypoints` WHERE `entry` IN (@ENTRY1*100, (@ENTRY1*100)+1, (@ENTRY1*100)+2, (@ENTRY1*100)+3);
-INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
--- Honor Hold Gryphon Brigadier, South Path 1
-(@ENTRY1*100,1,-1166.146,2232.443,154.4811,'Honor Hold Gryphon Brigadier, South Path 1 WP 1'),
-(@ENTRY1*100,2,-1166.439,2233.399,154.4811,'Honor Hold Gryphon Brigadier, South Path 1 WP 2'),
-(@ENTRY1*100,3,-1162.907,2207.568,140.9076,'Honor Hold Gryphon Brigadier, South Path 1 WP 3'),
-(@ENTRY1*100,4,-1165.149,2160.382,126.1298,'Honor Hold Gryphon Brigadier, South Path 1 WP 4'),
-(@ENTRY1*100,5,-1171.198,2119.914,110.0741,'Honor Hold Gryphon Brigadier, South Path 1 WP 5'),
-(@ENTRY1*100,6,-1152.598,2108.961,101.9074,'Honor Hold Gryphon Brigadier, South Path 1 WP 6'),
-(@ENTRY1*100,7,-1126.18,2129.599,118.6573,'Honor Hold Gryphon Brigadier, South Path 1 WP 7'),
-(@ENTRY1*100,8,-1113.314,2146.836,135.1296,'Honor Hold Gryphon Brigadier, South Path 1 WP 8'),
-(@ENTRY1*100,9,-1105.45,2173.646,171.0185,'Honor Hold Gryphon Brigadier, South Path 1 WP 9'),
-(@ENTRY1*100,10,-1107.9,2202.193,195.935,'Honor Hold Gryphon Brigadier, South Path 1 WP 10'),
--- Honor Hold Gryphon Brigadier, South Path 2
-((@ENTRY1*100)+1,1,-1166.146,2232.443,154.4811,'Honor Hold Gryphon Brigadier, South Path 2 WP 1'),
-((@ENTRY1*100)+1,2,-1166.439,2233.399,154.4811,'Honor Hold Gryphon Brigadier, South Path 2 WP 2'),
-((@ENTRY1*100)+1,3,-1182.963,2208.794,125.3797,'Honor Hold Gryphon Brigadier, South Path 2 WP 3'),
-((@ENTRY1*100)+1,4,-1182.292,2161.906,114.2409,'Honor Hold Gryphon Brigadier, South Path 2 WP 4'),
-((@ENTRY1*100)+1,5,-1175.9,2113.828,105.1853,'Honor Hold Gryphon Brigadier, South Path 2 WP 5'),
-((@ENTRY1*100)+1,6,-1152.598,2108.961,104.5463,'Honor Hold Gryphon Brigadier, South Path 2 WP 6'),
-((@ENTRY1*100)+1,7,-1126.18,2129.599,117.0184,'Honor Hold Gryphon Brigadier, South Path 2 WP 7'),
-((@ENTRY1*100)+1,8,-1097.298,2159.928,136.074,'Honor Hold Gryphon Brigadier, South Path 2 WP 8'),
-((@ENTRY1*100)+1,9,-1084.76,2185.17,157.8796,'Honor Hold Gryphon Brigadier, South Path 2 WP 9'),
-((@ENTRY1*100)+1,10,-1074.359,2208.386,178.1295,'Honor Hold Gryphon Brigadier, South Path 2 WP 10'),
--- Honor Hold Gryphon Brigadier, South Path 3
-((@ENTRY1*100)+2,1,-1166.146,2232.443,154.4811,'Honor Hold Gryphon Brigadier, South Path 3 WP 1'),
-((@ENTRY1*100)+2,2,-1166.439,2233.399,154.4811,'Honor Hold Gryphon Brigadier, South Path 3 WP 2'),
-((@ENTRY1*100)+2,3,-1150.548,2194.858,120.9303,'Honor Hold Gryphon Brigadier, South Path 3 WP 3'),
-((@ENTRY1*100)+2,4,-1151.814,2161.048,110.9858,'Honor Hold Gryphon Brigadier, South Path 3 WP 4'),
-((@ENTRY1*100)+2,5,-1152.937,2131.728,105.9581,'Honor Hold Gryphon Brigadier, South Path 3 WP 5'),
-((@ENTRY1*100)+2,6,-1151.148,2107.598,99.458,'Honor Hold Gryphon Brigadier, South Path 3 WP 6'),
-((@ENTRY1*100)+2,7,-1165.406,2089.037,115.6802,'Honor Hold Gryphon Brigadier, South Path 3 WP 7'),
-((@ENTRY1*100)+2,8,-1174.068,2083.782,125.0691,'Honor Hold Gryphon Brigadier, South Path 3 WP 8'),
-((@ENTRY1*100)+2,9,-1205.327,2083.083,164.097,'Honor Hold Gryphon Brigadier, South Path 3 WP 9'),
-((@ENTRY1*100)+2,10,-1232.793,2084.872,183.4025,'Honor Hold Gryphon Brigadier, South Path 3 WP 10'),
-((@ENTRY1*100)+2,11,-1264.571,2093.127,197.5136,'Honor Hold Gryphon Brigadier, South Path 3 WP 11'),
--- Honor Hold Gryphon Brigadier, South Path 4
-((@ENTRY1*100)+3,1,-1166.146,2232.443,154.4811,'Honor Hold Gryphon Brigadier, South Path 4 WP 1'),
-((@ENTRY1*100)+3,2,-1166.439,2233.399,154.4811,'Honor Hold Gryphon Brigadier, South Path 4 WP 2'),
-((@ENTRY1*100)+3,3,-1152.79,2211.288,120.9303,'Honor Hold Gryphon Brigadier, South Path 4 WP 3'),
-((@ENTRY1*100)+3,4,-1146.584,2178.448,110.9858,'Honor Hold Gryphon Brigadier, South Path 4 WP 4'),
-((@ENTRY1*100)+3,5,-1155.939,2146.783,105.9581,'Honor Hold Gryphon Brigadier, South Path 4 WP 5'),
-((@ENTRY1*100)+3,6,-1151.148,2107.598,99.68026,'Honor Hold Gryphon Brigadier, South Path 4 WP 6'),
-((@ENTRY1*100)+3,7,-1142.785,2094.159,103.5414,'Honor Hold Gryphon Brigadier, South Path 4 WP 7'),
-((@ENTRY1*100)+3,8,-1136.896,2085.377,109.1246,'Honor Hold Gryphon Brigadier, South Path 4 WP 8'),
-((@ENTRY1*100)+3,9,-1119.036,2071.976,118.8748,'Honor Hold Gryphon Brigadier, South Path 4 WP 9'),
-((@ENTRY1*100)+3,10,-1103.594,2050.397,128.2081,'Honor Hold Gryphon Brigadier, South Path 4 WP 10'),
-((@ENTRY1*100)+3,11,-1080.568,2022.377,137.5138,'Honor Hold Gryphon Brigadier, South Path 4 WP 11');
-
--- Honor Hold Gryphon Brigadier, North Pathing
-DELETE FROM `waypoints` WHERE `entry` IN (@ENTRY2*100, (@ENTRY2*100)+1, (@ENTRY2*100)+2, (@ENTRY2*100)+3);
-INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
--- Honor Hold Gryphon Brigadier, North Path 1
-(@ENTRY2*100,1,-739.3298,1922.589,100.9578,'Honor Hold Gryphon Brigadier, North Path 1 WP'),
-(@ENTRY2*100,2,-738.3353,1922.693,100.9578,'Honor Hold Gryphon Brigadier, North Path 1 WP'),
-(@ENTRY2*100,3,-750.1168,1929.094,99.47905,'Honor Hold Gryphon Brigadier, North Path 1 WP'),
-(@ENTRY2*100,4,-774.873,1952.79,99.47905,'Honor Hold Gryphon Brigadier, North Path 1 WP'),
-(@ENTRY2*100,5,-786.8572,1972.59,99.47905,'Honor Hold Gryphon Brigadier, North Path 1 WP'),
-(@ENTRY2*100,6,-799.9429,2000.454,78.95126,'Honor Hold Gryphon Brigadier, North Path 1 WP'),
-(@ENTRY2*100,7,-806.1043,2017.675,73.36794,'Honor Hold Gryphon Brigadier, North Path 1 WP'),
-(@ENTRY2*100,8,-819.2725,2032.523,73.17354,'Honor Hold Gryphon Brigadier, North Path 1 WP'),
-(@ENTRY2*100,9,-831.7571,2046.865,80.61793,'Honor Hold Gryphon Brigadier, North Path 1 WP'),
-(@ENTRY2*100,10,-844.0977,2058.49,83.64579,'Honor Hold Gryphon Brigadier, North Path 1 WP'),
-(@ENTRY2*100,11,-859.0389,2080.072,95.78463,'Honor Hold Gryphon Brigadier, North Path 1 WP'),
-(@ENTRY2*100,12,-883.3383,2095.611,107.5624,'Honor Hold Gryphon Brigadier, North Path 1 WP'),
--- Honor Hold Gryphon Brigadier, North Path 2
-((@ENTRY2*100)+1,1,-739.3298,1922.589,100.9578,'Honor Hold Gryphon Brigadier, North Path 2 WP'),
-((@ENTRY2*100)+1,2,-738.3353,1922.693,100.9578,'Honor Hold Gryphon Brigadier, North Path 2 WP'),
-((@ENTRY2*100)+1,3,-750.1168,1929.094,99.47905,'Honor Hold Gryphon Brigadier, North Path 2 WP'),
-((@ENTRY2*100)+1,4,-773.3017,1941.179,99.47905,'Honor Hold Gryphon Brigadier, North Path 2 WP'),
-((@ENTRY2*100)+1,5,-792.3573,1953.981,99.47905,'Honor Hold Gryphon Brigadier, North Path 2 WP'),
-((@ENTRY2*100)+1,6,-812.7388,1993.078,78.95126,'Honor Hold Gryphon Brigadier, North Path 2 WP'),
-((@ENTRY2*100)+1,7,-823.2512,2008.549,73.36794,'Honor Hold Gryphon Brigadier, North Path 2 WP'),
-((@ENTRY2*100)+1,8,-823.4645,2030.833,73.17354,'Honor Hold Gryphon Brigadier, North Path 2 WP'),
-((@ENTRY2*100)+1,9,-812.5039,2051.152,80.61793,'Honor Hold Gryphon Brigadier, North Path 2 WP'),
-((@ENTRY2*100)+1,10,-775.5078,2066.004,83.64579,'Honor Hold Gryphon Brigadier, North Path 2 WP'),
-((@ENTRY2*100)+1,11,-728.4387,2072.975,87.72904,'Honor Hold Gryphon Brigadier, North Path 2 WP'),
--- Honor Hold Gryphon Brigadier, North Path 3
-((@ENTRY2*100)+2,1,-739.3298,1922.589,100.9578,'Honor Hold Gryphon Brigadier, North Path 3 WP'),
-((@ENTRY2*100)+2,2,-738.3353,1922.693,100.9578,'Honor Hold Gryphon Brigadier, North Path 3 WP'),
-((@ENTRY2*100)+2,3,-750.1168,1929.094,99.47905,'Honor Hold Gryphon Brigadier, North Path 3 WP'),
-((@ENTRY2*100)+2,4,-773.3017,1941.179,99.47905,'Honor Hold Gryphon Brigadier, North Path 3 WP'),
-((@ENTRY2*100)+2,5,-798.551,1950.061,99.47905,'Honor Hold Gryphon Brigadier, North Path 3 WP'),
-((@ENTRY2*100)+2,6,-822.979,1966.302,78.95126,'Honor Hold Gryphon Brigadier, North Path 3 WP'),
-((@ENTRY2*100)+2,7,-829.1212,1999.823,73.36794,'Honor Hold Gryphon Brigadier, North Path 3 WP'),
-((@ENTRY2*100)+2,8,-823.4645,2030.833,73.17354,'Honor Hold Gryphon Brigadier, North Path 3 WP'),
-((@ENTRY2*100)+2,9,-822.0243,2049.509,80.61793,'Honor Hold Gryphon Brigadier, North Path 3 WP'),
-((@ENTRY2*100)+2,10,-838.6264,2088.113,83.64579,'Honor Hold Gryphon Brigadier, North Path 3 WP'),
-((@ENTRY2*100)+2,11,-857.7249,2123.352,87.72904,'Honor Hold Gryphon Brigadier, North Path 3 WP'),
-((@ENTRY2*100)+2,12,-856.7349,2157.759,99.95123,'Honor Hold Gryphon Brigadier, North Path 3 WP'),
--- Honor Hold Gryphon Brigadier, North Path 4
-((@ENTRY2*100)+3,1,-739.3298,1922.589,100.9578,'Honor Hold Gryphon Brigadier, North Path 4 WP'),
-((@ENTRY2*100)+3,2,-738.3353,1922.693,100.9578,'Honor Hold Gryphon Brigadier, North Path 4 WP'),
-((@ENTRY2*100)+3,3,-750.1168,1929.094,99.47905,'Honor Hold Gryphon Brigadier, North Path 4 WP'),
-((@ENTRY2*100)+3,4,-773.3017,1941.179,99.47905,'Honor Hold Gryphon Brigadier, North Path 4 WP'),
-((@ENTRY2*100)+3,5,-792.3573,1953.981,99.47905,'Honor Hold Gryphon Brigadier, North Path 4 WP'),
-((@ENTRY2*100)+3,6,-812.7388,1993.078,78.95126,'Honor Hold Gryphon Brigadier, North Path 4 WP'),
-((@ENTRY2*100)+3,7,-823.2512,2008.549,73.36794,'Honor Hold Gryphon Brigadier, North Path 4 WP'),
-((@ENTRY2*100)+3,8,-823.4645,2030.833,73.17354,'Honor Hold Gryphon Brigadier, North Path 4 WP'),
-((@ENTRY2*100)+3,9,-812.5039,2051.152,80.61793,'Honor Hold Gryphon Brigadier, North Path 4 WP'),
-((@ENTRY2*100)+3,10,-838.6264,2088.113,83.64579,'Honor Hold Gryphon Brigadier, North Path 4 WP'),
-((@ENTRY2*100)+3,11,-857.7249,2123.352,87.72904,'Honor Hold Gryphon Brigadier, North Path 4 WP'),
-((@ENTRY2*100)+3,12,-891.1043,2149.23,87.72904,'Honor Hold Gryphon Brigadier, North Path 4 WP');
-
--- Honor Hold Gryphon Brigadier, Forge Pathing
-DELETE FROM `waypoints` WHERE `entry` IN (@ENTRY3*100, (@ENTRY3*100)+1, (@ENTRY3*100)+2, (@ENTRY3*100)+3);
-INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
--- Honor Hold Gryphon Brigadier, Forge Path 1
-(@ENTRY3*100,1,-739.3298,1922.589,100.9578,'Honor Hold Gryphon Brigadier, Forge Path 1 WP'),
-(@ENTRY3*100,2,-738.3353,1922.693,100.9578,'Honor Hold Gryphon Brigadier, Forge Path 1 WP'),
-(@ENTRY3*100,3,-750.1168,1929.094,99.47905,'Honor Hold Gryphon Brigadier, Forge Path 1 WP'),
-(@ENTRY3*100,4,-779.0291,1934.054,99.47905,'Honor Hold Gryphon Brigadier, Forge Path 1 WP'),
-(@ENTRY3*100,5,-805.9227,1932.241,104.2291,'Honor Hold Gryphon Brigadier, Forge Path 1 WP'),
-(@ENTRY3*100,6,-837.3495,1926.666,101.0902,'Honor Hold Gryphon Brigadier, Forge Path 1 WP'),
-(@ENTRY3*100,7,-862.7343,1923.357,97.618,'Honor Hold Gryphon Brigadier, Forge Path 1 WP'),
-(@ENTRY3*100,8,-897.9168,1921.757,99.59021,'Honor Hold Gryphon Brigadier, Forge Path 1 WP'),
-(@ENTRY3*100,9,-914.8586,1930.438,97.67357,'Honor Hold Gryphon Brigadier, Forge Path 1 WP'),
-(@ENTRY3*100,10,-932.5103,1940.806,109.0624,'Honor Hold Gryphon Brigadier, Forge Path 1 WP'),
-(@ENTRY3*100,11,-945.1282,1950.602,122.7846,'Honor Hold Gryphon Brigadier, Forge Path 1 WP'),
-(@ENTRY3*100,12,-966.2561,1954.868,135.8124,'Honor Hold Gryphon Brigadier, Forge Path 1 WP'),
-(@ENTRY3*100,13,-993.241,1956.073,157.4512,'Honor Hold Gryphon Brigadier, Forge Path 1 WP'),
--- Honor Hold Gryphon Brigadier, Forge Path 2
-((@ENTRY3*100)+1,1,-739.3298,1922.589,100.9578,'Honor Hold Gryphon Brigadier, Forge Path 2 WP'),
-((@ENTRY3*100)+1,2,-738.3353,1922.693,100.9578,'Honor Hold Gryphon Brigadier, Forge Path 2 WP'),
-((@ENTRY3*100)+1,3,-750.1168,1929.094,99.47905,'Honor Hold Gryphon Brigadier, Forge Path 2 WP'),
-((@ENTRY3*100)+1,4,-780.6625,1927.177,99.47905,'Honor Hold Gryphon Brigadier, Forge Path 2 WP'),
-((@ENTRY3*100)+1,5,-811.2864,1921.429,104.2291,'Honor Hold Gryphon Brigadier, Forge Path 2 WP'),
-((@ENTRY3*100)+1,6,-834.9781,1920.712,101.0902,'Honor Hold Gryphon Brigadier, Forge Path 2 WP'),
-((@ENTRY3*100)+1,7,-866.0516,1916.696,97.618,'Honor Hold Gryphon Brigadier, Forge Path 2 WP'),
-((@ENTRY3*100)+1,8,-895.7596,1922.273,99.59021,'Honor Hold Gryphon Brigadier, Forge Path 2 WP'),
-((@ENTRY3*100)+1,9,-923.1928,1916.771,97.67357,'Honor Hold Gryphon Brigadier, Forge Path 2 WP'),
-((@ENTRY3*100)+1,10,-948.4045,1901.38,98.9791,'Honor Hold Gryphon Brigadier, Forge Path 2 WP'),
-((@ENTRY3*100)+1,11,-966.732,1893.369,110.0068,'Honor Hold Gryphon Brigadier, Forge Path 2 WP'),
-((@ENTRY3*100)+1,12,-989.9695,1893.078,135.8124,'Honor Hold Gryphon Brigadier, Forge Path 2 WP'),
-((@ENTRY3*100)+1,13,-1025.913,1875.034,164.979,'Honor Hold Gryphon Brigadier, Forge Path 2 WP'),
--- Honor Hold Gryphon Brigadier, Forge Path 3
-((@ENTRY3*100)+2,1,-739.3298,1922.589,100.9578,'Honor Hold Gryphon Brigadier, Forge Path 3 WP'),
-((@ENTRY3*100)+2,2,-738.3353,1922.693,100.9578,'Honor Hold Gryphon Brigadier, Forge Path 3 WP'),
-((@ENTRY3*100)+2,3,-750.1168,1929.094,99.47905,'Honor Hold Gryphon Brigadier, Forge Path 3 WP'),
-((@ENTRY3*100)+2,4,-773.3017,1941.179,99.47905,'Honor Hold Gryphon Brigadier, Forge Path 3 WP'),
-((@ENTRY3*100)+2,5,-799.0213,1938.265,104.2291,'Honor Hold Gryphon Brigadier, Forge Path 3 WP'),
-((@ENTRY3*100)+2,6,-821.9453,1929.91,101.0902,'Honor Hold Gryphon Brigadier, Forge Path 3 WP'),
-((@ENTRY3*100)+2,7,-847.0975,1925.127,97.618,'Honor Hold Gryphon Brigadier, Forge Path 3 WP'),
-((@ENTRY3*100)+2,8,-884.1627,1919.391,99.59021,'Honor Hold Gryphon Brigadier, Forge Path 3 WP'),
-((@ENTRY3*100)+2,9,-910.0975,1918.052,97.67357,'Honor Hold Gryphon Brigadier, Forge Path 3 WP'),
-((@ENTRY3*100)+2,10,-931.7395,1901.312,98.9791,'Honor Hold Gryphon Brigadier, Forge Path 3 WP'),
-((@ENTRY3*100)+2,11,-938.8629,1883.565,110.0068,'Honor Hold Gryphon Brigadier, Forge Path 3 WP'),
-((@ENTRY3*100)+2,12,-948.2704,1857.24,135.8124,'Honor Hold Gryphon Brigadier, Forge Path 3 WP'),
--- Honor Hold Gryphon Brigadier, Forge Path 4
-((@ENTRY3*100)+3,1,-739.3298,1922.589,100.9578,'Honor Hold Gryphon Brigadier, Forge Path 4 WP'),
-((@ENTRY3*100)+3,2,-738.3353,1922.693,100.9578,'Honor Hold Gryphon Brigadier, Forge Path 4 WP'),
-((@ENTRY3*100)+3,3,-750.1168,1929.094,99.47905,'Honor Hold Gryphon Brigadier, Forge Path 4 WP'),
-((@ENTRY3*100)+3,4,-773.3017,1941.179,99.47905,'Honor Hold Gryphon Brigadier, Forge Path 4 WP'),
-((@ENTRY3*100)+3,5,-799.0213,1938.265,104.2291,'Honor Hold Gryphon Brigadier, Forge Path 4 WP'),
-((@ENTRY3*100)+3,6,-821.9453,1929.91,101.0902,'Honor Hold Gryphon Brigadier, Forge Path 4 WP'),
-((@ENTRY3*100)+3,7,-847.0975,1925.127,97.618,'Honor Hold Gryphon Brigadier, Forge Path 4 WP'),
-((@ENTRY3*100)+3,8,-884.1627,1919.391,99.59021,'Honor Hold Gryphon Brigadier, Forge Path 4 WP'),
-((@ENTRY3*100)+3,9,-898.5378,1920.82,97.67357,'Honor Hold Gryphon Brigadier, Forge Path 4 WP'),
-((@ENTRY3*100)+3,10,-909.0667,1943.895,98.9791,'Honor Hold Gryphon Brigadier, Forge Path 4 WP'),
-((@ENTRY3*100)+3,11,-882.7237,1983.156,110.0068,'Honor Hold Gryphon Brigadier, Forge Path 4 WP'),
-((@ENTRY3*100)+3,12,-857.6995,1997.67,135.8124,'Honor Hold Gryphon Brigadier, Forge Path 4 WP'),
-((@ENTRY3*100)+3,13,-834.7382,1999.236,151.1734,'Honor Hold Gryphon Brigadier, Forge Path 4 WP'),
-((@ENTRY3*100)+3,14,-797.808,1990.238,154.7012,'Honor Hold Gryphon Brigadier, Forge Path 4 WP');
-
--- Honor Hold Gryphon Brigadier, Foothill Pathing
-DELETE FROM `waypoints` WHERE `entry` IN (@ENTRY4*100, (@ENTRY4*100)+1, (@ENTRY4*100)+2);
-INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
--- Honor Hold Gryphon Brigadier, Foothill Path 1
-(@ENTRY4*100,1,-739.3298,1922.589,100.9578,'Honor Hold Gryphon Brigadier, Foothill Path 1 WP 1'),
-(@ENTRY4*100,2,-738.3353,1922.693,100.9578,'Honor Hold Gryphon Brigadier, Foothill Path 1 WP 2'),
-(@ENTRY4*100,3,-750.1168,1929.094,115.7846,'Honor Hold Gryphon Brigadier, Foothill Path 1 WP 3'),
-(@ENTRY4*100,4,-780.6038,1912.869,111.4513,'Honor Hold Gryphon Brigadier, Foothill Path 1 WP 4'),
-(@ENTRY4*100,5,-812.3557,1903.761,119.8957,'Honor Hold Gryphon Brigadier, Foothill Path 1 WP 5'),
-(@ENTRY4*100,6,-844.3373,1894.094,121.1179,'Honor Hold Gryphon Brigadier, Foothill Path 1 WP 6'),
-(@ENTRY4*100,7,-875.8698,1888.307,134.0069,'Honor Hold Gryphon Brigadier, Foothill Path 1 WP 7'),
-(@ENTRY4*100,8,-908.7481,1889.962,139.368,'Honor Hold Gryphon Brigadier, Foothill Path 1 WP 8'),
-(@ENTRY4*100,9,-936.4296,1891.453,135.5625,'Honor Hold Gryphon Brigadier, Foothill Path 1 WP 9'),
-(@ENTRY4*100,10,-956.9449,1888.206,129.8402,'Honor Hold Gryphon Brigadier, Foothill Path 1 WP 10'),
-(@ENTRY4*100,11,-976.4232,1879.735,128.3126,'Honor Hold Gryphon Brigadier, Foothill Path 1 WP 11'),
-(@ENTRY4*100,12,-999.7429,1861.678,156.9511,'Honor Hold Gryphon Brigadier, Foothill Path 1 WP 12'),
-(@ENTRY4*100,13,-1019.369,1838.22,181.4233,'Honor Hold Gryphon Brigadier, Foothill Path 1 WP 13'),
-(@ENTRY4*100,14,-1015.93,1818.592,198.4232,'Honor Hold Gryphon Brigadier, Foothill Path 1 WP 14'),
-(@ENTRY4*100,15,-1003.392,1791.963,211.84,'Honor Hold Gryphon Brigadier, Foothill Path 1 WP 15'),
--- Honor Hold Gryphon Brigadier, Foothill Path 2
-((@ENTRY4*100)+1,1,-739.3298,1922.589,100.9578,'Honor Hold Gryphon Brigadier, Foothill Path 2 WP 1'),
-((@ENTRY4*100)+1,2,-738.3353,1922.693,100.9578,'Honor Hold Gryphon Brigadier, Foothill Path 2 WP 2'),
-((@ENTRY4*100)+1,3,-750.1168,1929.094,115.7846,'Honor Hold Gryphon Brigadier, Foothill Path 2 WP 3'),
-((@ENTRY4*100)+1,4,-780.6038,1912.869,111.4513,'Honor Hold Gryphon Brigadier, Foothill Path 2 WP 4'),
-((@ENTRY4*100)+1,5,-812.3557,1903.761,119.8957,'Honor Hold Gryphon Brigadier, Foothill Path 2 WP 5'),
-((@ENTRY4*100)+1,6,-844.3373,1894.094,121.1179,'Honor Hold Gryphon Brigadier, Foothill Path 2 WP 6'),
-((@ENTRY4*100)+1,7,-875.8698,1888.307,134.0069,'Honor Hold Gryphon Brigadier, Foothill Path 2 WP 7'),
-((@ENTRY4*100)+1,8,-905.6191,1885.849,139.368,'Honor Hold Gryphon Brigadier, Foothill Path 2 WP 8'),
-((@ENTRY4*100)+1,9,-933.7491,1881.107,135.5625,'Honor Hold Gryphon Brigadier, Foothill Path 2 WP 9'),
-((@ENTRY4*100)+1,10,-957.0587,1876.275,129.8402,'Honor Hold Gryphon Brigadier, Foothill Path 2 WP 10'),
-((@ENTRY4*100)+1,11,-976.4232,1879.735,128.3126,'Honor Hold Gryphon Brigadier, Foothill Path 2 WP 11'),
-((@ENTRY4*100)+1,12,-1001.597,1896.851,136.0901,'Honor Hold Gryphon Brigadier, Foothill Path 2 WP 12'),
-((@ENTRY4*100)+1,13,-1026.942,1912.217,153.8956,'Honor Hold Gryphon Brigadier, Foothill Path 2 WP 13'),
-((@ENTRY4*100)+1,14,-1046.058,1925.075,168.2844,'Honor Hold Gryphon Brigadier, Foothill Path 2 WP 14'),
-((@ENTRY4*100)+1,15,-1065.902,1940.892,183.0622,'Honor Hold Gryphon Brigadier, Foothill Path 2 WP 15'),
--- Honor Hold Gryphon Brigadier, Foothill Path 3
-((@ENTRY4*100)+2,1,-739.3298,1922.589,100.9578,'Honor Hold Gryphon Brigadier, Foothill Path 3 WP 1'),
-((@ENTRY4*100)+2,2,-738.3353,1922.693,100.9578,'Honor Hold Gryphon Brigadier, Foothill Path 3 WP 2'),
-((@ENTRY4*100)+2,3,-750.1168,1929.094,115.7846,'Honor Hold Gryphon Brigadier, Foothill Path 3 WP 3'),
-((@ENTRY4*100)+2,4,-780.6038,1912.869,111.4513,'Honor Hold Gryphon Brigadier, Foothill Path 3 WP 4'),
-((@ENTRY4*100)+2,5,-812.3557,1903.761,119.8957,'Honor Hold Gryphon Brigadier, Foothill Path 3 WP 5'),
-((@ENTRY4*100)+2,6,-852.6487,1887.492,134.7291,'Honor Hold Gryphon Brigadier, Foothill Path 3 WP 6'),
-((@ENTRY4*100)+2,7,-885.8631,1878.916,144.8403,'Honor Hold Gryphon Brigadier, Foothill Path 3 WP 7'),
-((@ENTRY4*100)+2,8,-910.2131,1876.215,149.118,'Honor Hold Gryphon Brigadier, Foothill Path 3 WP 8'),
-((@ENTRY4*100)+2,9,-933.7659,1874.894,145.9792,'Honor Hold Gryphon Brigadier, Foothill Path 3 WP 9'),
-((@ENTRY4*100)+2,10,-957.0587,1876.275,129.8402,'Honor Hold Gryphon Brigadier, Foothill Path 3 WP 10'),
-((@ENTRY4*100)+2,11,-976.4232,1879.735,128.3126,'Honor Hold Gryphon Brigadier, Foothill Path 3 WP 11'),
-((@ENTRY4*100)+2,12,-1003.331,1901.21,136.0901,'Honor Hold Gryphon Brigadier, Foothill Path 3 WP 12'),
-((@ENTRY4*100)+2,13,-1019.146,1920.588,153.8956,'Honor Hold Gryphon Brigadier, Foothill Path 3 WP 13'),
-((@ENTRY4*100)+2,14,-1035.73,1937.606,168.2844,'Honor Hold Gryphon Brigadier, Foothill Path 3 WP 14'),
-((@ENTRY4*100)+2,15,-1055.794,1959.019,183.0622,'Honor Hold Gryphon Brigadier, Foothill Path 3 WP 15');
diff --git a/sql/updates/world/2011_03_25_00_world_creature_template.sql b/sql/updates/world/2011_03_25_00_world_creature_template.sql
new file mode 100644
index 00000000000..75b8c31885f
--- /dev/null
+++ b/sql/updates/world/2011_03_25_00_world_creature_template.sql
@@ -0,0 +1,2 @@
+UPDATE `creature_template` SET `InhabitType`=7 WHERE `flags_extra` & 128; -- Triggers floating
+UPDATE `creature_template` SET `mechanic_immune_mask`=`mechanic_immune_mask`|16|8388608 WHERE `type`=6; -- Mobs undeads should be immune to fear and horror
diff --git a/sql/updates/world/2011_03_25_01_world_gameobjects.sql b/sql/updates/world/2011_03_25_01_world_gameobjects.sql
new file mode 100644
index 00000000000..d2d9c0da5a2
--- /dev/null
+++ b/sql/updates/world/2011_03_25_01_world_gameobjects.sql
@@ -0,0 +1,7 @@
+-- Spawn Tribunal Chest in heroic HoS mode and correct wrong spawnmasks
+SET @GUID = 151790; -- Set by TDB team (need 1)
+UPDATE `gameobject` SET `spawnMask`=1 WHERE `guid`=65564; -- Tribunal Chest non heroic
+DELETE FROM `gameobject` WHERE `id`=193996;
+INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`)VALUES
+(@GUID,193996,599,2,1,880.406,345.164,203.706,0,0,0,0,1,180,0,1); -- Tribunal Chest heroic
+UPDATE `gameobject_template` SET `faction`=94, `flags`=4 /* should be 4 and nothing else (temp) */ WHERE `entry` IN (193996,190586);
diff --git a/sql/updates/world/2011_03_25_02_world_creatures.sql b/sql/updates/world/2011_03_25_02_world_creatures.sql
new file mode 100644
index 00000000000..c6e3f98a9d7
--- /dev/null
+++ b/sql/updates/world/2011_03_25_02_world_creatures.sql
@@ -0,0 +1,11 @@
+-- Arcanimus should not have random movement
+UPDATE `creature` SET `spawndist`=0,`MovementType`=0 WHERE `guid`=96298;
+-- Fixup Big Electromental Flavor
+UPDATE `creature` SET `modelid`=0,`spawndist`=0,`MovementType`=0 WHERE `id`=21757;
+UPDATE `creature_template` SET `InhabitType`=7 WHERE `entry`=21757;
+-- Remove Fizzcrank Airman missspawn
+DELETE FROM `creature` WHERE `guid` IN (117923);
+DELETE FROM `creature_addon` WHERE `guid` IN (117923);
+-- Fixup South Sinkhole, Northeast Sinkhole, Northwest Sinkhole Set as trigger
+UPDATE `creature` SET `modelid`=0 WHERE `id` IN (25664,25665,25666);
+UPDATE `creature_template` SET `InhabitType`=7,`flags_extra`=`flags_extra`|128 WHERE `entry` IN (25664,25665,25666);
diff --git a/sql/updates/world/2011_03_25_03_world_misc.sql b/sql/updates/world/2011_03_25_03_world_misc.sql
new file mode 100644
index 00000000000..03b34e06ace
--- /dev/null
+++ b/sql/updates/world/2011_03_25_03_world_misc.sql
@@ -0,0 +1,47 @@
+-- Pathing for Ol' Sooty Entry: 1225
+SET @NPC := 8877;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-5679.014160,`position_y`=-3185.046875,`position_z`=319.508057 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-5716.181152,-3110.810791,316.686523,0,0,0,100,0),
+(@PATH,2,-5716.187012,-3093.080078,325.600677,0,0,0,100,0),
+(@PATH,3,-5712.214355,-3090.297607,327.738647,0,0,0,100,0),
+(@PATH,4,-5705.484375,-3092.523438,329.362366,0,0,0,100,0),
+(@PATH,5,-5681.826660,-3110.568848,338.121887,0,0,0,100,0),
+(@PATH,6,-5659.498535,-3122.215576,344.336151,0,0,0,100,0),
+(@PATH,7,-5639.585938,-3124.536133,348.404938,0,0,0,100,0),
+(@PATH,8,-5618.112793,-3110.905762,360.618225,0,0,0,100,0),
+(@PATH,9,-5621.486816,-3096.315918,368.247772,0,0,0,100,0),
+(@PATH,10,-5632.212891,-3078.608398,374.990936,0,0,0,100,0),
+(@PATH,11,-5629.793457,-3056.124023,384.465576,0,0,0,100,0),
+(@PATH,12,-5642.278809,-3036.872314,385.471649,0,0,0,100,0),
+(@PATH,13,-5609.369141,-3006.883301,386.288177,0,0,0,100,0),
+(@PATH,14,-5643.634277,-3036.388672,385.531891,0,0,0,100,0),
+(@PATH,15,-5630.174805,-3057.015869,384.385712,0,0,0,100,0),
+(@PATH,16,-5629.840332,-3065.496338,381.129578,0,0,0,100,0),
+(@PATH,17,-5634.866211,-3078.448975,374.489044,0,0,0,100,0),
+(@PATH,18,-5620.416504,-3101.081543,364.819855,0,0,0,100,0),
+(@PATH,19,-5624.629395,-3117.040527,354.493805,0,0,0,100,0),
+(@PATH,20,-5644.949707,-3125.081787,347.271362,0,0,0,100,0),
+(@PATH,21,-5660.741699,-3121.580566,343.975922,0,0,0,100,0),
+(@PATH,22,-5676.210938,-3111.586914,340.021484,0,0,0,100,0),
+(@PATH,23,-5691.895508,-3102.994385,333.646698,0,0,0,100,0),
+(@PATH,24,-5711.662109,-3088.433594,328.761566,0,0,0,100,0),
+(@PATH,25,-5717.663574,-3099.033691,321.686920,0,0,0,100,0),
+(@PATH,26,-5705.214844,-3132.324219,315.837585,0,0,0,100,0),
+(@PATH,27,-5679.014160,-3185.046875,319.508057,0,0,0,100,0);
+
+-- Thargold Ironwing SAI
+SET @ENTRY  := 29154;
+SET @GOSSIP := 9776;
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,1,62,0,100,0,@GOSSIP,0,0,0,11,53335,1,0,0,0,0,7,0,0,0,0,0,0,0, 'Thargold Ironwing - On gossip option select - cast spell'),
+(@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, 'Thargold Ironwing - On gossip option select - close gossip');
+-- Cleanup gossip
+UPDATE `gossip_menu_option` SET `action_script_id`=0 WHERE `menu_id`=@GOSSIP;
+DELETE FROM `gossip_scripts` WHERE `id` IN (977600);
diff --git a/sql/updates/world/2011_03_25_0_world_creature_template.sql b/sql/updates/world/2011_03_25_0_world_creature_template.sql
deleted file mode 100644
index 75b8c31885f..00000000000
--- a/sql/updates/world/2011_03_25_0_world_creature_template.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-UPDATE `creature_template` SET `InhabitType`=7 WHERE `flags_extra` & 128; -- Triggers floating
-UPDATE `creature_template` SET `mechanic_immune_mask`=`mechanic_immune_mask`|16|8388608 WHERE `type`=6; -- Mobs undeads should be immune to fear and horror
diff --git a/sql/updates/world/2011_03_25_1_world_gameobjects.sql b/sql/updates/world/2011_03_25_1_world_gameobjects.sql
deleted file mode 100644
index d2d9c0da5a2..00000000000
--- a/sql/updates/world/2011_03_25_1_world_gameobjects.sql
+++ /dev/null
@@ -1,7 +0,0 @@
--- Spawn Tribunal Chest in heroic HoS mode and correct wrong spawnmasks
-SET @GUID = 151790; -- Set by TDB team (need 1)
-UPDATE `gameobject` SET `spawnMask`=1 WHERE `guid`=65564; -- Tribunal Chest non heroic
-DELETE FROM `gameobject` WHERE `id`=193996;
-INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`)VALUES
-(@GUID,193996,599,2,1,880.406,345.164,203.706,0,0,0,0,1,180,0,1); -- Tribunal Chest heroic
-UPDATE `gameobject_template` SET `faction`=94, `flags`=4 /* should be 4 and nothing else (temp) */ WHERE `entry` IN (193996,190586);
diff --git a/sql/updates/world/2011_03_25_2_world_creatures.sql b/sql/updates/world/2011_03_25_2_world_creatures.sql
deleted file mode 100644
index c6e3f98a9d7..00000000000
--- a/sql/updates/world/2011_03_25_2_world_creatures.sql
+++ /dev/null
@@ -1,11 +0,0 @@
--- Arcanimus should not have random movement
-UPDATE `creature` SET `spawndist`=0,`MovementType`=0 WHERE `guid`=96298;
--- Fixup Big Electromental Flavor
-UPDATE `creature` SET `modelid`=0,`spawndist`=0,`MovementType`=0 WHERE `id`=21757;
-UPDATE `creature_template` SET `InhabitType`=7 WHERE `entry`=21757;
--- Remove Fizzcrank Airman missspawn
-DELETE FROM `creature` WHERE `guid` IN (117923);
-DELETE FROM `creature_addon` WHERE `guid` IN (117923);
--- Fixup South Sinkhole, Northeast Sinkhole, Northwest Sinkhole Set as trigger
-UPDATE `creature` SET `modelid`=0 WHERE `id` IN (25664,25665,25666);
-UPDATE `creature_template` SET `InhabitType`=7,`flags_extra`=`flags_extra`|128 WHERE `entry` IN (25664,25665,25666);
diff --git a/sql/updates/world/2011_03_25_3_world_misc.sql b/sql/updates/world/2011_03_25_3_world_misc.sql
deleted file mode 100644
index 03b34e06ace..00000000000
--- a/sql/updates/world/2011_03_25_3_world_misc.sql
+++ /dev/null
@@ -1,47 +0,0 @@
--- Pathing for Ol' Sooty Entry: 1225
-SET @NPC := 8877;
-SET @PATH := @NPC * 10;
-UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-5679.014160,`position_y`=-3185.046875,`position_z`=319.508057 WHERE `guid`=@NPC;
-DELETE FROM `creature_addon` WHERE `guid`=@NPC;
-INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, '');
-DELETE FROM `waypoint_data` WHERE `id`=@PATH;
-INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
-(@PATH,1,-5716.181152,-3110.810791,316.686523,0,0,0,100,0),
-(@PATH,2,-5716.187012,-3093.080078,325.600677,0,0,0,100,0),
-(@PATH,3,-5712.214355,-3090.297607,327.738647,0,0,0,100,0),
-(@PATH,4,-5705.484375,-3092.523438,329.362366,0,0,0,100,0),
-(@PATH,5,-5681.826660,-3110.568848,338.121887,0,0,0,100,0),
-(@PATH,6,-5659.498535,-3122.215576,344.336151,0,0,0,100,0),
-(@PATH,7,-5639.585938,-3124.536133,348.404938,0,0,0,100,0),
-(@PATH,8,-5618.112793,-3110.905762,360.618225,0,0,0,100,0),
-(@PATH,9,-5621.486816,-3096.315918,368.247772,0,0,0,100,0),
-(@PATH,10,-5632.212891,-3078.608398,374.990936,0,0,0,100,0),
-(@PATH,11,-5629.793457,-3056.124023,384.465576,0,0,0,100,0),
-(@PATH,12,-5642.278809,-3036.872314,385.471649,0,0,0,100,0),
-(@PATH,13,-5609.369141,-3006.883301,386.288177,0,0,0,100,0),
-(@PATH,14,-5643.634277,-3036.388672,385.531891,0,0,0,100,0),
-(@PATH,15,-5630.174805,-3057.015869,384.385712,0,0,0,100,0),
-(@PATH,16,-5629.840332,-3065.496338,381.129578,0,0,0,100,0),
-(@PATH,17,-5634.866211,-3078.448975,374.489044,0,0,0,100,0),
-(@PATH,18,-5620.416504,-3101.081543,364.819855,0,0,0,100,0),
-(@PATH,19,-5624.629395,-3117.040527,354.493805,0,0,0,100,0),
-(@PATH,20,-5644.949707,-3125.081787,347.271362,0,0,0,100,0),
-(@PATH,21,-5660.741699,-3121.580566,343.975922,0,0,0,100,0),
-(@PATH,22,-5676.210938,-3111.586914,340.021484,0,0,0,100,0),
-(@PATH,23,-5691.895508,-3102.994385,333.646698,0,0,0,100,0),
-(@PATH,24,-5711.662109,-3088.433594,328.761566,0,0,0,100,0),
-(@PATH,25,-5717.663574,-3099.033691,321.686920,0,0,0,100,0),
-(@PATH,26,-5705.214844,-3132.324219,315.837585,0,0,0,100,0),
-(@PATH,27,-5679.014160,-3185.046875,319.508057,0,0,0,100,0);
-
--- Thargold Ironwing SAI
-SET @ENTRY  := 29154;
-SET @GOSSIP := 9776;
-UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY;
-DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY;
-INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
-(@ENTRY,0,0,1,62,0,100,0,@GOSSIP,0,0,0,11,53335,1,0,0,0,0,7,0,0,0,0,0,0,0, 'Thargold Ironwing - On gossip option select - cast spell'),
-(@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, 'Thargold Ironwing - On gossip option select - close gossip');
--- Cleanup gossip
-UPDATE `gossip_menu_option` SET `action_script_id`=0 WHERE `menu_id`=@GOSSIP;
-DELETE FROM `gossip_scripts` WHERE `id` IN (977600);
diff --git a/sql/updates/world/2011_03_26_00_world_achievement_criteria_data.sql b/sql/updates/world/2011_03_26_00_world_achievement_criteria_data.sql
new file mode 100644
index 00000000000..ed92b7ea830
--- /dev/null
+++ b/sql/updates/world/2011_03_26_00_world_achievement_criteria_data.sql
@@ -0,0 +1,29 @@
+DELETE FROM `achievement_criteria_data` WHERE `criteria_id` IN (10062,10063,10054,10055,10046,10047,10048,10049,10050,10051,10044,10045);
+INSERT INTO `achievement_criteria_data` (`criteria_id`,`type`,`value1`,`value2`,`ScriptName`) VALUES
+(10062,12,0,0, 'achievement_quick_shave'),
+(10063,12,1,0, 'achievement_quick_shave'),
+(10044,12,0,0, 'achievement_unbroken'),
+(10045,12,1,0, 'achievement_unbroken'),
+(10054,12,0,0, 'achievement_shutout'),
+(10055,12,1,0, 'achievement_shutout'),
+(10046,12,0,0, 'achievement_three_car_garage_chopper'),
+(10047,12,0,0, 'achievement_three_car_garage_siege'),
+(10048,12,0,0, 'achievement_three_car_garage_demolisher'),
+(10049,12,1,0, 'achievement_three_car_garage_chopper'),
+(10050,12,1,0, 'achievement_three_car_garage_siege'),
+(10051,12,1,0, 'achievement_three_car_garage_demolisher'),
+(10062,11,0,0, 'achievement_quick_shave'),
+(10063,11,0,0, 'achievement_quick_shave'),
+(10044,11,0,0, 'achievement_unbroken'),
+(10045,11,0,0, 'achievement_unbroken'),
+(10054,11,0,0, 'achievement_shutout'),
+(10055,11,0,0, 'achievement_shutout'),
+(10046,11,0,0, 'achievement_three_car_garage_chopper'),
+(10047,11,0,0, 'achievement_three_car_garage_siege'),
+(10048,11,0,0, 'achievement_three_car_garage_demolisher'),
+(10049,11,0,0, 'achievement_three_car_garage_chopper'),
+(10050,11,0,0, 'achievement_three_car_garage_siege'),
+(10051,11,0,0, 'achievement_three_car_garage_demolisher');
+
+-- Remove disabled entries
+DELETE FROM `disables` WHERE `sourceType`=4 AND `entry` IN (10044,10045,10046,10047,10048,10049,10050,10051,10054,10055,10062,10063);
diff --git a/sql/updates/world/2011_03_26_00_world_conditions.sql b/sql/updates/world/2011_03_26_00_world_conditions.sql
new file mode 100644
index 00000000000..f276a0f24b2
--- /dev/null
+++ b/sql/updates/world/2011_03_26_00_world_conditions.sql
@@ -0,0 +1,8 @@
+-- conditions for spells used by Malygos
+DELETE FROM `conditions` WHERE `SourceGroup`=0 AND `SourceEntry` IN (56263,55853,56505,56429,56152) AND `ConditionTypeOrReference`=18;
+INSERT INTO `conditions` (SourceTypeOrReferenceId,ConditionTypeOrReference,SourceGroup,SourceEntry,ConditionValue1,ConditionValue2) VALUES 
+(13,18,0,55853,1,30090),
+(13,18,0,56263,1,30090),
+(13,18,0,56505,1,30334),
+(13,18,0,56429,1,30334),
+(13,18,0,56152,1,28859);
diff --git a/sql/updates/world/2011_03_26_00_world_creature_template.sql b/sql/updates/world/2011_03_26_00_world_creature_template.sql
new file mode 100644
index 00000000000..dd2a90833b1
--- /dev/null
+++ b/sql/updates/world/2011_03_26_00_world_creature_template.sql
@@ -0,0 +1,24 @@
+-- vortex trigger
+UPDATE `creature_template` SET `modelid1`=11686,`modelid2`=169,`InhabitType`=5,`unit_flags`=0x02000000,`VehicleId`=214,`flags_extra`=130 WHERE `entry`=30090;
+UPDATE `creature` SET `modelid`=0 WHERE `id`=30090;
+
+-- Portal (Malygos)
+UPDATE `creature_template` SET `InhabitType`=5 WHERE `entry`=30118;
+UPDATE `creature_template` SET `speed_walk`=2.4,`speed_run`=0.857142857 WHERE `entry`=30084;
+
+-- Hover Disk
+UPDATE `creature_template` SET `VehicleId`=224,`faction_A`=35,`faction_H`=35,`InhabitType`=5 WHERE `entry` IN (30234,30248);
+
+-- Surge of Power
+UPDATE `creature_template` SET flags_extra=130 WHERE entry=30334;
+
+-- Wyrmrest Skytalon (Player's Mount)
+UPDATE `creature_template` SET `InhabitType`=5 WHERE `entry`=30161;
+
+-- Alexstrasza the Life-Binder
+UPDATE `creature_template` SET `InhabitType`=5 WHERE `entry`=32295;
+
+-- static Field
+UPDATE `creature_template` SET `flags_extra`=130,`InhabitType`=5 WHERE `entry`=30592;
+
+UPDATE `creature_template` SET `VehicleId`=220,`spell1`=56091,`spell2`=56092,`spell3`=57090,`spell4`=57143,`spell5`=57108,`spell6`=57092,`spell7`=60534 WHERE `entry`=30161;
\ No newline at end of file
diff --git a/sql/updates/world/2011_03_26_00_world_creature_template_addon.sql b/sql/updates/world/2011_03_26_00_world_creature_template_addon.sql
new file mode 100644
index 00000000000..79a24670a8d
--- /dev/null
+++ b/sql/updates/world/2011_03_26_00_world_creature_template_addon.sql
@@ -0,0 +1,2 @@
+DELETE FROM `creature_template_addon` WHERE `entry`=30592;
+INSERT INTO `creature_template_addon` (entry,auras) VALUES (30592,'57428 0');
\ No newline at end of file
diff --git a/sql/updates/world/2011_03_26_00_world_creature_text.sql b/sql/updates/world/2011_03_26_00_world_creature_text.sql
new file mode 100644
index 00000000000..d2adbec16a2
--- /dev/null
+++ b/sql/updates/world/2011_03_26_00_world_creature_text.sql
@@ -0,0 +1,30 @@
+
+DELETE FROM `creature_text` WHERE `entry` IN (32295,28859);
+INSERT INTO `creature_text` (entry,groupid,id,text,type,language,sound,comment) VALUE
+(28859,0,0,'My patience has reached its limit, I will be rid of you!',1,0,14517,'Malygos - Aggro (Phase 1)'),
+(28859,1,0,'Your stupidity has finally caught up to you',1,0,14519,'Malygos - Killed Player (1) (Phase 1)'),
+(28859,1,1,'More artifacts to confiscate...',1,0,14520,'Malygos - Killed Player (2) (Phase 1)'),
+(28859,1,2,'<Laughs> How very... naive...',1,0,14521,'Malygos - Killed Player (3) (Phase 1)'),
+(28859,2,0,'I had hoped to end your lives quickly, but you have proven more... resilient then I had anticipated. Nonetheless, your efforts are in vain, it is you reckless, careless mortals who are to blame for this war! I do what I must... And if it means your... extinction... THEN SO BE IT',1,0,14522,'Malygos - End Phase One'),
+(28859,3,0,'Few have experienced the pain I will now inflict upon you!',1,0,14523,'Malygos - Aggro (Phase 2)'),
+(28859,4,0,'I will teach you IGNORANT children just how little you know of magic...',1,0,14524,'Malygos - Anti-Magic Shell'),
+(28859,5,0,'Watch helplessly as your hopes are swept away...',1,0,14525,'Malygos - Magic Blast'),
+(28859,6,0,'Your energy will be put to good use!',1,0,14526,'Malygos - Killed Player 1 (Phase 2)'),
+(28859,6,1,'I am the spell-weaver! My power is infinite!',1,0,14527,'Malygos - Killed Player 2 (Phase 2)'),
+(28859,6,2,'Your spirit will linger here forever!',1,0,14528,'Malygos - Killed Player 3 (Phase 2)'),
+(28859,7,0,'ENOUGH! If you intend to reclaim Azeroth''s magic, then you shall have it...',1,0,14529,'Malygos - End Phase 2'),
+(28859,8,0,'Now your benefactors make their appearance... But they are too late. The powers contained here are sufficient to destroy the world ten times over! What do you think they will do to you?',1,0,14530,'Intro Phase 3'),
+(28859,9,0,'SUBMIT!',1,0,14531,'Malygos - Aggro (Phase 3)'),
+(28859,10,0,'The powers at work here exceed anything you could possibly imagine!',1,0,14532,'Malygos - Surge of Power'),
+(28859,11,0,'I AM UNSTOPPABLE!',1,0,14533,'Malygos - Buffed by a spark'),
+(28859,12,0,'Alexstrasza! Another of your brood falls!',1,0,14534,'Malygos - Killed Player 1 (Phase 3)'),
+(28859,12,1,'Little more then gnats!',1,0,14535,'Malygos - Killed Player 2 (Phase 3)'),
+(28859,12,2,'Your red allies will share your fate...',1,0,14536,'Malygos - Killed Player 3 (Phase 3)'),
+(28859,13,0,'Still standing? Not for long...',1,0,14537,'Malygos - Spell Casting 1(Phase 3)'),
+(28859,13,1,'Your cause is lost',1,0,14538,'Malygos - Spell Casting 2 (Phase 3)'),
+(28859,13,2,'Your fragile mind will be shattered!',1,0,14539,'Malygos - Spell Casting 3 (Phase 3)'),
+(28859,14,0,'Unthinkable! The mortals will destroy... everything... my sister... what have you...',1,0,0,'Malygos - Death'),
+(32295,0,0,'I did what I had to, brother. You gave me no alternative.',1,0,0,'Alexstrasza - Yell One'),
+(32295,1,0,'And so ends the Nexus War.',1,0,0,'Alexstrasza - Yell Two'),
+(32295,2,0,'This resolution pains me deeply, but the destruction, the monumental loss of life had to end. Regardless of Malygos'' recent transgressions, I will mourn his loss. He was once a guardian, a protector. This day, one of the world''s mightiest has fallen.',1,0,0,'Alexstrasza - Yell Three'),
+(32295,3,0,'The red dragonflight will take on the burden of mending the devastation wrought on Azeroth. Return home to your people and rest. Tomorrow will bring you new challenges, and you must be ready to face them. Life... goes on.',1,0,0,'Alexstrasza - Yell Four');
diff --git a/sql/updates/world/2011_03_26_00_world_gameobject.sql b/sql/updates/world/2011_03_26_00_world_gameobject.sql
new file mode 100644
index 00000000000..1d587b199a8
--- /dev/null
+++ b/sql/updates/world/2011_03_26_00_world_gameobject.sql
@@ -0,0 +1,9 @@
+-- Spawning Focusing Iris
+DELETE FROM `gameobject` WHERE `id`=193958;
+INSERT INTO `gameobject` (guid,id,map,spawnMask,phaseMask,position_x,position_y,position_z,orientation,rotation0,rotation1,rotation2,rotation3,spawntimesecs,animprogress,state) VALUES 
+(151791,193958,616,1,1,754.2546,1301.71973,266.170319,-1.60570168,0,0,0,0,120,0,1);
+-- Spawning chests
+DELETE FROM `gameobject` WHERE `id` IN (193967,193905);
+INSERT INTO `gameobject` (guid,id,map,spawnMask,phaseMask,position_x,position_y,position_z,orientation,spawntimesecs,animprogress,state) VALUES
+(151792,193905,616,1,1,764.56,1284.63,269,1.82,-604800,100,1), 
+(151793,193967,616,2,1,764.56,1284.63,269,1.82,-604800,100,1);
\ No newline at end of file
diff --git a/sql/updates/world/2011_03_26_00_world_npc_spellclick_spells.sql b/sql/updates/world/2011_03_26_00_world_npc_spellclick_spells.sql
new file mode 100644
index 00000000000..61ace8c0877
--- /dev/null
+++ b/sql/updates/world/2011_03_26_00_world_npc_spellclick_spells.sql
@@ -0,0 +1,5 @@
+-- Hover Disk
+DELETE FROM `npc_spellclick_spells` WHERE `npc_entry` IN (30248,30234);
+INSERT INTO `npc_spellclick_spells` (npc_entry,spell_id,quest_start,quest_end,cast_flags) VALUES 
+(30234,61421,0,0,0),
+(30248,61421,0,0,0);
diff --git a/sql/updates/world/2011_03_26_00_world_scriptname.sql b/sql/updates/world/2011_03_26_00_world_scriptname.sql
new file mode 100644
index 00000000000..c849a870155
--- /dev/null
+++ b/sql/updates/world/2011_03_26_00_world_scriptname.sql
@@ -0,0 +1,15 @@
+DELETE FROM `instance_template` WHERE `map`=616;
+INSERT INTO `instance_template` (map,parent,script) VALUES (616,571,'instance_eye_of_eternity');
+
+UPDATE `creature_template` SET `ScriptName`='boss_malygos' WHERE `entry`=28859;
+UPDATE `creature_template` SET `ScriptName`='npc_power_spark' WHERE `entry`=30084;
+UPDATE `creature_template` SET `ScriptName`='npc_portal_eoe' WHERE `entry`=30118;
+UPDATE `creature_template` SET `ScriptName`='npc_hover_disk' WHERE `entry` IN (30234,30248);
+UPDATE `creature_template` SET `ScriptName`='npc_arcane_overload' WHERE `entry`=30282;
+UPDATE `creature_template` SET `ScriptName`='npc_wyrmrest_skytalon' WHERE `entry`=30161;
+UPDATE `creature_template` SET `ScriptName`='npc_alexstrasza_eoe' WHERE `entry`=32295;
+
+DELETE FROM `spell_script_names` WHERE `spell_id`=56105;
+INSERT INTO `spell_script_names` VALUES (56105,'spell_malygos_vortex_dummy');
+DELETE FROM `spell_script_names` WHERE `spell_id`=55873;
+INSERT INTO `spell_script_names` VALUES (55873,'spell_malygos_vortex_visual');
\ No newline at end of file
diff --git a/sql/updates/world/2011_03_26_00_world_smart_scripts.sql b/sql/updates/world/2011_03_26_00_world_smart_scripts.sql
new file mode 100644
index 00000000000..3f5431cd39a
--- /dev/null
+++ b/sql/updates/world/2011_03_26_00_world_smart_scripts.sql
@@ -0,0 +1,11 @@
+-- Scripts for Nexus Lord and Scion of Eternity
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry` IN (30249,30245);
+DELETE FROM `smart_scripts` WHERE (`entryorguid`=30249 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 
+(30249, 0, 0, 0, 0, 0, 100, 6, 3000, 5000, 4000, 6000, 11, 56397, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 'Scion of Eternity - Cast Arcane Barrage (Random)'),
+(30249, 0, 1, 0, 7, 0, 100, 6, 1, 0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Scion of Eternity - Despawn in EvadeMode');
+DELETE FROM `smart_scripts` WHERE (`entryorguid`=30245 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 
+(30245, 0, 0, 0, 0, 0, 100, 6, 7000, 10000, 10000, 15000, 11, 57060, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Nexus Lord - Cast Haste (Self)'),
+(30245, 0, 1, 0, 0, 0, 100, 6, 5000, 8000, 9000, 12000, 11, 57058, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Nexus Lord - Cast Arcane Shock (Random)'),
+(30245, 0, 2, 0, 7, 0, 100, 6, 0, 0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Nexus Lord - Despawn in EvadeMode');
diff --git a/sql/updates/world/2011_03_26_00_world_vehicle_template_accessory.sql b/sql/updates/world/2011_03_26_00_world_vehicle_template_accessory.sql
new file mode 100644
index 00000000000..a5b0963181a
--- /dev/null
+++ b/sql/updates/world/2011_03_26_00_world_vehicle_template_accessory.sql
@@ -0,0 +1,5 @@
+-- Hover Disk
+DELETE FROM `vehicle_template_accessory` WHERE `entry` IN (30234,30248);
+INSERT INTO `vehicle_template_accessory` (entry,accessory_entry,seat_id,minion,description) VALUES 
+(30234,30245,0,0,'Hover Disk - Nexus Lord'),
+(30248,30249,0,0,'Hover Disk - Scion of Eternity');
\ No newline at end of file
diff --git a/sql/updates/world/2011_03_26_01_world_achievement_criteria_data.sql b/sql/updates/world/2011_03_26_01_world_achievement_criteria_data.sql
new file mode 100644
index 00000000000..0f1d5083f14
--- /dev/null
+++ b/sql/updates/world/2011_03_26_01_world_achievement_criteria_data.sql
@@ -0,0 +1,14 @@
+DELETE FROM `achievement_criteria_data` WHERE `criteria_id` IN (10062,10063,10054,10055,10046,10047,10048,10049,10050,10051,10044,10045) AND `type`!=11;
+INSERT INTO `achievement_criteria_data` (`criteria_id`,`type`,`value1`,`value2`,`ScriptName`) VALUES
+(10062,12,0,0, ''),
+(10063,12,1,0, ''),
+(10044,12,0,0, ''),
+(10045,12,1,0, ''),
+(10054,12,0,0, ''),
+(10055,12,1,0, ''),
+(10046,12,0,0, ''),
+(10047,12,0,0, ''),
+(10048,12,0,0, ''),
+(10049,12,1,0, ''),
+(10050,12,1,0, ''),
+(10051,12,1,0, '');
diff --git a/sql/updates/world/2011_03_26_02_world_spell_linked_spell.sql b/sql/updates/world/2011_03_26_02_world_spell_linked_spell.sql
new file mode 100644
index 00000000000..4a7db38c118
--- /dev/null
+++ b/sql/updates/world/2011_03_26_02_world_spell_linked_spell.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=-57350 AND `spell_effect`=60242 ;
+INSERT INTO `spell_linked_spell` (`spell_trigger`,`spell_effect`,`type`,`comment`) VALUES
+(-57350,60242,0, 'Darkmoon Card: Illusion');
diff --git a/sql/updates/world/2011_03_26_03_world_quest_template.sql b/sql/updates/world/2011_03_26_03_world_quest_template.sql
new file mode 100644
index 00000000000..f5552e51ad5
--- /dev/null
+++ b/sql/updates/world/2011_03_26_03_world_quest_template.sql
@@ -0,0 +1,3 @@
+-- Set Correct Requirements for quest: Once More Unto The Breach, Hero (13104/13105)
+UPDATE `quest_template` SET `SkillOrClassMask`=-32 WHERE `entry`= 13105; -- Death Knight only
+UPDATE `quest_template` SET `SkillOrClassMask`=-1503 WHERE `entry`= 13105; -- Other Classes
diff --git a/sql/updates/world/2011_03_26_03_world_spell_linked_spell.sql b/sql/updates/world/2011_03_26_03_world_spell_linked_spell.sql
new file mode 100644
index 00000000000..caa8e51b9b1
--- /dev/null
+++ b/sql/updates/world/2011_03_26_03_world_spell_linked_spell.sql
@@ -0,0 +1,3 @@
+-- Spell Arcane Barrage
+DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=56397;
+INSERT INTO `spell_linked_spell` (spell_trigger,spell_effect,type,comment) VALUES (56397,63934,1,'Arcane Barrage - Arcane Barrage');
diff --git a/sql/updates/world/2011_03_26_0_world_achievement_criteria_data.sql b/sql/updates/world/2011_03_26_0_world_achievement_criteria_data.sql
deleted file mode 100644
index ed92b7ea830..00000000000
--- a/sql/updates/world/2011_03_26_0_world_achievement_criteria_data.sql
+++ /dev/null
@@ -1,29 +0,0 @@
-DELETE FROM `achievement_criteria_data` WHERE `criteria_id` IN (10062,10063,10054,10055,10046,10047,10048,10049,10050,10051,10044,10045);
-INSERT INTO `achievement_criteria_data` (`criteria_id`,`type`,`value1`,`value2`,`ScriptName`) VALUES
-(10062,12,0,0, 'achievement_quick_shave'),
-(10063,12,1,0, 'achievement_quick_shave'),
-(10044,12,0,0, 'achievement_unbroken'),
-(10045,12,1,0, 'achievement_unbroken'),
-(10054,12,0,0, 'achievement_shutout'),
-(10055,12,1,0, 'achievement_shutout'),
-(10046,12,0,0, 'achievement_three_car_garage_chopper'),
-(10047,12,0,0, 'achievement_three_car_garage_siege'),
-(10048,12,0,0, 'achievement_three_car_garage_demolisher'),
-(10049,12,1,0, 'achievement_three_car_garage_chopper'),
-(10050,12,1,0, 'achievement_three_car_garage_siege'),
-(10051,12,1,0, 'achievement_three_car_garage_demolisher'),
-(10062,11,0,0, 'achievement_quick_shave'),
-(10063,11,0,0, 'achievement_quick_shave'),
-(10044,11,0,0, 'achievement_unbroken'),
-(10045,11,0,0, 'achievement_unbroken'),
-(10054,11,0,0, 'achievement_shutout'),
-(10055,11,0,0, 'achievement_shutout'),
-(10046,11,0,0, 'achievement_three_car_garage_chopper'),
-(10047,11,0,0, 'achievement_three_car_garage_siege'),
-(10048,11,0,0, 'achievement_three_car_garage_demolisher'),
-(10049,11,0,0, 'achievement_three_car_garage_chopper'),
-(10050,11,0,0, 'achievement_three_car_garage_siege'),
-(10051,11,0,0, 'achievement_three_car_garage_demolisher');
-
--- Remove disabled entries
-DELETE FROM `disables` WHERE `sourceType`=4 AND `entry` IN (10044,10045,10046,10047,10048,10049,10050,10051,10054,10055,10062,10063);
diff --git a/sql/updates/world/2011_03_26_0_world_conditions.sql b/sql/updates/world/2011_03_26_0_world_conditions.sql
deleted file mode 100644
index f276a0f24b2..00000000000
--- a/sql/updates/world/2011_03_26_0_world_conditions.sql
+++ /dev/null
@@ -1,8 +0,0 @@
--- conditions for spells used by Malygos
-DELETE FROM `conditions` WHERE `SourceGroup`=0 AND `SourceEntry` IN (56263,55853,56505,56429,56152) AND `ConditionTypeOrReference`=18;
-INSERT INTO `conditions` (SourceTypeOrReferenceId,ConditionTypeOrReference,SourceGroup,SourceEntry,ConditionValue1,ConditionValue2) VALUES 
-(13,18,0,55853,1,30090),
-(13,18,0,56263,1,30090),
-(13,18,0,56505,1,30334),
-(13,18,0,56429,1,30334),
-(13,18,0,56152,1,28859);
diff --git a/sql/updates/world/2011_03_26_0_world_creature_template.sql b/sql/updates/world/2011_03_26_0_world_creature_template.sql
deleted file mode 100644
index dd2a90833b1..00000000000
--- a/sql/updates/world/2011_03_26_0_world_creature_template.sql
+++ /dev/null
@@ -1,24 +0,0 @@
--- vortex trigger
-UPDATE `creature_template` SET `modelid1`=11686,`modelid2`=169,`InhabitType`=5,`unit_flags`=0x02000000,`VehicleId`=214,`flags_extra`=130 WHERE `entry`=30090;
-UPDATE `creature` SET `modelid`=0 WHERE `id`=30090;
-
--- Portal (Malygos)
-UPDATE `creature_template` SET `InhabitType`=5 WHERE `entry`=30118;
-UPDATE `creature_template` SET `speed_walk`=2.4,`speed_run`=0.857142857 WHERE `entry`=30084;
-
--- Hover Disk
-UPDATE `creature_template` SET `VehicleId`=224,`faction_A`=35,`faction_H`=35,`InhabitType`=5 WHERE `entry` IN (30234,30248);
-
--- Surge of Power
-UPDATE `creature_template` SET flags_extra=130 WHERE entry=30334;
-
--- Wyrmrest Skytalon (Player's Mount)
-UPDATE `creature_template` SET `InhabitType`=5 WHERE `entry`=30161;
-
--- Alexstrasza the Life-Binder
-UPDATE `creature_template` SET `InhabitType`=5 WHERE `entry`=32295;
-
--- static Field
-UPDATE `creature_template` SET `flags_extra`=130,`InhabitType`=5 WHERE `entry`=30592;
-
-UPDATE `creature_template` SET `VehicleId`=220,`spell1`=56091,`spell2`=56092,`spell3`=57090,`spell4`=57143,`spell5`=57108,`spell6`=57092,`spell7`=60534 WHERE `entry`=30161;
\ No newline at end of file
diff --git a/sql/updates/world/2011_03_26_0_world_creature_template_addon.sql b/sql/updates/world/2011_03_26_0_world_creature_template_addon.sql
deleted file mode 100644
index 79a24670a8d..00000000000
--- a/sql/updates/world/2011_03_26_0_world_creature_template_addon.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-DELETE FROM `creature_template_addon` WHERE `entry`=30592;
-INSERT INTO `creature_template_addon` (entry,auras) VALUES (30592,'57428 0');
\ No newline at end of file
diff --git a/sql/updates/world/2011_03_26_0_world_creature_text.sql b/sql/updates/world/2011_03_26_0_world_creature_text.sql
deleted file mode 100644
index d2adbec16a2..00000000000
--- a/sql/updates/world/2011_03_26_0_world_creature_text.sql
+++ /dev/null
@@ -1,30 +0,0 @@
-
-DELETE FROM `creature_text` WHERE `entry` IN (32295,28859);
-INSERT INTO `creature_text` (entry,groupid,id,text,type,language,sound,comment) VALUE
-(28859,0,0,'My patience has reached its limit, I will be rid of you!',1,0,14517,'Malygos - Aggro (Phase 1)'),
-(28859,1,0,'Your stupidity has finally caught up to you',1,0,14519,'Malygos - Killed Player (1) (Phase 1)'),
-(28859,1,1,'More artifacts to confiscate...',1,0,14520,'Malygos - Killed Player (2) (Phase 1)'),
-(28859,1,2,'<Laughs> How very... naive...',1,0,14521,'Malygos - Killed Player (3) (Phase 1)'),
-(28859,2,0,'I had hoped to end your lives quickly, but you have proven more... resilient then I had anticipated. Nonetheless, your efforts are in vain, it is you reckless, careless mortals who are to blame for this war! I do what I must... And if it means your... extinction... THEN SO BE IT',1,0,14522,'Malygos - End Phase One'),
-(28859,3,0,'Few have experienced the pain I will now inflict upon you!',1,0,14523,'Malygos - Aggro (Phase 2)'),
-(28859,4,0,'I will teach you IGNORANT children just how little you know of magic...',1,0,14524,'Malygos - Anti-Magic Shell'),
-(28859,5,0,'Watch helplessly as your hopes are swept away...',1,0,14525,'Malygos - Magic Blast'),
-(28859,6,0,'Your energy will be put to good use!',1,0,14526,'Malygos - Killed Player 1 (Phase 2)'),
-(28859,6,1,'I am the spell-weaver! My power is infinite!',1,0,14527,'Malygos - Killed Player 2 (Phase 2)'),
-(28859,6,2,'Your spirit will linger here forever!',1,0,14528,'Malygos - Killed Player 3 (Phase 2)'),
-(28859,7,0,'ENOUGH! If you intend to reclaim Azeroth''s magic, then you shall have it...',1,0,14529,'Malygos - End Phase 2'),
-(28859,8,0,'Now your benefactors make their appearance... But they are too late. The powers contained here are sufficient to destroy the world ten times over! What do you think they will do to you?',1,0,14530,'Intro Phase 3'),
-(28859,9,0,'SUBMIT!',1,0,14531,'Malygos - Aggro (Phase 3)'),
-(28859,10,0,'The powers at work here exceed anything you could possibly imagine!',1,0,14532,'Malygos - Surge of Power'),
-(28859,11,0,'I AM UNSTOPPABLE!',1,0,14533,'Malygos - Buffed by a spark'),
-(28859,12,0,'Alexstrasza! Another of your brood falls!',1,0,14534,'Malygos - Killed Player 1 (Phase 3)'),
-(28859,12,1,'Little more then gnats!',1,0,14535,'Malygos - Killed Player 2 (Phase 3)'),
-(28859,12,2,'Your red allies will share your fate...',1,0,14536,'Malygos - Killed Player 3 (Phase 3)'),
-(28859,13,0,'Still standing? Not for long...',1,0,14537,'Malygos - Spell Casting 1(Phase 3)'),
-(28859,13,1,'Your cause is lost',1,0,14538,'Malygos - Spell Casting 2 (Phase 3)'),
-(28859,13,2,'Your fragile mind will be shattered!',1,0,14539,'Malygos - Spell Casting 3 (Phase 3)'),
-(28859,14,0,'Unthinkable! The mortals will destroy... everything... my sister... what have you...',1,0,0,'Malygos - Death'),
-(32295,0,0,'I did what I had to, brother. You gave me no alternative.',1,0,0,'Alexstrasza - Yell One'),
-(32295,1,0,'And so ends the Nexus War.',1,0,0,'Alexstrasza - Yell Two'),
-(32295,2,0,'This resolution pains me deeply, but the destruction, the monumental loss of life had to end. Regardless of Malygos'' recent transgressions, I will mourn his loss. He was once a guardian, a protector. This day, one of the world''s mightiest has fallen.',1,0,0,'Alexstrasza - Yell Three'),
-(32295,3,0,'The red dragonflight will take on the burden of mending the devastation wrought on Azeroth. Return home to your people and rest. Tomorrow will bring you new challenges, and you must be ready to face them. Life... goes on.',1,0,0,'Alexstrasza - Yell Four');
diff --git a/sql/updates/world/2011_03_26_0_world_gameobject.sql b/sql/updates/world/2011_03_26_0_world_gameobject.sql
deleted file mode 100644
index 1d587b199a8..00000000000
--- a/sql/updates/world/2011_03_26_0_world_gameobject.sql
+++ /dev/null
@@ -1,9 +0,0 @@
--- Spawning Focusing Iris
-DELETE FROM `gameobject` WHERE `id`=193958;
-INSERT INTO `gameobject` (guid,id,map,spawnMask,phaseMask,position_x,position_y,position_z,orientation,rotation0,rotation1,rotation2,rotation3,spawntimesecs,animprogress,state) VALUES 
-(151791,193958,616,1,1,754.2546,1301.71973,266.170319,-1.60570168,0,0,0,0,120,0,1);
--- Spawning chests
-DELETE FROM `gameobject` WHERE `id` IN (193967,193905);
-INSERT INTO `gameobject` (guid,id,map,spawnMask,phaseMask,position_x,position_y,position_z,orientation,spawntimesecs,animprogress,state) VALUES
-(151792,193905,616,1,1,764.56,1284.63,269,1.82,-604800,100,1), 
-(151793,193967,616,2,1,764.56,1284.63,269,1.82,-604800,100,1);
\ No newline at end of file
diff --git a/sql/updates/world/2011_03_26_0_world_npc_spellclick_spells.sql b/sql/updates/world/2011_03_26_0_world_npc_spellclick_spells.sql
deleted file mode 100644
index 61ace8c0877..00000000000
--- a/sql/updates/world/2011_03_26_0_world_npc_spellclick_spells.sql
+++ /dev/null
@@ -1,5 +0,0 @@
--- Hover Disk
-DELETE FROM `npc_spellclick_spells` WHERE `npc_entry` IN (30248,30234);
-INSERT INTO `npc_spellclick_spells` (npc_entry,spell_id,quest_start,quest_end,cast_flags) VALUES 
-(30234,61421,0,0,0),
-(30248,61421,0,0,0);
diff --git a/sql/updates/world/2011_03_26_0_world_scriptname.sql b/sql/updates/world/2011_03_26_0_world_scriptname.sql
deleted file mode 100644
index c849a870155..00000000000
--- a/sql/updates/world/2011_03_26_0_world_scriptname.sql
+++ /dev/null
@@ -1,15 +0,0 @@
-DELETE FROM `instance_template` WHERE `map`=616;
-INSERT INTO `instance_template` (map,parent,script) VALUES (616,571,'instance_eye_of_eternity');
-
-UPDATE `creature_template` SET `ScriptName`='boss_malygos' WHERE `entry`=28859;
-UPDATE `creature_template` SET `ScriptName`='npc_power_spark' WHERE `entry`=30084;
-UPDATE `creature_template` SET `ScriptName`='npc_portal_eoe' WHERE `entry`=30118;
-UPDATE `creature_template` SET `ScriptName`='npc_hover_disk' WHERE `entry` IN (30234,30248);
-UPDATE `creature_template` SET `ScriptName`='npc_arcane_overload' WHERE `entry`=30282;
-UPDATE `creature_template` SET `ScriptName`='npc_wyrmrest_skytalon' WHERE `entry`=30161;
-UPDATE `creature_template` SET `ScriptName`='npc_alexstrasza_eoe' WHERE `entry`=32295;
-
-DELETE FROM `spell_script_names` WHERE `spell_id`=56105;
-INSERT INTO `spell_script_names` VALUES (56105,'spell_malygos_vortex_dummy');
-DELETE FROM `spell_script_names` WHERE `spell_id`=55873;
-INSERT INTO `spell_script_names` VALUES (55873,'spell_malygos_vortex_visual');
\ No newline at end of file
diff --git a/sql/updates/world/2011_03_26_0_world_smart_scripts.sql b/sql/updates/world/2011_03_26_0_world_smart_scripts.sql
deleted file mode 100644
index 3f5431cd39a..00000000000
--- a/sql/updates/world/2011_03_26_0_world_smart_scripts.sql
+++ /dev/null
@@ -1,11 +0,0 @@
--- Scripts for Nexus Lord and Scion of Eternity
-UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry` IN (30249,30245);
-DELETE FROM `smart_scripts` WHERE (`entryorguid`=30249 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 
-(30249, 0, 0, 0, 0, 0, 100, 6, 3000, 5000, 4000, 6000, 11, 56397, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 'Scion of Eternity - Cast Arcane Barrage (Random)'),
-(30249, 0, 1, 0, 7, 0, 100, 6, 1, 0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Scion of Eternity - Despawn in EvadeMode');
-DELETE FROM `smart_scripts` WHERE (`entryorguid`=30245 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 
-(30245, 0, 0, 0, 0, 0, 100, 6, 7000, 10000, 10000, 15000, 11, 57060, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Nexus Lord - Cast Haste (Self)'),
-(30245, 0, 1, 0, 0, 0, 100, 6, 5000, 8000, 9000, 12000, 11, 57058, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Nexus Lord - Cast Arcane Shock (Random)'),
-(30245, 0, 2, 0, 7, 0, 100, 6, 0, 0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Nexus Lord - Despawn in EvadeMode');
diff --git a/sql/updates/world/2011_03_26_0_world_vehicle_template_accessory.sql b/sql/updates/world/2011_03_26_0_world_vehicle_template_accessory.sql
deleted file mode 100644
index a5b0963181a..00000000000
--- a/sql/updates/world/2011_03_26_0_world_vehicle_template_accessory.sql
+++ /dev/null
@@ -1,5 +0,0 @@
--- Hover Disk
-DELETE FROM `vehicle_template_accessory` WHERE `entry` IN (30234,30248);
-INSERT INTO `vehicle_template_accessory` (entry,accessory_entry,seat_id,minion,description) VALUES 
-(30234,30245,0,0,'Hover Disk - Nexus Lord'),
-(30248,30249,0,0,'Hover Disk - Scion of Eternity');
\ No newline at end of file
diff --git a/sql/updates/world/2011_03_26_1_world_achievement_criteria_data.sql b/sql/updates/world/2011_03_26_1_world_achievement_criteria_data.sql
deleted file mode 100644
index 0f1d5083f14..00000000000
--- a/sql/updates/world/2011_03_26_1_world_achievement_criteria_data.sql
+++ /dev/null
@@ -1,14 +0,0 @@
-DELETE FROM `achievement_criteria_data` WHERE `criteria_id` IN (10062,10063,10054,10055,10046,10047,10048,10049,10050,10051,10044,10045) AND `type`!=11;
-INSERT INTO `achievement_criteria_data` (`criteria_id`,`type`,`value1`,`value2`,`ScriptName`) VALUES
-(10062,12,0,0, ''),
-(10063,12,1,0, ''),
-(10044,12,0,0, ''),
-(10045,12,1,0, ''),
-(10054,12,0,0, ''),
-(10055,12,1,0, ''),
-(10046,12,0,0, ''),
-(10047,12,0,0, ''),
-(10048,12,0,0, ''),
-(10049,12,1,0, ''),
-(10050,12,1,0, ''),
-(10051,12,1,0, '');
diff --git a/sql/updates/world/2011_03_26_2_world_spell_linked_spell.sql b/sql/updates/world/2011_03_26_2_world_spell_linked_spell.sql
deleted file mode 100644
index 4a7db38c118..00000000000
--- a/sql/updates/world/2011_03_26_2_world_spell_linked_spell.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=-57350 AND `spell_effect`=60242 ;
-INSERT INTO `spell_linked_spell` (`spell_trigger`,`spell_effect`,`type`,`comment`) VALUES
-(-57350,60242,0, 'Darkmoon Card: Illusion');
diff --git a/sql/updates/world/2011_03_26_3_world_quest_template.sql b/sql/updates/world/2011_03_26_3_world_quest_template.sql
deleted file mode 100644
index f5552e51ad5..00000000000
--- a/sql/updates/world/2011_03_26_3_world_quest_template.sql
+++ /dev/null
@@ -1,3 +0,0 @@
--- Set Correct Requirements for quest: Once More Unto The Breach, Hero (13104/13105)
-UPDATE `quest_template` SET `SkillOrClassMask`=-32 WHERE `entry`= 13105; -- Death Knight only
-UPDATE `quest_template` SET `SkillOrClassMask`=-1503 WHERE `entry`= 13105; -- Other Classes
diff --git a/sql/updates/world/2011_03_26_3_world_spell_linked_spell.sql b/sql/updates/world/2011_03_26_3_world_spell_linked_spell.sql
deleted file mode 100644
index caa8e51b9b1..00000000000
--- a/sql/updates/world/2011_03_26_3_world_spell_linked_spell.sql
+++ /dev/null
@@ -1,3 +0,0 @@
--- Spell Arcane Barrage
-DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=56397;
-INSERT INTO `spell_linked_spell` (spell_trigger,spell_effect,type,comment) VALUES (56397,63934,1,'Arcane Barrage - Arcane Barrage');
diff --git a/sql/updates/world/2011_03_27_00_world_quest_template.sql b/sql/updates/world/2011_03_27_00_world_quest_template.sql
new file mode 100644
index 00000000000..929ae4b42b9
--- /dev/null
+++ b/sql/updates/world/2011_03_27_00_world_quest_template.sql
@@ -0,0 +1,3 @@
+-- Set Correct Requirements for quest: Once More Unto The Breach, Hero (13104/13105)
+UPDATE `quest_template` SET `SkillOrClassMask`=-32 WHERE `entry`= 13105; -- Death Knight only
+UPDATE `quest_template` SET `SkillOrClassMask`=-1503 WHERE `entry`= 13104; -- Other Classes
diff --git a/sql/updates/world/2011_03_27_01_world_misc.sql b/sql/updates/world/2011_03_27_01_world_misc.sql
new file mode 100644
index 00000000000..74a001be493
--- /dev/null
+++ b/sql/updates/world/2011_03_27_01_world_misc.sql
@@ -0,0 +1,150 @@
+/* Dalaran Books */
+SET @Gossip = 21255; -- Set by TDB Team (gossip_menu.entry - need 2)
+SET @Guid = 151794; -- Set by TDB Team (gameobject.guid - need 35)
+SET @Pool = 5691; -- Set by TDB Team (pool_template.entry - need 8)
+SET @GoDespawnTime = 10800; -- Three hours
+
+-- Spawns
+DELETE FROM `gameobject` WHERE `id` IN (192708,192706,192871,192905,192710,192886,192869,192880,192895,192713,192889,192890,192894,192884,192866,192891,192872,192881,192709,192883,192651,192888,192711,192653,192887,192652,192865,192874,192868,192870,192885,192867,192882,192707,192896);
+INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES
+-- Introduction
+(@Guid+0,192708,571,1,1,5814.522,582.1118,652.7509,0.244345576,0,0,0,0,@GoDespawnTime,0,1), -- The Schools of Arcane Magic - Introduction
+(@Guid+1,192706,571,1,1,5814.522,582.1118,652.7509,0.244345576,0,0,0,0,@GoDespawnTime,0,1), -- The Worst Mage in Dalaran: A Children's Book
+(@Guid+2,192871,571,1,1,5814.522,582.1118,652.7509,0.244345576,0,0,0,0,@GoDespawnTime,0,1), -- The Archmage Antonidas - Part II
+(@Guid+3,192905,571,1,1,5814.522,582.1118,652.7509,0.244345576,0,0,0,0,@GoDespawnTime,0,1), -- The Old Wizard's Almanac
+-- Conjuration
+(@Guid+4,192710,571,1,1,5812.64,797.223,662.57,-2.86234,0,0,0,0,@GoDespawnTime,0,1), -- The Schools of Arcane Magic - Conjuration
+(@Guid+5,192886,571,1,1,5812.64,797.223,662.57,-2.86234,0,0,0,0,@GoDespawnTime,0,1), -- In Time, the Arcane Corrupts All!
+(@Guid+6,192869,571,1,1,5812.64,797.223,662.57,-2.86234,0,0,0,0,@GoDespawnTime,0,1), -- LAVA BLAST - by Pyroco
+(@Guid+7,192880,571,1,1,5812.64,797.223,662.57,-2.86234,0,0,0,0,@GoDespawnTime,0,1), -- Journal of Archmage Antonidas
+(@Guid+8,192895,571,1,1,5812.64,797.223,662.57,-2.86234,0,0,0,0,@GoDespawnTime,0,1), -- Kirin Tor Monthly (March Issue)
+-- Enchantment
+(@Guid+9,192713,571,1,1,5808.22,691.076,658.715,2.179470,0,0,0,0,@GoDespawnTime,0,1), -- The Schools of Arcane Magic - Enchantment
+(@Guid+10,192889,571,1,1,5808.22,691.076,658.715,2.179470,0,0,0,0,@GoDespawnTime,0,1), -- Kirin Tor Monthly (November Issue)
+(@Guid+11,192890,571,1,1,5808.22,691.076,658.715,2.179470,0,0,0,0,@GoDespawnTime,0,1), -- STAY OUT!!!
+(@Guid+12,192894,571,1,1,5808.22,691.076,658.715,2.179470,0,0,0,0,@GoDespawnTime,0,1), -- Remedial Magic 101: Tips from the Pros
+(@Guid+13,192884,571,1,1,5808.22,691.076,658.715,2.179470,0,0,0,0,@GoDespawnTime,0,1), -- Portals are NOT Garbage Bins!
+-- Necromancy
+(@Guid+14,192866,571,1,1,5850.57,664.754,659.569,-1.93732,0,0,0,0,@GoDespawnTime,0,1), -- The Schools of Arcane Magic - Necromancy
+(@Guid+15,192891,571,1,1,5850.57,664.754,659.569,-1.93732,0,0,0,0,@GoDespawnTime,0,1), -- To Do Today
+(@Guid+16,192872,571,1,1,5850.57,664.754,659.569,-1.93732,0,0,0,0,@GoDespawnTime,0,1), -- The Archmage Antonidas - Part III
+(@Guid+17,192881,571,1,1,5850.57,664.754,659.569,-1.93732,0,0,0,0,@GoDespawnTime,0,1), -- Thinking with Portals - A Memorandum on Proper Portal Usage
+-- Abjuration
+(@Guid+18,192709,571,1,1,5763.5,618.08,650.092,3.49199,0,0,0,0,@GoDespawnTime,0,1), -- The Schools of Arcane Magic - Abjuration
+(@Guid+19,192883,571,1,1,5763.5,618.08,650.092,3.49199,0,0,0,0,@GoDespawnTime,0,1), -- Blinking Rules & Regulations
+(@Guid+20,192651,571,1,1,5763.5,618.08,650.092,3.49199,0,0,0,0,@GoDespawnTime,0,1), -- Damaged Apprentice Journal
+(@Guid+21,192888,571,1,1,5763.5,618.08,650.092,3.49199,0,0,0,0,@GoDespawnTime,0,1), -- Bundle of Romantic Correspondences
+-- Divination
+(@Guid+22,192711,571,1,1,5778.18,832.302,680.268,0.0283899,0,0,0,0,@GoDespawnTime,0,1), -- The Schools of Arcane Magic - Divination
+(@Guid+23,192653,571,1,1,5778.18,832.302,680.268,0.0283899,0,0,0,0,@GoDespawnTime,0,1), -- On the Virtues of Magic
+(@Guid+24,192887,571,1,1,5778.18,832.302,680.268,0.0283899,0,0,0,0,@GoDespawnTime,0,1), -- Losses of the Third War
+(@Guid+25,192652,571,1,1,5778.18,832.302,680.268,0.0283899,0,0,0,0,@GoDespawnTime,0,1), -- Kirin Tor Monthly (May Issue)
+-- Illusion
+(@Guid+26,192865,571,1,1,5776.88,517.79,653.911,0.401425,0,0,0,0,@GoDespawnTime,0,1), -- The Schools of Arcane Magic - Illusion
+(@Guid+27,192874,571,1,1,5776.88,517.79,653.911,0.401425,0,0,0,0,@GoDespawnTime,0,1), -- The Fluffy Bunny
+(@Guid+28,192868,571,1,1,5776.88,517.79,653.911,0.401425,0,0,0,0,@GoDespawnTime,0,1), -- The Dangers of Magic Abuse
+(@Guid+29,192870,571,1,1,5776.88,517.79,653.911,0.401425,0,0,0,0,@GoDespawnTime,0,1), -- The Archmage Antonidas - Part I
+(@Guid+30,192885,571,1,1,5776.88,517.79,653.911,0.401425,0,0,0,0,@GoDespawnTime,0,1), -- The Fate of Apprentice Argoly
+-- Transmutation
+(@Guid+31,192867,571,1,1,5844.61328,664.541,649.3733,-0.3316107,0,0,0,0,@GoDespawnTime,0,1), -- The Schools of Arcane Magic - Transmutation
+(@Guid+32,192882,571,1,1,5844.61328,664.541,649.3733,-0.3316107,0,0,0,0,@GoDespawnTime,0,1), -- Polymorphic Rules & Regulations
+(@Guid+33,192707,571,1,1,5844.61328,664.541,649.3733,-0.3316107,0,0,0,0,@GoDespawnTime,0,1), -- Weathered Diary - Dates from the Third War
+(@Guid+34,192896,571,1,1,5844.61328,664.541,649.3733,-0.3316107,0,0,0,0,@GoDespawnTime,0,1); -- Excerpts from the Journal of Archmage Vargoth
+
+/*
+-- SAI prototype: Despawn after use FIXME: SAI can't despawn GOs
+UPDATE `gameobject_template` SET `AIName`='SmartGameObjectAI' WHERE `entry` IN (xxx);
+DELETE FROM `smart_scripts` WHERE `source_type`=1 AND `id`=0 AND `entryorguid` IN (xxx);
+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
+(xxx,1,0,0,64,0,100,0,0,0,0,0,41,180000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Dalaran Books: Despawn after 3 mins on gossip_hello');
+*/
+
+-- Pooling
+DELETE FROM `pool_template` WHERE `entry` BETWEEN @Pool+0 AND @Pool+7;
+INSERT INTO `pool_template` (`entry`,`max_limit`,`description`) VALUES
+(@Pool+0,1, 'Dalaran Books: Violet Gate'),
+(@Pool+1,1, 'Dalaran Books: Violet Citadel Lower'),
+(@Pool+2,1, 'Dalaran Books: Threads of Fate'),
+(@Pool+3,1, 'Dalaran Books: Ledgerdemain Lounge Upstairs'),
+(@Pool+4,1, 'Dalaran Books: Visitor’s Center'),
+(@Pool+5,1, 'Dalaran Books: Violet Citadel Upstairs'),
+(@Pool+6,1, 'Dalaran Books: Violet Hold'),
+(@Pool+7,1, 'Dalaran Books: Ledgerdemain Lounge Lower');
+
+DELETE FROM `pool_gameobject` WHERE `pool_entry` BETWEEN @Pool+0 AND @Pool+7;
+INSERT INTO `pool_gameobject` (`guid`,`pool_entry`,`chance`,`description`) VALUES
+-- Introduction
+(@Guid+0,@Pool+0,0, 'The Schools of Arcane Magic - Introduction'),
+(@Guid+1,@Pool+0,0, 'The Worst Mage in Dalaran: A Children''s Book'),
+(@Guid+2,@Pool+0,0, 'The Archmage Antonidas - Part II'),
+(@Guid+3,@Pool+0,0, 'The Old Wizard''s Almanac'),
+-- Conjuration
+(@Guid+4,@Pool+1,0, 'The Schools of Arcane Magic - Conjuration'),
+(@Guid+5,@Pool+1,0, 'In Time, the Arcane Corrupts All!'),
+(@Guid+6,@Pool+1,0, 'LAVA BLAST - by Pyroco'),
+(@Guid+7,@Pool+1,0, 'Journal of Archmage Antonidas'),
+(@Guid+8,@Pool+1,0, 'Kirin Tor Monthly (March Issue)'),
+-- Enchantment
+(@Guid+9,@Pool+2,0, 'The Schools of Arcane Magic - Enchantment'),
+(@Guid+10,@Pool+2,0, 'Kirin Tor Monthly (November Issue)'),
+(@Guid+11,@Pool+2,0, 'STAY OUT!!!'),
+(@Guid+12,@Pool+2,0, 'Remedial Magic 101: Tips from the Pros'),
+(@Guid+13,@Pool+2,0, 'Portals are NOT Garbage Bins!'),
+-- Necromancy
+(@Guid+14,@Pool+3,0, 'The Schools of Arcane Magic - Necromancy'),
+(@Guid+15,@Pool+3,0, 'To Do Today'),
+(@Guid+16,@Pool+3,0, 'The Archmage Antonidas - Part III'),
+(@Guid+17,@Pool+3,0, 'Thinking with Portals - A Memorandum on Proper Portal Usage'),
+-- Abjuration
+(@Guid+18,@Pool+4,0, 'The Schools of Arcane Magic - Abjuration'),
+(@Guid+19,@Pool+4,0, 'Blinking Rules & Regulations'),
+(@Guid+20,@Pool+4,0, 'Damaged Apprentice Journal'),
+(@Guid+21,@Pool+4,0, 'Bundle of Romantic Correspondences'),
+-- Divination
+(@Guid+22,@Pool+5,0, 'The Schools of Arcane Magic - Divination'),
+(@Guid+23,@Pool+5,0, 'On the Virtues of Magic'),
+(@Guid+24,@Pool+5,0, 'Losses of the Third War'),
+(@Guid+25,@Pool+5,0, 'Kirin Tor Monthly (May Issue)'),
+-- Illusion
+(@Guid+26,@Pool+6,0, 'The Schools of Arcane Magic - Illusion'),
+(@Guid+27,@Pool+6,0, 'The Fluffy Bunny'),
+(@Guid+28,@Pool+6,0, 'The Dangers of Magic Abuse'),
+(@Guid+29,@Pool+6,0, 'The Archmage Antonidas - Part I'),
+(@Guid+30,@Pool+6,0, 'The Fate of Apprentice Argoly'),
+-- Transmutation
+(@Guid+31,@Pool+7,0, 'The Schools of Arcane Magic - Transmutation'),
+(@Guid+32,@Pool+7,0, 'Polymorphic Rules & Regulations'),
+(@Guid+33,@Pool+7,0, 'Weathered Diary - Dates from the Third War'),
+(@Guid+34,@Pool+7,0, 'Excerpts from the Journal of Archmage Vargoth');
+
+UPDATE `creature_template` SET `gossip_menu_id`=@Gossip+0,`AIName`='SmartAI' WHERE `entry`=19481; -- Archmage Vargoth
+UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=19284; -- Archmage Vargoth
+UPDATE `creature` SET `npcflag`=1 WHERE `guid`=98174; -- Archmage Vargoth
+DELETE FROM `creature_template_addon` WHERE `entry`=19481;
+INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
+(19481,0,0,1,0, NULL); -- Archmage Vargoth
+-- Gossip for Archmage Vargoth
+DELETE FROM `gossip_menu` WHERE `text_id` IN (14192,14194);
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES
+(@Gossip+0,14192),
+(@Gossip+1,14194);
+DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (@Gossip+0,@Gossip+1) 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,0, 'I have a book that might interest you. Would you like to take a look?',1,1,@Gossip+1,0,0,0,0,NULL),
+(@Gossip+1,0,0, 'Thank you! I''ll be sure to notify you if I find anything else.',1,1,0,0,0,0,0,NULL); -- SAI script
+DELETE FROM `creature_template_addon` WHERE `entry`=32643;
+INSERT INTO `creature_template_addon` (`entry`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
+(32643,0,0,0,3,0,'61478 0'); -- companion pet aura (arcane explosions)
+
+DELETE FROM `smart_scripts` WHERE `entryorguid`=-98174 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 
+(-98174,0,0,0,62,0,100,0,@Gossip+1,0,0,0,11,61457,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Archmage Vargoth (Dalaran) - On gossip select cast Kirin Tor Familiar on invoker');
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=@Gossip+0 AND `SourceEntry`=14192;
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=@Gossip+0 AND `SourceEntry`=0;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(14,@Gossip+0,14192,0,4,4395,0,0,0, '', 'Archmage Vargoth - Gossip: zone restriction to Dalaran'),
+(15,@Gossip+0,0,0,4,4395,0,0,0, '', 'Archmage Vargoth - Gossip option: zone restriction to Dalaran'),
+(15,@Gossip+0,0,0,26,44738,1,0,0, '', 'Archmage Vargoth - Gossip option: player should not have item 44738'),
+(15,@Gossip+0,0,0,17,1956,0,0,0, '', 'Archmage Vargoth - Gossip option: player should have achiev 1956');
+-- FIXME: add a gossip option condition: player should not have spell 61472
diff --git a/sql/updates/world/2011_03_27_0_world_quest_template.sql b/sql/updates/world/2011_03_27_0_world_quest_template.sql
deleted file mode 100644
index 929ae4b42b9..00000000000
--- a/sql/updates/world/2011_03_27_0_world_quest_template.sql
+++ /dev/null
@@ -1,3 +0,0 @@
--- Set Correct Requirements for quest: Once More Unto The Breach, Hero (13104/13105)
-UPDATE `quest_template` SET `SkillOrClassMask`=-32 WHERE `entry`= 13105; -- Death Knight only
-UPDATE `quest_template` SET `SkillOrClassMask`=-1503 WHERE `entry`= 13104; -- Other Classes
diff --git a/sql/updates/world/2011_03_27_1_world_misc.sql b/sql/updates/world/2011_03_27_1_world_misc.sql
deleted file mode 100644
index 74a001be493..00000000000
--- a/sql/updates/world/2011_03_27_1_world_misc.sql
+++ /dev/null
@@ -1,150 +0,0 @@
-/* Dalaran Books */
-SET @Gossip = 21255; -- Set by TDB Team (gossip_menu.entry - need 2)
-SET @Guid = 151794; -- Set by TDB Team (gameobject.guid - need 35)
-SET @Pool = 5691; -- Set by TDB Team (pool_template.entry - need 8)
-SET @GoDespawnTime = 10800; -- Three hours
-
--- Spawns
-DELETE FROM `gameobject` WHERE `id` IN (192708,192706,192871,192905,192710,192886,192869,192880,192895,192713,192889,192890,192894,192884,192866,192891,192872,192881,192709,192883,192651,192888,192711,192653,192887,192652,192865,192874,192868,192870,192885,192867,192882,192707,192896);
-INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES
--- Introduction
-(@Guid+0,192708,571,1,1,5814.522,582.1118,652.7509,0.244345576,0,0,0,0,@GoDespawnTime,0,1), -- The Schools of Arcane Magic - Introduction
-(@Guid+1,192706,571,1,1,5814.522,582.1118,652.7509,0.244345576,0,0,0,0,@GoDespawnTime,0,1), -- The Worst Mage in Dalaran: A Children's Book
-(@Guid+2,192871,571,1,1,5814.522,582.1118,652.7509,0.244345576,0,0,0,0,@GoDespawnTime,0,1), -- The Archmage Antonidas - Part II
-(@Guid+3,192905,571,1,1,5814.522,582.1118,652.7509,0.244345576,0,0,0,0,@GoDespawnTime,0,1), -- The Old Wizard's Almanac
--- Conjuration
-(@Guid+4,192710,571,1,1,5812.64,797.223,662.57,-2.86234,0,0,0,0,@GoDespawnTime,0,1), -- The Schools of Arcane Magic - Conjuration
-(@Guid+5,192886,571,1,1,5812.64,797.223,662.57,-2.86234,0,0,0,0,@GoDespawnTime,0,1), -- In Time, the Arcane Corrupts All!
-(@Guid+6,192869,571,1,1,5812.64,797.223,662.57,-2.86234,0,0,0,0,@GoDespawnTime,0,1), -- LAVA BLAST - by Pyroco
-(@Guid+7,192880,571,1,1,5812.64,797.223,662.57,-2.86234,0,0,0,0,@GoDespawnTime,0,1), -- Journal of Archmage Antonidas
-(@Guid+8,192895,571,1,1,5812.64,797.223,662.57,-2.86234,0,0,0,0,@GoDespawnTime,0,1), -- Kirin Tor Monthly (March Issue)
--- Enchantment
-(@Guid+9,192713,571,1,1,5808.22,691.076,658.715,2.179470,0,0,0,0,@GoDespawnTime,0,1), -- The Schools of Arcane Magic - Enchantment
-(@Guid+10,192889,571,1,1,5808.22,691.076,658.715,2.179470,0,0,0,0,@GoDespawnTime,0,1), -- Kirin Tor Monthly (November Issue)
-(@Guid+11,192890,571,1,1,5808.22,691.076,658.715,2.179470,0,0,0,0,@GoDespawnTime,0,1), -- STAY OUT!!!
-(@Guid+12,192894,571,1,1,5808.22,691.076,658.715,2.179470,0,0,0,0,@GoDespawnTime,0,1), -- Remedial Magic 101: Tips from the Pros
-(@Guid+13,192884,571,1,1,5808.22,691.076,658.715,2.179470,0,0,0,0,@GoDespawnTime,0,1), -- Portals are NOT Garbage Bins!
--- Necromancy
-(@Guid+14,192866,571,1,1,5850.57,664.754,659.569,-1.93732,0,0,0,0,@GoDespawnTime,0,1), -- The Schools of Arcane Magic - Necromancy
-(@Guid+15,192891,571,1,1,5850.57,664.754,659.569,-1.93732,0,0,0,0,@GoDespawnTime,0,1), -- To Do Today
-(@Guid+16,192872,571,1,1,5850.57,664.754,659.569,-1.93732,0,0,0,0,@GoDespawnTime,0,1), -- The Archmage Antonidas - Part III
-(@Guid+17,192881,571,1,1,5850.57,664.754,659.569,-1.93732,0,0,0,0,@GoDespawnTime,0,1), -- Thinking with Portals - A Memorandum on Proper Portal Usage
--- Abjuration
-(@Guid+18,192709,571,1,1,5763.5,618.08,650.092,3.49199,0,0,0,0,@GoDespawnTime,0,1), -- The Schools of Arcane Magic - Abjuration
-(@Guid+19,192883,571,1,1,5763.5,618.08,650.092,3.49199,0,0,0,0,@GoDespawnTime,0,1), -- Blinking Rules & Regulations
-(@Guid+20,192651,571,1,1,5763.5,618.08,650.092,3.49199,0,0,0,0,@GoDespawnTime,0,1), -- Damaged Apprentice Journal
-(@Guid+21,192888,571,1,1,5763.5,618.08,650.092,3.49199,0,0,0,0,@GoDespawnTime,0,1), -- Bundle of Romantic Correspondences
--- Divination
-(@Guid+22,192711,571,1,1,5778.18,832.302,680.268,0.0283899,0,0,0,0,@GoDespawnTime,0,1), -- The Schools of Arcane Magic - Divination
-(@Guid+23,192653,571,1,1,5778.18,832.302,680.268,0.0283899,0,0,0,0,@GoDespawnTime,0,1), -- On the Virtues of Magic
-(@Guid+24,192887,571,1,1,5778.18,832.302,680.268,0.0283899,0,0,0,0,@GoDespawnTime,0,1), -- Losses of the Third War
-(@Guid+25,192652,571,1,1,5778.18,832.302,680.268,0.0283899,0,0,0,0,@GoDespawnTime,0,1), -- Kirin Tor Monthly (May Issue)
--- Illusion
-(@Guid+26,192865,571,1,1,5776.88,517.79,653.911,0.401425,0,0,0,0,@GoDespawnTime,0,1), -- The Schools of Arcane Magic - Illusion
-(@Guid+27,192874,571,1,1,5776.88,517.79,653.911,0.401425,0,0,0,0,@GoDespawnTime,0,1), -- The Fluffy Bunny
-(@Guid+28,192868,571,1,1,5776.88,517.79,653.911,0.401425,0,0,0,0,@GoDespawnTime,0,1), -- The Dangers of Magic Abuse
-(@Guid+29,192870,571,1,1,5776.88,517.79,653.911,0.401425,0,0,0,0,@GoDespawnTime,0,1), -- The Archmage Antonidas - Part I
-(@Guid+30,192885,571,1,1,5776.88,517.79,653.911,0.401425,0,0,0,0,@GoDespawnTime,0,1), -- The Fate of Apprentice Argoly
--- Transmutation
-(@Guid+31,192867,571,1,1,5844.61328,664.541,649.3733,-0.3316107,0,0,0,0,@GoDespawnTime,0,1), -- The Schools of Arcane Magic - Transmutation
-(@Guid+32,192882,571,1,1,5844.61328,664.541,649.3733,-0.3316107,0,0,0,0,@GoDespawnTime,0,1), -- Polymorphic Rules & Regulations
-(@Guid+33,192707,571,1,1,5844.61328,664.541,649.3733,-0.3316107,0,0,0,0,@GoDespawnTime,0,1), -- Weathered Diary - Dates from the Third War
-(@Guid+34,192896,571,1,1,5844.61328,664.541,649.3733,-0.3316107,0,0,0,0,@GoDespawnTime,0,1); -- Excerpts from the Journal of Archmage Vargoth
-
-/*
--- SAI prototype: Despawn after use FIXME: SAI can't despawn GOs
-UPDATE `gameobject_template` SET `AIName`='SmartGameObjectAI' WHERE `entry` IN (xxx);
-DELETE FROM `smart_scripts` WHERE `source_type`=1 AND `id`=0 AND `entryorguid` IN (xxx);
-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
-(xxx,1,0,0,64,0,100,0,0,0,0,0,41,180000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Dalaran Books: Despawn after 3 mins on gossip_hello');
-*/
-
--- Pooling
-DELETE FROM `pool_template` WHERE `entry` BETWEEN @Pool+0 AND @Pool+7;
-INSERT INTO `pool_template` (`entry`,`max_limit`,`description`) VALUES
-(@Pool+0,1, 'Dalaran Books: Violet Gate'),
-(@Pool+1,1, 'Dalaran Books: Violet Citadel Lower'),
-(@Pool+2,1, 'Dalaran Books: Threads of Fate'),
-(@Pool+3,1, 'Dalaran Books: Ledgerdemain Lounge Upstairs'),
-(@Pool+4,1, 'Dalaran Books: Visitor’s Center'),
-(@Pool+5,1, 'Dalaran Books: Violet Citadel Upstairs'),
-(@Pool+6,1, 'Dalaran Books: Violet Hold'),
-(@Pool+7,1, 'Dalaran Books: Ledgerdemain Lounge Lower');
-
-DELETE FROM `pool_gameobject` WHERE `pool_entry` BETWEEN @Pool+0 AND @Pool+7;
-INSERT INTO `pool_gameobject` (`guid`,`pool_entry`,`chance`,`description`) VALUES
--- Introduction
-(@Guid+0,@Pool+0,0, 'The Schools of Arcane Magic - Introduction'),
-(@Guid+1,@Pool+0,0, 'The Worst Mage in Dalaran: A Children''s Book'),
-(@Guid+2,@Pool+0,0, 'The Archmage Antonidas - Part II'),
-(@Guid+3,@Pool+0,0, 'The Old Wizard''s Almanac'),
--- Conjuration
-(@Guid+4,@Pool+1,0, 'The Schools of Arcane Magic - Conjuration'),
-(@Guid+5,@Pool+1,0, 'In Time, the Arcane Corrupts All!'),
-(@Guid+6,@Pool+1,0, 'LAVA BLAST - by Pyroco'),
-(@Guid+7,@Pool+1,0, 'Journal of Archmage Antonidas'),
-(@Guid+8,@Pool+1,0, 'Kirin Tor Monthly (March Issue)'),
--- Enchantment
-(@Guid+9,@Pool+2,0, 'The Schools of Arcane Magic - Enchantment'),
-(@Guid+10,@Pool+2,0, 'Kirin Tor Monthly (November Issue)'),
-(@Guid+11,@Pool+2,0, 'STAY OUT!!!'),
-(@Guid+12,@Pool+2,0, 'Remedial Magic 101: Tips from the Pros'),
-(@Guid+13,@Pool+2,0, 'Portals are NOT Garbage Bins!'),
--- Necromancy
-(@Guid+14,@Pool+3,0, 'The Schools of Arcane Magic - Necromancy'),
-(@Guid+15,@Pool+3,0, 'To Do Today'),
-(@Guid+16,@Pool+3,0, 'The Archmage Antonidas - Part III'),
-(@Guid+17,@Pool+3,0, 'Thinking with Portals - A Memorandum on Proper Portal Usage'),
--- Abjuration
-(@Guid+18,@Pool+4,0, 'The Schools of Arcane Magic - Abjuration'),
-(@Guid+19,@Pool+4,0, 'Blinking Rules & Regulations'),
-(@Guid+20,@Pool+4,0, 'Damaged Apprentice Journal'),
-(@Guid+21,@Pool+4,0, 'Bundle of Romantic Correspondences'),
--- Divination
-(@Guid+22,@Pool+5,0, 'The Schools of Arcane Magic - Divination'),
-(@Guid+23,@Pool+5,0, 'On the Virtues of Magic'),
-(@Guid+24,@Pool+5,0, 'Losses of the Third War'),
-(@Guid+25,@Pool+5,0, 'Kirin Tor Monthly (May Issue)'),
--- Illusion
-(@Guid+26,@Pool+6,0, 'The Schools of Arcane Magic - Illusion'),
-(@Guid+27,@Pool+6,0, 'The Fluffy Bunny'),
-(@Guid+28,@Pool+6,0, 'The Dangers of Magic Abuse'),
-(@Guid+29,@Pool+6,0, 'The Archmage Antonidas - Part I'),
-(@Guid+30,@Pool+6,0, 'The Fate of Apprentice Argoly'),
--- Transmutation
-(@Guid+31,@Pool+7,0, 'The Schools of Arcane Magic - Transmutation'),
-(@Guid+32,@Pool+7,0, 'Polymorphic Rules & Regulations'),
-(@Guid+33,@Pool+7,0, 'Weathered Diary - Dates from the Third War'),
-(@Guid+34,@Pool+7,0, 'Excerpts from the Journal of Archmage Vargoth');
-
-UPDATE `creature_template` SET `gossip_menu_id`=@Gossip+0,`AIName`='SmartAI' WHERE `entry`=19481; -- Archmage Vargoth
-UPDATE `creature_model_info` SET `bounding_radius`=0.306,`combat_reach`=1,`gender`=0 WHERE `modelid`=19284; -- Archmage Vargoth
-UPDATE `creature` SET `npcflag`=1 WHERE `guid`=98174; -- Archmage Vargoth
-DELETE FROM `creature_template_addon` WHERE `entry`=19481;
-INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
-(19481,0,0,1,0, NULL); -- Archmage Vargoth
--- Gossip for Archmage Vargoth
-DELETE FROM `gossip_menu` WHERE `text_id` IN (14192,14194);
-INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES
-(@Gossip+0,14192),
-(@Gossip+1,14194);
-DELETE FROM `gossip_menu_option` WHERE `menu_id` IN (@Gossip+0,@Gossip+1) 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,0, 'I have a book that might interest you. Would you like to take a look?',1,1,@Gossip+1,0,0,0,0,NULL),
-(@Gossip+1,0,0, 'Thank you! I''ll be sure to notify you if I find anything else.',1,1,0,0,0,0,0,NULL); -- SAI script
-DELETE FROM `creature_template_addon` WHERE `entry`=32643;
-INSERT INTO `creature_template_addon` (`entry`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
-(32643,0,0,0,3,0,'61478 0'); -- companion pet aura (arcane explosions)
-
-DELETE FROM `smart_scripts` WHERE `entryorguid`=-98174 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 
-(-98174,0,0,0,62,0,100,0,@Gossip+1,0,0,0,11,61457,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Archmage Vargoth (Dalaran) - On gossip select cast Kirin Tor Familiar on invoker');
-
-DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=@Gossip+0 AND `SourceEntry`=14192;
-DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=@Gossip+0 AND `SourceEntry`=0;
-INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
-(14,@Gossip+0,14192,0,4,4395,0,0,0, '', 'Archmage Vargoth - Gossip: zone restriction to Dalaran'),
-(15,@Gossip+0,0,0,4,4395,0,0,0, '', 'Archmage Vargoth - Gossip option: zone restriction to Dalaran'),
-(15,@Gossip+0,0,0,26,44738,1,0,0, '', 'Archmage Vargoth - Gossip option: player should not have item 44738'),
-(15,@Gossip+0,0,0,17,1956,0,0,0, '', 'Archmage Vargoth - Gossip option: player should have achiev 1956');
--- FIXME: add a gossip option condition: player should not have spell 61472
-- 
cgit v1.2.3