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

author: Vincent_Michael <Vincent_Michael@gmx.de> 2013-01-02 22:03:35 +0100
committer: Vincent_Michael <Vincent_Michael@gmx.de> 2013-01-02 22:03:35 +0100
commit: ee2e776fea38313669fba1f5cb008be648daf7fc (patch)
tree: 783681f4692815351e13524a2cb13124ca5a2093
parent: 5bbf7829b21e9a3d7f7c4e068ce779c5975b8c36 (diff)
parent: 57c275f3e176d561cff5823ab1a89054aba033ef (diff)
78 files changed, 646 insertions, 80 deletions
diff --git a/sql/updates/world/2013_01_02_08_world_sai.sql b/sql/updates/world/2013_01_02_08_world_sai.sql
new file mode 100644
index 00000000000..a3f0dde4658
--- /dev/null
+++ b/sql/updates/world/2013_01_02_08_world_sai.sql
@@ -0,0 +1,392 @@
+-- SAI for Mummified Atal''ai
+SET @ENTRY := 5263;
+UPDATE `smart_scripts` SET `event_flags`=2 WHERE `entryorguid`=5263  AND `id`=0;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY AND `id`=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
+(@ENTRY,0,1,0,0,0,100,0,8000,15000,4000,10000,11,16186,32,0,0,0,0,2,0,0,0,0,0,0,0,'Mummified Atal''ai - In Combat - Cast Fevered Plague');
+
+UPDATE `smart_scripts` SET `event_flags`=1 WHERE `entryorguid` IN (824,5243);
+UPDATE `smart_scripts` SET `event_flags`=0 WHERE `entryorguid` IN (5261);
+
+DELETE FROM `linked_respawn` WHERE `guid` IN (83022,83027,83023,83026);
+
+-- Winterskorn Tribesman SAI
+SET @ENTRY := 23661;
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,1,11,0,100,0,0,0,0,0,22,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Tribesman - On Respawn - Set Phase 0"),
+(@ENTRY,0,1,0,61,0,100,0,0,0,0,0,28,43059,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Tribesman - On Respawn - Remove Aura Gruesome, But Necessary: Vrykul On Dismember"),
+(@ENTRY,0,2,0,6,0,100,1,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Tribesman - On Death - Set Phase 1"),
+(@ENTRY,0,3,4,8,1,100,0,43036,0,0,0,11,43059,16,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Tribesman - On Spellhit Dismembering Corpse - Cast Gruesome, But Necessary: Vrykul On Dismember"),
+(@ENTRY,0,4,5,61,1,100,0,0,0,0,0,11,43037,16,0,0,0,0,7,0,0,0,0,0,0,0,"Winterskorn Tribesman - On Spellhit Dismembering Corpse - Cast Gruesome, But Necessary: Kill Credit"),
+(@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,"Winterskorn Tribesman - On Spellhit Dismembering Corpse - Set Phase 2");
+
+-- Winterskorn Woodsman SAI
+SET @ENTRY := 23662;
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,1,11,0,100,0,0,0,0,0,22,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Woodsman - On Respawn - Set Phase 0"),
+(@ENTRY,0,1,0,61,0,100,0,0,0,0,0,28,43059,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Woodsman - On Respawn - Remove Aura Gruesome, But Necessary: Vrykul On Dismember"),
+(@ENTRY,0,2,0,6,0,100,1,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Woodsman - On Death - Set Phase 1"),
+(@ENTRY,0,3,4,8,1,100,0,43036,0,0,0,11,43059,16,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Woodsman - On Spellhit Dismembering Corpse - Cast Gruesome, But Necessary: Vrykul On Dismember"),
+(@ENTRY,0,4,5,61,1,100,0,0,0,0,0,11,43037,16,0,0,0,0,7,0,0,0,0,0,0,0,"Winterskorn Woodsman - On Spellhit Dismembering Corpse - Cast Gruesome, But Necessary: Kill Credit"),
+(@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,"Winterskorn Woodsman - On Spellhit Dismembering Corpse - Set Phase 2");
+
+-- Winterskorn Shield-Maiden SAI
+SET @ENTRY := 23663;
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,1,11,0,100,0,0,0,0,0,22,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Shield-Maiden - On Respawn - Set Phase 0"),
+(@ENTRY,0,1,0,61,0,100,0,0,0,0,0,28,43059,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Shield-Maiden - On Respawn - Remove Aura Gruesome, But Necessary: Vrykul On Dismember"),
+(@ENTRY,0,2,0,6,0,100,1,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Shield-Maiden - On Death - Set Phase 1"),
+(@ENTRY,0,3,4,8,1,100,0,43036,0,0,0,11,43059,16,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Shield-Maiden - On Spellhit Dismembering Corpse - Cast Gruesome, But Necessary: Vrykul On Dismember"),
+(@ENTRY,0,4,5,61,1,100,0,0,0,0,0,11,43037,16,0,0,0,0,7,0,0,0,0,0,0,0,"Winterskorn Shield-Maiden - On Spellhit Dismembering Corpse - Cast Gruesome, But Necessary: Kill Credit"),
+(@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,"Winterskorn Shield-Maiden - On Spellhit Dismembering Corpse - Set Phase 2");
+
+-- Winterskorn Warrior SAI
+SET @ENTRY := 23664;
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,1,11,0,100,0,0,0,0,0,22,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Warrior - On Respawn - Set Phase 0"),
+(@ENTRY,0,1,0,61,0,100,0,0,0,0,0,28,43059,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Warrior - On Respawn - Remove Aura Gruesome, But Necessary: Vrykul On Dismember"),
+(@ENTRY,0,2,0,6,0,100,1,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Warrior - On Death - Set Phase 1"),
+(@ENTRY,0,3,4,8,1,100,0,43036,0,0,0,11,43059,16,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Warrior - On Spellhit Dismembering Corpse - Cast Gruesome, But Necessary: Vrykul On Dismember"),
+(@ENTRY,0,4,5,61,1,100,0,0,0,0,0,11,43037,16,0,0,0,0,7,0,0,0,0,0,0,0,"Winterskorn Warrior - On Spellhit Dismembering Corpse - Cast Gruesome, But Necessary: Kill Credit"),
+(@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,"Winterskorn Warrior - On Spellhit Dismembering Corpse - Set Phase 2");
+
+-- Winterskorn Raider SAI
+SET @ENTRY := 23665;
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,1,11,0,100,0,0,0,0,0,22,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Raider - On Respawn - Set Phase 0"),
+(@ENTRY,0,1,0,61,0,100,0,0,0,0,0,28,43059,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Raider - On Respawn - Remove Aura Gruesome, But Necessary: Vrykul On Dismember"),
+(@ENTRY,0,2,0,6,0,100,1,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Raider - On Death - Set Phase 1"),
+(@ENTRY,0,3,4,8,1,100,0,43036,0,0,0,11,43059,16,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Raider - On Spellhit Dismembering Corpse - Cast Gruesome, But Necessary: Vrykul On Dismember"),
+(@ENTRY,0,4,5,61,1,100,0,0,0,0,0,11,43037,16,0,0,0,0,7,0,0,0,0,0,0,0,"Winterskorn Raider - On Spellhit Dismembering Corpse - Cast Gruesome, But Necessary: Kill Credit"),
+(@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,"Winterskorn Raider - On Spellhit Dismembering Corpse - Set Phase 2");
+
+-- Winterskorn Berserker SAI
+SET @ENTRY := 23666;
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,1,11,0,100,0,0,0,0,0,22,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Berserker - On Respawn - Set Phase 0"),
+(@ENTRY,0,1,0,61,0,100,0,0,0,0,0,28,43059,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Berserker - On Respawn - Remove Aura Gruesome, But Necessary: Vrykul On Dismember"),
+(@ENTRY,0,2,0,6,0,100,1,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Berserker - On Death - Set Phase 1"),
+(@ENTRY,0,3,4,8,1,100,0,43036,0,0,0,11,43059,16,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Berserker - On Spellhit Dismembering Corpse - Cast Gruesome, But Necessary: Vrykul On Dismember"),
+(@ENTRY,0,4,5,61,1,100,0,0,0,0,0,11,43037,16,0,0,0,0,7,0,0,0,0,0,0,0,"Winterskorn Berserker - On Spellhit Dismembering Corpse - Cast Gruesome, But Necessary: Kill Credit"),
+(@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,"Winterskorn Berserker - On Spellhit Dismembering Corpse - Set Phase 2");
+
+-- Winterskorn Rune-Seer SAI
+SET @ENTRY := 23667;
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,1,11,0,100,0,0,0,0,0,22,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Rune-Seer - On Respawn - Set Phase 0"),
+(@ENTRY,0,1,0,61,0,100,0,0,0,0,0,28,43059,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Rune-Seer - On Respawn - Remove Aura Gruesome, But Necessary: Vrykul On Dismember"),
+(@ENTRY,0,2,0,6,0,100,1,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Rune-Seer - On Death - Set Phase 1"),
+(@ENTRY,0,3,4,8,1,100,0,43036,0,0,0,11,43059,16,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Rune-Seer - On Spellhit Dismembering Corpse - Cast Gruesome, But Necessary: Vrykul On Dismember"),
+(@ENTRY,0,4,5,61,1,100,0,0,0,0,0,11,43037,16,0,0,0,0,7,0,0,0,0,0,0,0,"Winterskorn Rune-Seer - On Spellhit Dismembering Corpse - Cast Gruesome, But Necessary: Kill Credit"),
+(@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,"Winterskorn Rune-Seer - On Spellhit Dismembering Corpse - Set Phase 2");
+
+-- Winterskorn Rune-Caster SAI
+SET @ENTRY := 23668;
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,1,11,0,100,0,0,0,0,0,22,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Rune-Caster - On Respawn - Set Phase 0"),
+(@ENTRY,0,1,0,61,0,100,0,0,0,0,0,28,43059,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Rune-Caster - On Respawn - Remove Aura Gruesome, But Necessary: Vrykul On Dismember"),
+(@ENTRY,0,2,0,6,0,100,1,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Rune-Caster - On Death - Set Phase 1"),
+(@ENTRY,0,3,4,8,1,100,0,43036,0,0,0,11,43059,16,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Rune-Caster - On Spellhit Dismembering Corpse - Cast Gruesome, But Necessary: Vrykul On Dismember"),
+(@ENTRY,0,4,5,61,1,100,0,0,0,0,0,11,43037,16,0,0,0,0,7,0,0,0,0,0,0,0,"Winterskorn Rune-Caster - On Spellhit Dismembering Corpse - Cast Gruesome, But Necessary: Kill Credit"),
+(@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,"Winterskorn Rune-Caster - On Spellhit Dismembering Corpse - Set Phase 2");
+
+-- Winterskorn Oracle SAI
+SET @ENTRY := 23669;
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,1,11,0,100,0,0,0,0,0,22,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Oracle - On Respawn - Set Phase 0"),
+(@ENTRY,0,1,0,61,0,100,0,0,0,0,0,28,43059,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Oracle - On Respawn - Remove Aura Gruesome, But Necessary: Vrykul On Dismember"),
+(@ENTRY,0,2,0,6,0,100,1,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Oracle - On Death - Set Phase 1"),
+(@ENTRY,0,3,4,8,1,100,0,43036,0,0,0,11,43059,16,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Oracle - On Spellhit Dismembering Corpse - Cast Gruesome, But Necessary: Vrykul On Dismember"),
+(@ENTRY,0,4,5,61,1,100,0,0,0,0,0,11,43037,16,0,0,0,0,7,0,0,0,0,0,0,0,"Winterskorn Oracle - On Spellhit Dismembering Corpse - Cast Gruesome, But Necessary: Kill Credit"),
+(@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,"Winterskorn Oracle - On Spellhit Dismembering Corpse - Set Phase 2");
+
+-- Illidari Heartseeker SAI
+SET @ENTRY := 23339;
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,1,1,0,100,3,0,0,0,0,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Illidari Heartseeker - Out Of Combat - Allow Combat Movement"),
+(@ENTRY,0,1,0,61,0,100,0,0,0,0,0,20,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Illidari Heartseeker - Out Of Combat - Start Auto Attack"),
+(@ENTRY,0,2,3,4,0,100,3,0,0,0,0,11,41169,0,0,0,0,0,2,0,0,0,0,0,0,0,"Illidari Heartseeker - On Aggro - Cast Shoot"),
+(@ENTRY,0,3,0,61,0,100,0,0,0,0,0,23,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Illidari Heartseeker - On Aggro - Increment Phase"),
+(@ENTRY,0,4,5,9,1,100,2,5,30,3900,5900,11,41169,0,0,0,0,0,2,0,0,0,0,0,0,0,"Illidari Heartseeker - At 5 - 30 Range - Cast Shoot"),
+(@ENTRY,0,5,0,61,1,100,0,0,0,0,0,40,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Illidari Heartseeker - At 5 - 30 Range - Display ranged weapon"),
+(@ENTRY,0,6,7,9,1,100,3,25,80,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Illidari Heartseeker - At 25 - 80 Range - Allow Combat Movement"),
+(@ENTRY,0,7,0,61,1,100,0,0,0,0,0,20,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Illidari Heartseeker - At 25 - 80 Range - Start Auto Attack"),
+(@ENTRY,0,8,9,9,1,100,3,0,5,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Illidari Heartseeker - At 0 - 5 Range - Allow Combat Movement"),
+(@ENTRY,0,9,10,9,1,100,3,0,0,0,0,40,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Illidari Heartseeker - At 0 - 5 Range - Display melee weapon"),
+(@ENTRY,0,10,0,61,1,100,0,0,0,0,0,20,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Illidari Heartseeker - At 0 - 5 Range - Start Auto Attack"),
+(@ENTRY,0,11,12,9,1,100,3,5,15,0,0,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Illidari Heartseeker - At 5 - 15 Range - Allow Combat Movement"),
+(@ENTRY,0,12,0,61,1,100,0,0,0,0,0,20,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Illidari Heartseeker - At 5 - 15 Range - Start Auto Attack"),
+(@ENTRY,0,13,0,0,0,100,2,7000,11000,19000,25000,11,41173,1,0,0,0,0,1,0,0,0,0,0,0,0,"Illidari Heartseeker - In Combat - Cast Rapid Shot"),
+(@ENTRY,0,14,0,0,0,100,2,45000,60000,60000,75000,11,41171,1,0,0,0,0,2,0,0,0,0,0,0,0,"Illidari Heartseeker - In Combat - Cast Skeleton Shot"),
+(@ENTRY,0,15,0,2,0,100,3,0,50,0,0,11,41170,1,0,0,0,0,2,0,0,0,0,0,0,0,"Illidari Heartseeker - At 50% HP - Cast Curse of the Bleakheart"),
+(@ENTRY,0,16,0,7,0,100,0,0,0,0,0,40,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Illidari Heartseeker - On Evade - Display melee weapon");
+
+-- Ashtongue Stormcaller SAI
+SET @ENTRY := 22846;
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,1,0,100,3,0,0,0,0,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ashtongue Stormcaller - Out Of Combat - Allow Combat Movement"),
+(@ENTRY,0,1,0,1,0,100,3,1000,1000,0,0,11,39534,1,0,0,0,0,1,0,0,0,0,0,0,0,"Ashtongue Stormcaller - Out Of Combat - Cast Summon Storm Fury"),
+(@ENTRY,0,2,3,4,0,100,3,0,0,0,0,11,41151,1,0,0,0,0,1,0,0,0,0,0,0,0,"Ashtongue Stormcaller - On Aggro - Cast Lightning Shield"),
+(@ENTRY,0,3,4,61,0,100,0,0,0,0,0,11,20793,0,0,0,0,0,2,0,0,0,0,0,0,0,"Ashtongue Stormcaller - On Aggro - Cast Fireball"),
+(@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,"Ashtongue Stormcaller - On Aggro - Increment Phase"),
+(@ENTRY,0,5,0,9,1,100,2,0,40,3800,5200,11,41184,0,0,0,0,0,2,0,0,0,0,0,0,0,"Ashtongue Stormcaller - At 0 - 40 Range - Cast Lightning Bolt"),
+(@ENTRY,0,6,7,3,1,100,3,0,15,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ashtongue Stormcaller - At 15% Mana - Allow Combat Movement"),
+(@ENTRY,0,7,0,61,1,100,0,0,0,0,0,23,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ashtongue Stormcaller - At 15% Mana - Increment Phase"),
+(@ENTRY,0,8,0,9,1,100,3,35,80,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ashtongue Stormcaller - At 35 - 80 Range - Allow Combat Movement"),
+(@ENTRY,0,9,0,9,1,100,3,5,15,0,0,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ashtongue Stormcaller - At 5 - 15 Range - Allow Combat Movement"),
+(@ENTRY,0,10,0,9,1,100,3,0,5,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ashtongue Stormcaller - At 0 - 5 Range - Allow Combat Movement"),
+(@ENTRY,0,11,0,3,2,100,2,30,100,100,100,23,0,1,0,0,0,0,1,0,0,0,0,0,0,0,"Ashtongue Stormcaller - At Mana +30% - Decrement Phase"),
+(@ENTRY,0,12,0,0,0,100,2,12000,18000,22000,28000,11,41183,1,0,0,0,0,5,0,0,0,0,0,0,0,"Ashtongue Stormcaller - In Combat - Cast Chain Lightning");
+
+-- Sandfury Acolyte SAI
+SET @ENTRY := 8876;
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,11,0,100,3,0,0,0,0,79,15,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sandfury Acolyte - On Respawn - Set Ranged Movement"),
+(@ENTRY,0,1,2,4,0,100,3,0,0,0,0,11,9613,0,0,0,0,0,2,0,0,0,0,0,0,0,"Sandfury Acolyte - On Aggro - Cast Shadow Bolt"),
+(@ENTRY,0,2,0,61,0,100,0,0,0,0,0,23,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sandfury Acolyte - On Aggro - Increment Phase"),
+(@ENTRY,0,3,0,9,1,100,2,0,40,2400,3800,11,9613,0,0,0,0,0,2,0,0,0,0,0,0,0,"Sandfury Acolyte - At 0 - 40 Range - Cast Shadow Bolt"),
+(@ENTRY,0,4,5,3,1,100,2,0,15,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sandfury Acolyte - At 15% Mana - Allow Combat Movement"),
+(@ENTRY,0,5,0,61,1,100,0,0,0,0,0,23,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sandfury Acolyte - At 15% Mana - Increment Phase"),
+(@ENTRY,0,6,0,9,1,100,3,35,80,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sandfury Acolyte - At 35 - 80 Range - Allow Combat Movement"),
+(@ENTRY,0,7,0,9,1,100,3,5,15,0,0,79,15,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sandfury Acolyte - At 5 - 15 Range - Set Ranged Movement"),
+(@ENTRY,0,8,0,9,1,100,3,0,5,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sandfury Acolyte - At 0 - 5 Range - Allow Combat Movement"),
+(@ENTRY,0,9,0,3,2,100,2,30,100,100,100,23,0,1,0,0,0,0,1,0,0,0,0,0,0,0,"Sandfury Acolyte - At 30% Mana - Decrement Phase"),
+(@ENTRY,0,10,0,0,0,100,2,8000,10000,25000,31000,11,11639,1,0,0,0,0,2,0,0,0,0,0,0,0,"Sandfury Acolyte - In Combat - Cast Shadow Word: Pain"),
+(@ENTRY,0,11,0,0,0,100,2,4000,6000,120000,135000,11,11980,1,0,0,0,0,2,0,0,0,0,0,0,0,"Sandfury Acolyte - In Combat - Cast Curse of Weakness"),
+(@ENTRY,0,12,0,0,0,100,2,5000,6000,15000,22000,11,11981,1,0,0,0,0,5,0,0,0,0,0,0,0,"Sandfury Acolyte - In Combat - Cast Mana Burn");
+
+-- Oro Eyegouge SAI
+SET @ENTRY := 7606;
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,11,0,100,3,0,0,0,0,79,15,0,0,0,0,0,1,0,0,0,0,0,0,0,"Oro Eyegouge - On Respawn - Set Ranged Movement"),
+(@ENTRY,0,1,2,4,0,100,3,0,0,0,0,11,12741,0,0,0,0,0,1,0,0,0,0,0,0,0,"Oro Eyegouge - On Aggro - Cast Curse of Weakness"),
+(@ENTRY,0,2,3,61,0,100,0,0,0,0,0,11,9613,0,0,0,0,0,2,0,0,0,0,0,0,0,"Oro Eyegouge - On Aggro - Cast Shadow Bolt"),
+(@ENTRY,0,3,0,61,0,100,0,0,0,0,0,23,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Oro Eyegouge - On Aggro - Increment Phase"),
+(@ENTRY,0,4,0,9,1,100,2,0,40,2400,3800,11,9613,0,0,0,0,0,2,0,0,0,0,0,0,0,"Oro Eyegouge - At 0 - 40 Range - Cast Shadow Bolt"),
+(@ENTRY,0,5,6,3,1,100,2,0,15,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Oro Eyegouge - At 15% Mana - Allow Combat Movement"),
+(@ENTRY,0,6,0,61,1,100,0,0,0,0,0,23,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Oro Eyegouge - At 15% Mana - Increment Phase"),
+(@ENTRY,0,7,0,9,1,100,3,35,80,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Oro Eyegouge - At 35 - 80 Range - Allow Combat Movement"),
+(@ENTRY,0,8,0,9,1,100,3,5,15,0,0,79,15,0,0,0,0,0,1,0,0,0,0,0,0,0,"Oro Eyegouge - At 5 - 15 Range - Set Ranged Movement"),
+(@ENTRY,0,9,0,9,1,100,3,0,5,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Oro Eyegouge - At 0 - 5 Range - Allow Combat Movement"),
+(@ENTRY,0,10,0,3,2,100,2,30,100,100,100,23,0,1,0,0,0,0,1,0,0,0,0,0,0,0,"Oro Eyegouge - At 30% Mana - Decrement Phase"),
+(@ENTRY,0,11,0,0,0,80,2,5000,7000,23000,27000,11,11962,0,0,0,0,0,2,0,0,0,0,0,0,0,"Oro Eyegouge - In Combat - Cast Immolate"),
+(@ENTRY,0,12,0,0,0,80,2,8000,10000,15000,18250,11,11990,0,0,0,0,0,2,0,0,0,0,0,0,0,"Oro Eyegouge - In Combat - Cast Rain of Fire");
+
+-- Sandfury Shadowhunter SAI
+SET @ENTRY := 7246;
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,1,1,0,100,2,0,0,0,0,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sandfury Shadowhunter - Out Of Combat - Allow Combat Movement"),
+(@ENTRY,0,1,0,61,0,100,0,0,0,0,0,20,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sandfury Shadowhunter - Out Of Combat - Start Auto Attack"),
+(@ENTRY,0,2,3,4,0,100,2,0,0,0,0,11,15547,0,0,0,0,0,2,0,0,0,0,0,0,0,"Sandfury Shadowhunter - On Aggro - Cast Shoot"),
+(@ENTRY,0,3,0,61,0,100,0,0,0,0,0,23,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sandfury Shadowhunter - On Aggro - Increment Phase"),
+(@ENTRY,0,4,5,9,1,100,2,5,30,2300,3900,11,15547,0,0,0,0,0,2,0,0,0,0,0,0,0,"Sandfury Shadowhunter - At 5 - 30 Range - Cast Shoot"),
+(@ENTRY,0,5,0,61,1,100,0,0,0,0,0,40,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sandfury Shadowhunter - At 5 - 30 Range - Display ranged weapon"),
+(@ENTRY,0,6,7,9,1,100,2,25,80,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sandfury Shadowhunter - At 25 - 80 Range - Allow Combat Movement"),
+(@ENTRY,0,7,0,61,1,100,0,0,0,0,0,20,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sandfury Shadowhunter - At 25 - 80 Range - Start Auto Attack"),
+(@ENTRY,0,8,9,9,1,100,2,0,5,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sandfury Shadowhunter - At 0 - 5 Range - Allow Combat Movement"),
+(@ENTRY,0,9,10,61,1,100,0,0,0,0,0,40,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sandfury Shadowhunter - At 0 - 5 Range - Display melee weapon"),
+(@ENTRY,0,10,0,61,1,100,0,0,0,0,0,20,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sandfury Shadowhunter - At 0 - 5 Range - Start Auto Attack"),
+(@ENTRY,0,11,12,9,1,100,2,5,15,0,0,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sandfury Shadowhunter - At 5 - 15 Range - Allow Combat Movement"),
+(@ENTRY,0,12,0,61,1,100,0,0,0,0,0,20,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sandfury Shadowhunter - At 5 - 15 Range - Start Auto Attack"),
+(@ENTRY,0,13,0,0,0,100,2,7000,12000,18000,25000,11,11641,1,0,0,0,0,6,0,0,0,0,0,0,0,"Sandfury Shadowhunter - In Combat - Cast Hex"),
+(@ENTRY,0,14,0,2,0,100,3,0,15,0,0,23,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sandfury Shadowhunter - At 15% HP - Increment Phase"),
+(@ENTRY,0,15,16,2,2,100,2,0,15,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sandfury Shadowhunter - At 15% HP - Allow Combat Movement"),
+(@ENTRY,0,16,0,61,2,100,0,0,0,0,0,25,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"Sandfury Shadowhunter - At 15% HP - Flee For Assist"),
+(@ENTRY,0,17,0,7,0,100,2,0,0,0,0,40,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sandfury Shadowhunter - On Evade - Display melee weapon");
+
+-- Sandfury Shadowcaster SAI
+SET @ENTRY := 5648;
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,1,0,100,3,0,0,0,0,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sandfury Shadowcaster - Out Of Combat - Allow Combat Movement"),
+(@ENTRY,0,1,0,1,0,100,2,1000,1000,1800000,1800000,11,20798,1,0,0,0,0,1,0,0,0,0,0,0,0,"Sandfury Shadowcaster - Out Of Combat - Cast Demon Skin"),
+(@ENTRY,0,2,3,4,0,100,2,0,0,0,0,11,12471,0,0,0,0,0,2,0,0,0,0,0,0,0,"Sandfury Shadowcaster - On Aggro - Cast Shadow Bolt"),
+(@ENTRY,0,3,0,61,0,100,0,0,0,0,0,23,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sandfury Shadowcaster - On Aggro - Increment Phase"),
+(@ENTRY,0,4,0,9,1,100,2,0,40,2400,3800,11,12471,0,0,0,0,0,2,0,0,0,0,0,0,0,"Sandfury Shadowcaster - At 0 - 40 Range - Cast Shadow Bolt"),
+(@ENTRY,0,5,6,3,1,100,2,0,15,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sandfury Shadowcaster - At 15% Mana - Allow Combat Movement"),
+(@ENTRY,0,6,0,61,1,100,0,0,0,0,0,23,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sandfury Shadowcaster - At 15% Mana - Increment Phase"),
+(@ENTRY,0,7,0,9,1,100,3,35,80,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sandfury Shadowcaster - At 35 - 80 Range - Allow Combat Movement"),
+(@ENTRY,0,8,0,9,1,100,3,5,15,0,0,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sandfury Shadowcaster - At 5 - 15 Range - Allow Combat Movement"),
+(@ENTRY,0,9,0,9,1,100,3,0,5,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sandfury Shadowcaster - At 0 - 5 Range - Allow Combat Movement"),
+(@ENTRY,0,10,0,3,4,100,2,30,100,100,100,23,0,1,0,0,0,0,1,0,0,0,0,0,0,0,"Sandfury Shadowcaster - At 30% Mana - Decrement Phase"),
+(@ENTRY,0,11,0,0,0,100,2,6000,9000,23000,28000,11,14032,1,0,0,0,0,5,0,0,0,0,0,0,0,"Sandfury Shadowcaster - In Combat - Cast Shadow Word: Pain"),
+(@ENTRY,0,12,0,2,2,100,3,0,15,0,0,22,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sandfury Shadowcaster - At 15% HP - Set Phase 3"),
+(@ENTRY,0,13,14,2,2,100,2,0,15,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sandfury Shadowcaster - At 15% HP - Allow Combat Movement"),
+(@ENTRY,0,14,0,61,0,100,0,0,0,0,0,25,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"Sandfury Shadowcaster - At 15% HP - Flee For Assist");
+
+-- Druid of the Fang SAI
+SET @ENTRY := 3840;
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,1,0,100,3,0,0,0,0,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Druid of the Fang - Out Of Combat - Allow Combat Movement"),
+(@ENTRY,0,1,2,4,0,100,2,0,0,0,0,11,9532,0,0,0,0,0,2,0,0,0,0,0,0,0,"Druid of the Fang - On Aggro - Cast Lightning Bolt"),
+(@ENTRY,0,2,0,61,0,100,0,0,0,0,0,23,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Druid of the Fang - On Aggro - Increment Phase"),
+(@ENTRY,0,3,0,9,1,100,2,0,40,2400,3800,11,9532,0,0,0,0,0,2,0,0,0,0,0,0,0,"Druid of the Fang - At 0 - 40 Range - Cast Lightning Bolt"),
+(@ENTRY,0,4,5,3,1,100,2,0,15,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Druid of the Fang - At 15% Mana - Allow Combat Movement"),
+(@ENTRY,0,5,0,61,1,100,0,0,0,0,0,23,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Druid of the Fang - At 15% Mana - Increment Phase"),
+(@ENTRY,0,6,0,9,1,100,3,35,80,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Druid of the Fang - At 35 - 80 Range - Allow Combat Movement"),
+(@ENTRY,0,7,0,9,1,100,3,5,15,0,0,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Druid of the Fang - At 5 - 15 Range - Allow Combat Movement"),
+(@ENTRY,0,8,0,9,1,100,3,0,5,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Druid of the Fang - At 0 - 5 Range - Allow Combat Movement"),
+(@ENTRY,0,9,0,0,1,100,2,8000,11000,10000,20000,11,8040,33,0,0,0,0,6,0,0,0,0,0,0,0,"Druid of the Fang - In Combat - Cast Druid's Slumber"),
+(@ENTRY,0,10,0,14,1,100,2,0,40,12000,18000,11,5187,1,0,0,0,0,7,0,0,0,0,0,0,0,"Druid of the Fang - On Friendly Unit At 0 - 40% Health - Cast Healing Touch"),
+(@ENTRY,0,11,0,3,2,100,2,30,100,100,100,23,0,1,0,0,0,0,1,0,0,0,0,0,0,0,"Druid of the Fang - At 30% Mana - Decrement Phase"),
+(@ENTRY,0,12,13,2,0,100,2,0,50,20000,25000,11,8041,1,0,0,0,0,1,0,0,0,0,0,0,0,"Druid of the Fang - At 50% HP - Cast Serpent Form"),
+(@ENTRY,0,13,14,61,0,100,0,0,0,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Druid of the Fang - At 50% HP - Allow Combat Movement"),
+(@ENTRY,0,14,0,61,0,100,0,0,0,0,0,22,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Druid of the Fang - At 50% HP - Set Phase 3"),
+(@ENTRY,0,15,16,16,0,100,2,8041,5,0,0,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Druid of the Fang - On Friendly Buff Missing - Allow Combat Movement"),
+(@ENTRY,0,16,0,61,0,100,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Druid of the Fang - On Friendly Buff Missing - Set Phase 1");
+
+-- Ymirjar Necromancer SAI
+SET @ENTRY := 28368;
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,1,1,0,100,7,0,0,0,0,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ymirjar Necromancer - Out Of Combat - Allow Combat Movement"),
+(@ENTRY,0,1,0,61,0,100,0,0,0,0,0,22,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ymirjar Necromancer - Out Of Combat - Set Phase 0"),
+(@ENTRY,0,2,3,4,0,100,3,0,0,0,0,11,51432,0,0,0,0,0,2,0,0,0,0,0,0,0,"Ymirjar Necromancer (Normal) - On Aggro - Cast Shadow Bolt"),
+(@ENTRY,0,3,0,61,0,100,0,0,0,0,0,23,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ymirjar Necromancer (Normal) - On Aggro - Increment Phase"),
+(@ENTRY,0,4,0,9,1,100,2,0,40,5000,7000,11,51432,0,0,0,0,0,2,0,0,0,0,0,0,0,"Ymirjar Necromancer (Normal) - At 0 - 40 Range - Cast Shadow Bolt"),
+(@ENTRY,0,5,6,4,0,100,5,0,0,0,0,11,59254,0,0,0,0,0,2,0,0,0,0,0,0,0,"Ymirjar Necromancer (Heroic) - On Aggro - Cast Shadow Bolt"),
+(@ENTRY,0,6,0,61,0,100,0,0,0,0,0,23,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ymirjar Necromancer (Heroic) - On Aggro - Increment Phase"),
+(@ENTRY,0,7,0,9,1,100,4,0,40,5000,7000,11,59254,0,0,0,0,0,2,0,0,0,0,0,0,0,"Ymirjar Necromancer (Heroic) - At 0 - 40 Range - Cast Shadow Bolt"),
+(@ENTRY,0,8,9,3,1,100,6,0,7,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ymirjar Necromancer - At 7% Mana - Allow Combat Movement"),
+(@ENTRY,0,9,0,61,0,100,0,0,0,0,0,23,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ymirjar Necromancer - At 7% Mana - Increment Phase"),
+(@ENTRY,0,10,0,9,1,100,7,35,80,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ymirjar Necromancer - At 35 - 80 Range - Allow Combat Movement"),
+(@ENTRY,0,11,0,9,1,100,7,5,15,0,0,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ymirjar Necromancer - At 5 - 15 Range - Allow Combat Movement"),
+(@ENTRY,0,12,0,9,1,100,7,0,5,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ymirjar Necromancer - At 0 - 5 Range - Allow Combat Movement"),
+(@ENTRY,0,13,0,3,2,100,6,15,100,100,100,23,0,1,0,0,0,0,1,0,0,0,0,0,0,0,"Ymirjar Necromancer - At 15% Mana - Decrement Phase"),
+(@ENTRY,0,14,0,0,0,100,2,9000,14000,18000,22000,11,49205,0,0,0,0,0,5,0,0,0,0,0,0,0,"Ymirjar Necromancer (Normal) - In Combat - Cast Shadow Bolt Volley"),
+(@ENTRY,0,15,0,0,0,100,4,9000,14000,18000,22000,11,59255,0,0,0,0,0,5,0,0,0,0,0,0,0,"Ymirjar Necromancer (Heroic) - In Combat - Cast Shadow Bolt Volley"),
+(@ENTRY,0,16,0,2,0,100,7,0,15,0,0,22,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ymirjar Necromancer - At 15% HP - Set Phase 3"),
+(@ENTRY,0,17,18,2,4,100,6,0,15,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ymirjar Necromancer - At 15% HP - Allow Combat Movement"),
+(@ENTRY,0,18,0,61,0,100,0,0,0,0,0,25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Ymirjar Necromancer - At 15% HP - Flee For Assist");
+
+-- Ymirjar Flesh Hunter SAI
+SET @ENTRY := 26670;
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,1,1,0,100,6,0,0,0,0,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ymirjar Flesh Hunter - Out Of Combat - Allow Combat Movement"),
+(@ENTRY,0,1,0,61,0,100,0,0,0,0,0,20,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ymirjar Flesh Hunter - Out Of Combat - Start Auto Attack"),
+(@ENTRY,0,2,0,4,0,15,7,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ymirjar Flesh Hunter - On Aggro - Say Line 0"),
+(@ENTRY,0,3,4,4,0,100,3,0,0,0,0,11,48854,0,0,0,0,0,2,0,0,0,0,0,0,0,"Ymirjar Flesh Hunter (Normal) - On Aggro - Cast Shoot"),
+(@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,"Ymirjar Flesh Hunter (Normal) - On Aggro - Increment Phase"),
+(@ENTRY,0,5,6,9,1,100,2,5,30,5000,8000,11,48854,0,0,0,0,0,2,0,0,0,0,0,0,0,"Ymirjar Flesh Hunter (Normal) - At 5 - 30 Range - Cast Shoot"),
+(@ENTRY,0,6,0,61,0,100,0,0,0,0,0,40,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ymirjar Flesh Hunter (Normal) - At 5 - 30 Range - Display ranged weapon"),
+(@ENTRY,0,7,8,4,0,100,5,0,0,0,0,11,59241,0,0,0,0,0,2,0,0,0,0,0,0,0,"Ymirjar Flesh Hunter (Heroic) - On Aggro - Cast Shoot"),
+(@ENTRY,0,8,0,61,0,100,0,0,0,0,0,23,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ymirjar Flesh Hunter (Heroic) - On Aggro - Increment Phase"),
+(@ENTRY,0,9,10,9,1,100,4,5,30,5000,8000,11,59241,0,0,0,0,0,2,0,0,0,0,0,0,0,"Ymirjar Flesh Hunter (Heroic) - At 5 - 30 Range - Cast Shoot"),
+(@ENTRY,0,10,0,61,0,100,0,0,0,0,0,40,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ymirjar Flesh Hunter (Heroic) - At 5 - 30 Range - Display ranged weapon"),
+(@ENTRY,0,11,12,9,1,100,6,25,80,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ymirjar Flesh Hunter - At 25 - 80 Range - Allow Combat Movement"),
+(@ENTRY,0,12,0,61,0,100,0,0,0,0,0,20,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ymirjar Flesh Hunter - At 25 - 80 Range - Start Auto Attack"),
+(@ENTRY,0,13,14,9,1,100,6,0,5,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ymirjar Flesh Hunter - At 0 - 5 Range - Allow Combat Movement"),
+(@ENTRY,0,14,15,61,0,100,0,0,0,0,0,40,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ymirjar Flesh Hunter - At 0 - 5 Range - Display melee weapon"),
+(@ENTRY,0,15,0,61,0,100,0,0,0,0,0,20,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ymirjar Flesh Hunter - At 0 - 5 Range - Start Auto Attack"),
+(@ENTRY,0,16,17,9,1,100,6,5,15,0,0,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ymirjar Flesh Hunter - At 5 - 15 Range - Allow Combat Movement"),
+(@ENTRY,0,17,0,61,0,100,0,0,0,0,0,20,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ymirjar Flesh Hunter - At 5 - 15 Range - Start Auto Attack"),
+(@ENTRY,0,18,19,0,0,100,2,9000,14000,22000,26000,11,48871,0,0,0,0,0,5,0,0,0,0,0,0,0,"Ymirjar Flesh Hunter (Normal) - In Combat - Cast Aimed Shot"),
+(@ENTRY,0,19,0,61,0,100,0,0,0,0,0,40,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ymirjar Flesh Hunter (Normal) - In Combat - Display ranged weapon"),
+(@ENTRY,0,20,21,0,0,100,4,9000,14000,22000,26000,11,59243,0,0,0,0,0,5,0,0,0,0,0,0,0,"Ymirjar Flesh Hunter (Heroic) - In Combat - Cast Aimed Shot"),
+(@ENTRY,0,21,0,61,0,100,0,0,0,0,0,40,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ymirjar Flesh Hunter (Heroic) - In Combat - Display ranged weapon"),
+(@ENTRY,0,22,23,0,0,100,2,14000,17000,24000,27000,11,48872,1,0,0,0,0,6,0,0,0,0,0,0,0,"Ymirjar Flesh Hunter (Normal) - In Combat - Cast Multi-Shot"),
+(@ENTRY,0,23,0,61,0,100,0,0,0,0,0,40,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ymirjar Flesh Hunter (Normal) - In Combat - Display ranged weapon"),
+(@ENTRY,0,24,25,0,0,100,4,14000,17000,24000,27000,11,59244,1,0,0,0,0,6,0,0,0,0,0,0,0,"Ymirjar Flesh Hunter (Heroic) - In Combat - Cast Multi-Shot"),
+(@ENTRY,0,25,0,61,0,100,0,0,0,0,0,40,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ymirjar Flesh Hunter (Heroic) - In Combat - Display ranged weapon"),
+(@ENTRY,0,26,0,2,0,100,7,0,15,0,0,23,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ymirjar Flesh Hunter - At 15% HP - Increment Phase"),
+(@ENTRY,0,27,28,2,2,100,6,0,15,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ymirjar Flesh Hunter - At 15% HP - Allow Combat Movement"),
+(@ENTRY,0,28,0,61,0,100,0,0,0,0,0,25,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"Ymirjar Flesh Hunter - At 15% HP - Flee For Assist"),
+(@ENTRY,0,29,0,7,0,100,6,0,0,0,0,40,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ymirjar Flesh Hunter - On Evade - Display melee weapon");
+
+-- Dragonflayer Seer SAI
+SET @ENTRY := 26554;
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,1,1,0,100,6,0,0,0,0,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Dragonflayer Seer - Out Of Combat - Allow Combat Movement"),
+(@ENTRY,0,1,0,61,0,100,0,0,0,0,0,22,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Dragonflayer Seer - Out Of Combat - Set Phase 0"),
+(@ENTRY,0,2,3,4,0,100,3,0,0,0,0,11,48698,0,0,0,0,0,2,0,0,0,0,0,0,0,"Dragonflayer Seer (Normal) - On Aggro - Cast Lightning Bolt"),
+(@ENTRY,0,3,0,61,0,100,0,0,0,0,0,23,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Dragonflayer Seer (Normal) - On Aggro - Increment Phase"),
+(@ENTRY,0,4,0,9,1,100,2,0,40,7000,11000,11,48698,0,0,0,0,0,2,0,0,0,0,0,0,0,"Dragonflayer Seer (Normal) - At 0 - 40 Range - Cast Lightning Bolt"),
+(@ENTRY,0,5,6,4,0,100,5,0,0,0,0,11,59081,0,0,0,0,0,2,0,0,0,0,0,0,0,"Dragonflayer Seer (Heroic) - On Aggro - Cast Lightning Bolt"),
+(@ENTRY,0,6,0,61,0,100,0,0,0,0,0,23,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Dragonflayer Seer (Heroic) - On Aggro - Increment Phase"),
+(@ENTRY,0,7,0,9,1,100,4,0,40,7000,11000,11,59081,0,0,0,0,0,2,0,0,0,0,0,0,0,"Dragonflayer Seer (Heroic) - At 0 - 40 Range - Cast Lightning Bolt"),
+(@ENTRY,0,8,9,3,1,100,6,0,7,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Dragonflayer Seer - At 7% Mana - Allow Combat Movement"),
+(@ENTRY,0,9,0,61,1,100,0,0,0,0,0,23,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Dragonflayer Seer - At 7% Mana - Increment Phase"),
+(@ENTRY,0,10,0,9,1,100,7,35,80,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Dragonflayer Seer - At 35 - 80 Range - Allow Combat Movement"),
+(@ENTRY,0,11,0,9,1,100,7,5,15,0,0,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Dragonflayer Seer - At 5 - 15 Range - Allow Combat Movement"),
+(@ENTRY,0,12,0,9,1,100,7,0,5,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Dragonflayer Seer - At 0 - 5 Range - Allow Combat Movement"),
+(@ENTRY,0,13,0,3,2,100,6,15,100,100,100,23,0,1,0,0,0,0,1,0,0,0,0,0,0,0,"Dragonflayer Seer - At 15% Mana - Decrement Phase"),
+(@ENTRY,0,14,0,0,0,100,2,4000,7000,12000,15000,11,48699,0,0,0,0,0,5,0,0,0,0,0,0,0,"Dragonflayer Seer (Normal) - In Combat - Cast Chain Lightning"),
+(@ENTRY,0,15,0,0,0,100,4,4000,7000,12000,15000,11,59082,0,0,0,0,0,5,0,0,0,0,0,0,0,"Dragonflayer Seer (Heroic) - In Combat - Cast Chain Lightning"),
+(@ENTRY,0,16,0,14,0,100,2,0,30,18000,21000,11,48700,0,0,0,0,0,7,0,0,0,0,0,0,0,"Dragonflayer Seer (Normal) - On Friendly Unit At 0 - 30% Health - Cast Healing Wave"),
+(@ENTRY,0,17,0,14,0,100,4,0,30,18000,21000,11,59083,0,0,0,0,0,7,0,0,0,0,0,0,0,"Dragonflayer Seer (Heroic) - On Friendly Unit At 0 - 30% Health - Cast Healing Wave");
+
+-- Dark Rune Shaper SAI
+SET @ENTRY := 27965;
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,1,1,0,100,7,0,0,0,0,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Dark Rune Shaper - Out Of Combat - Allow Combat Movement"),
+(@ENTRY,0,1,0,61,0,100,0,0,0,0,0,22,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Dark Rune Shaper - Out Of Combat - Set Phase 0"),
+(@ENTRY,0,2,3,4,0,100,3,0,0,0,0,11,51496,0,0,0,0,0,2,0,0,0,0,0,0,0,"Dark Rune Shaper (Normal) - On Aggro - Cast Chiseling Ray"),
+(@ENTRY,0,3,0,61,0,100,0,0,0,0,0,23,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Dark Rune Shaper (Normal) - On Aggro - Increment Phase"),
+(@ENTRY,0,4,0,9,1,100,2,0,40,6000,9000,11,51496,0,0,0,0,0,2,0,0,0,0,0,0,0,"Dark Rune Shaper (Normal) - At 0 - 40 Range - Cast Chiseling Ray"),
+(@ENTRY,0,5,6,4,0,100,5,0,0,0,0,11,59034,0,0,0,0,0,2,0,0,0,0,0,0,0,"Dark Rune Shaper (Heroic) - On Aggro - Cast Chiseling Ray"),
+(@ENTRY,0,6,0,61,0,100,0,0,0,0,0,23,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Dark Rune Shaper (Heroic) - On Aggro - Increment Phase"),
+(@ENTRY,0,7,0,9,1,100,4,0,40,6000,9000,11,59034,0,0,0,0,0,2,0,0,0,0,0,0,0,"Dark Rune Shaper (Heroic) - At 0 - 40 Range - Cast Chiseling Ray"),
+(@ENTRY,0,8,9,3,1,100,7,0,7,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Dark Rune Shaper - At 7% Mana - Allow Combat Movement"),
+(@ENTRY,0,9,0,61,1,100,0,0,0,0,0,23,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Dark Rune Shaper - At 7% Mana - Increment Phase"),
+(@ENTRY,0,10,0,9,1,100,7,35,80,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Dark Rune Shaper - At 35 - 80 Range - Allow Combat Movement"),
+(@ENTRY,0,11,0,9,1,100,7,5,15,0,0,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Dark Rune Shaper - At 5 - 15 Range - Allow Combat Movement"),
+(@ENTRY,0,12,0,9,1,100,7,0,5,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Dark Rune Shaper - At 0 - 5 Range - Allow Combat Movement"),
+(@ENTRY,0,13,0,3,2,100,6,15,100,100,100,23,0,1,0,0,0,0,1,0,0,0,0,0,0,0,"Dark Rune Shaper - At 15% Mana - Decrement Phase");
diff --git a/sql/updates/world/2013_01_02_09_world_waypoints.sql b/sql/updates/world/2013_01_02_09_world_waypoints.sql
new file mode 100644
index 00000000000..1c2492fcce8
--- /dev/null
+++ b/sql/updates/world/2013_01_02_09_world_waypoints.sql
@@ -0,0 +1,138 @@
+-- Pathing for Thrym Entry: 28243
+SET @NPC := 103290;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=5448.966,`position_y`=-1600.008,`position_z`=248.3331 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,5448.966,-1600.008,248.3331,0,0,0,100,0),
+(@PATH,2,5447.655,-1631.053,248.3331,0,0,0,100,0),
+(@PATH,3,5447.865,-1663.079,248.3032,0,0,0,100,0),
+(@PATH,4,5446.966,-1704.903,248.2398,0,0,0,100,0),
+(@PATH,5,5446.957,-1736.751,248.3335,0,0,0,100,0),
+(@PATH,6,5445.319,-1773.959,248.2313,0,0,0,100,0),
+(@PATH,7,5443.451,-1814.034,248.2451,0,0,0,100,0),
+(@PATH,8,5443.122,-1860.167,248.2451,0,0,0,100,0),
+(@PATH,9,5442.573,-1896.295,248.2961,0,0,0,100,0),
+(@PATH,10,5444.602,-1934.296,248.3471,0,0,0,100,0),
+(@PATH,11,5445.959,-1975.212,248.3471,0,0,0,100,0),
+(@PATH,12,5448.557,-2015.833,248.3328,0,0,0,100,0),
+(@PATH,13,5450.393,-2055.615,248.3471,0,0,0,100,0),
+(@PATH,14,5452.368,-2095.424,248.3471,0,0,0,100,0),
+(@PATH,15,5450.376,-2130.012,248.3557,0,0,0,100,0),
+(@PATH,16,5448.958,-2154.166,248.3565,0,0,0,100,0),
+(@PATH,17,5450.228,-2193.794,248.4327,0,0,0,100,0),
+(@PATH,18,5449.065,-2155.135,248.3565,0,0,0,100,0),
+(@PATH,19,5451.041,-2130.209,248.3557,0,0,0,100,0),
+(@PATH,20,5452.368,-2095.424,248.3471,0,0,0,100,0),
+(@PATH,21,5450.393,-2055.615,248.3471,0,0,0,100,0),
+(@PATH,22,5448.557,-2015.833,248.3328,0,0,0,100,0),
+(@PATH,23,5445.959,-1975.212,248.3471,0,0,0,100,0),
+(@PATH,24,5444.602,-1934.296,248.3471,0,0,0,100,0),
+(@PATH,25,5442.573,-1896.295,248.2961,0,0,0,100,0),
+(@PATH,26,5443.122,-1860.167,248.2451,0,0,0,100,0),
+(@PATH,27,5443.451,-1814.034,248.2451,0,0,0,100,0),
+(@PATH,28,5445.319,-1773.959,248.2313,0,0,0,100,0),
+(@PATH,29,5446.957,-1736.751,248.3335,0,0,0,100,0),
+(@PATH,30,5446.966,-1704.903,248.2398,0,0,0,100,0),
+(@PATH,31,5447.865,-1663.079,248.3032,0,0,0,100,0),
+(@PATH,32,5447.655,-1631.053,248.3331,0,0,0,100,0),
+(@PATH,33,5448.966,-1600.008,248.3331,0,0,0,100,0),
+(@PATH,34,5448.563,-1572.11,248.3242,0,0,0,100,0),
+(@PATH,35,5448.359,-1535.512,248.3503,0,0,0,100,0),
+(@PATH,36,5446.37,-1496.475,248.3165,0,0,0,100,0),
+(@PATH,37,5445.602,-1454.377,248.3085,0,0,0,100,0),
+(@PATH,38,5445.826,-1433.070,248.4012,0,0,0,100,0),
+(@PATH,39,5446.118,-1417.052,239.2611,0,0,0,100,0),
+(@PATH,40,5446.015,-1411.64,239.3458,0,0,0,100,0),
+(@PATH,41,5446.15,-1372.373,239.3458,0,0,0,100,0),
+(@PATH,42,5445.78,-1326.04,239.2721,0,0,0,100,0),
+(@PATH,43,5446.15,-1372.373,239.3458,0,0,0,100,0),
+(@PATH,44,5446.015,-1411.64,239.3458,0,0,0,100,0),
+(@PATH,45,5446.118,-1417.052,239.2611,0,0,0,100,0),
+(@PATH,46,5445.826,-1433.070,248.4012,0,0,0,100,0),
+(@PATH,47,5445.602,-1454.377,248.3085,0,0,0,100,0),
+(@PATH,48,5446.37,-1496.475,248.3165,0,0,0,100,0),
+(@PATH,49,5448.359,-1535.512,248.3503,0,0,0,100,0),
+(@PATH,50,5448.563,-1572.11,248.3242,0,0,0,100,0);
+
+-- Pathing for Mam'toth Disciple Entry: 28861
+SET @NPC := 113829;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=6405.855,`position_y`=-4262.899,`position_z`=455.5814 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, '52574');
+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,6405.855,-4262.899,455.5814,0,0,0,100,0),
+(@PATH,2,6406.651,-4247.01,454.8314,0,0,0,100,0),
+(@PATH,3,6411.053,-4230.215,456.8571,0,0,0,100,0),
+(@PATH,4,6407.01,-4207.069,461.7675,0,0,0,100,0),
+(@PATH,5,6385.251,-4191.354,460.4738,0,0,0,100,0),
+(@PATH,6,6367.858,-4193.421,459.0136,0,0,0,100,0),
+(@PATH,7,6367.621,-4216.292,458.9676,0,0,0,100,0),
+(@PATH,8,6359.056,-4238.381,458.9309,0,0,0,100,0),
+(@PATH,9,6368.265,-4261.602,458.9691,0,0,0,100,0),
+(@PATH,10,6368.305,-4284.628,458.8995,0,0,0,100,0),
+(@PATH,11,6390.221,-4289.859,461.7745,0,0,0,100,0),
+(@PATH,12,6402.944,-4284.963,457.5383,0,0,0,100,0);
+
+-- Pathing for Segacedi Entry: 32664
+SET @NPC := 110306;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=5924.809,`position_y`=564.5653,`position_z`=601.5578 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,5924.809,564.5653,601.5578,0,0,0,100,0),
+(@PATH,2,5917.506,559.5457,599.975,0,0,0,100,0),
+(@PATH,3,5924.809,564.5653,601.5578,0,0,0,100,0),
+(@PATH,4,5923.932,570.1338,603.1688,0,0,0,100,0),
+(@PATH,5,5926.551,575.4876,602.0579,0,0,0,100,0),
+(@PATH,6,5930.981,574.3068,602.5855,0,0,0,100,0),
+(@PATH,7,5933.025,569.929,601.4746,0,0,0,100,0),
+(@PATH,8,5932.214,563.8223,600.2523,0,0,0,100,0),
+(@PATH,9,5929.565,561.0128,602.0024,0,0,0,100,0),
+(@PATH,10,5925.193,559.6426,603.4468,0,0,0,100,0),
+(@PATH,11,5922.899,557.1088,603.3078,0,0,0,100,0),
+(@PATH,12,5918.246,557.59,603.447,0,0,0,100,0),
+(@PATH,13,5914.375,559.9744,603.5861,0,0,0,100,0),
+(@PATH,14,5906.045,566.9766,602.8636,0,0,0,100,0),
+(@PATH,15,5911.538,571.5968,603.2217,0,0,0,100,0),
+(@PATH,16,5919.368,574.7385,603.5026,0,0,0,100,0),
+(@PATH,17,5911.538,571.5968,603.2217,0,0,0,100,0),
+(@PATH,18,5906.045,566.9766,602.8636,0,0,0,100,0),
+(@PATH,19,5914.375,559.9744,603.5861,0,0,0,100,0),
+(@PATH,20,5918.246,557.59,603.447,0,0,0,100,0),
+(@PATH,21,5922.899,557.1088,603.3078,0,0,0,100,0),
+(@PATH,22,5925.193,559.6426,603.4468,0,0,0,100,0),
+(@PATH,23,5929.565,561.0128,602.0024,0,0,0,100,0),
+(@PATH,24,5932.214,563.8223,600.2523,0,0,0,100,0),
+(@PATH,25,5933.025,569.929,601.4746,0,0,0,100,0),
+(@PATH,26,5930.981,574.3068,602.5855,0,0,0,100,0),
+(@PATH,27,5926.551,575.4876,602.0579,0,0,0,100,0),
+(@PATH,28,5923.932,570.1338,603.1688,0,0,0,100,0);
+
+-- Pathing for Claw of Har'koa Entry: 28402
+SET @NPC := 88732;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=5475.932,`position_y`=-3943.574,`position_z`=362.062 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,5475.932,-3943.574,362.062,0,0,0,100,0),
+(@PATH,2,5496.939,-3933.918,362.062,0,0,0,100,0),
+(@PATH,3,5503.387,-3912.114,362.0851,0,0,0,100,0),
+(@PATH,4,5505.28,-3887.115,362.0851,0,0,0,100,0),
+(@PATH,5,5494.267,-3863.793,362.0794,0,0,0,100,0),
+(@PATH,6,5474.92,-3854.984,362.0794,0,0,0,100,0),
+(@PATH,7,5449.384,-3848.412,362.0686,0,0,0,100,0),
+(@PATH,8,5429.913,-3847.965,362.0359,0,0,0,100,0),
+(@PATH,9,5409.766,-3868.374,361.9735,0,0,0,100,0),
+(@PATH,10,5407.17,-3903.612,362.0776,0,0,0,100,0),
+(@PATH,11,5407.908,-3925.006,362.0776,0,0,0,100,0),
+(@PATH,12,5433.907,-3945.061,362.062,0,0,0,100,0),
+(@PATH,13,5449.745,-3949.848,362.062,0,0,0,100,0);
diff --git a/sql/updates/world/2013_01_02_10_world_sai.sql b/sql/updates/world/2013_01_02_10_world_sai.sql
new file mode 100644
index 00000000000..0be2c5c2d6b
--- /dev/null
+++ b/sql/updates/world/2013_01_02_10_world_sai.sql
@@ -0,0 +1,2 @@
+-- Gameobject Type 3 does NOT support gameobject_scripts
+DELETE FROM `gameobject_scripts` WHERE `id` BETWEEN 35843 AND 35848;
diff --git a/sql/updates/world/2013_01_02_11_world_sai.sql b/sql/updates/world/2013_01_02_11_world_sai.sql
new file mode 100644
index 00000000000..7496a765470
--- /dev/null
+++ b/sql/updates/world/2013_01_02_11_world_sai.sql
@@ -0,0 +1,34 @@
+UPDATE `gameobject_template` SET `AIName`='SmartGameObjectAI' WHERE `entry` IN (176346,176349,176350,176351,176352,176353);
+DELETE FROM `smart_scripts` WHERE `entryorguid`IN (176346,176349,176350,176351,176352,176353) AND `source_type`=1;
+DELETE FROM `smart_scripts` WHERE `entryorguid`IN (17634600,17634900,17635000,17635100,17635200,17635300) AND `source_type`=9;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(176346,1,0,0,70,0,100,0,2,0,0,0,80,17634600,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Market Row Postbox - On Activate - Start Script'),
+(176349,1,0,0,70,0,100,0,2,0,0,0,80,17634900,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Crusaders Square Postbox - On Activate - Start Script'),
+(176350,1,0,0,70,0,100,0,2,0,0,0,80,17635000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Festival Lane Postbox - On Activate - Start Script'),
+(176351,1,0,0,70,0,100,0,2,0,0,0,80,17635100,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Elders Square Postbox - On Activate - Start Script'),
+(176352,1,0,0,70,0,100,0,2,0,0,0,80,17635200,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Kings Square Postbox - On Activate - Start Script'),
+(176353,1,0,0,70,0,100,0,2,0,0,0,80,17635300,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Fras Siabis Postbox - On Activate - Start Script'),
+-- Market Row Postbox Script
+(17634600,9,0,0,0,0,100,0,2000,2000,0,0,12,11142,1,300000,0,1,0,8,0,0,0,3675.35,-3395.92,132.86,5.83,'MR Postbox Script - After 2s - Summon Undead Postman'),
+(17634600,9,1,0,0,0,100,0,2000,2000,0,0,12,11142,1,300000,0,1,0,8,0,0,0,3679.93,-3408.58,133.18,1.04,'MR Postbox Script - After 2s - Summon Undead Postman'),
+(17634600,9,2,0,0,0,100,0,2000,2000,0,0,12,11142,1,300000,0,1,0,8,0,0,0,3687.89,-3410.59,133.04,1.64,'MR Postbox Script - After 2s - Summon Undead Postman'),
+-- Crusaders' Square Postbox Script
+(17634900,9,0,0,0,0,100,0,2000,2000,0,0,12,11142,1,300000,0,1,0,8,0,0,0,3664.55,-3176.47,126.42,2.20,'CS Postbox Script - After 2s - Summon Undead Postman'),
+(17634900,9,1,0,0,0,100,0,2000,2000,0,0,12,11142,1,300000,0,1,0,8,0,0,0,3656.82,-3160.63,129.03,4.84,'CS Postbox Script - After 2s - Summon Undead Postman'),
+(17634900,9,2,0,0,0,100,0,2000,2000,0,0,12,11142,1,300000,0,1,0,8,0,0,0,3644.62,-3168.25,128.52,5.93,'CS Postbox Script - After 2s - Summon Undead Postman'),
+-- Festival Lane Postbox Script
+(17635000,9,0,0,0,0,100,0,2000,2000,0,0,12,11142,1,300000,0,1,0,8,0,0,0,3651.67,-3477.88,138.05,5.59,'FL Postbox Script - After 2s - Summon Undead Postman'),
+(17635000,9,1,0,0,0,100,0,2000,2000,0,0,12,11142,1,300000,0,1,0,8,0,0,0,3657.14,-3475.36,138.70,4.91,'FL Postbox Script - After 2s - Summon Undead Postman'),
+(17635000,9,2,0,0,0,100,0,2000,2000,0,0,12,11142,1,300000,0,1,0,8,0,0,0,3669.61,-3478.49,137.49,3.39,'FL Postbox Script - After 2s - Summon Undead Postman'),
+-- Elders' Square Postbox Script
+(17635100,9,0,0,0,0,100,0,2000,2000,0,0,12,11142,1,300000,0,1,0,8,0,0,0,3659.46,-3634.96,138.33,1.28,'ES Postbox Script - After 2s - Summon Undead Postman'),
+(17635100,9,1,0,0,0,100,0,2000,2000,0,0,12,11142,1,300000,0,1,0,8,0,0,0,3656.25,-3635.08,138.36,1.02,'ES Postbox Script - After 2s - Summon Undead Postman'),
+(17635100,9,2,0,0,0,100,0,2000,2000,0,0,12,11142,1,300000,0,1,0,8,0,0,0,3661.24,-3621.00,138.40,3.58,'ES Postbox Script - After 2s - Summon Undead Postman'),
+-- King's Square Postbox Script
+(17635200,9,0,0,0,0,100,0,2000,2000,0,0,12,11142,1,300000,0,1,0,8,0,0,0,3568.50,-3356.91,131.06,2.07,'KS Postbox Script - After 2s - Summon Undead Postman'),
+(17635200,9,1,0,0,0,100,0,2000,2000,0,0,12,11142,1,300000,0,1,0,8,0,0,0,3570.91,-3351.01,130.57,2.71,'KS Postbox Script - After 2s - Summon Undead Postman'),
+(17635200,9,2,0,0,0,100,0,2000,2000,0,0,12,11142,1,300000,0,1,0,8,0,0,0,3562.79,-3353.38,130.78,0.81,'KS Postbox Script - After 2s - Summon Undead Postman'),
+-- Fras Siabi's Postbox Script
+(17635300,9,0,0,0,0,100,0,2000,2000,0,0,12,11142,1,300000,0,1,0,8,0,0,0,3493.00,-3300.28,130.47,0.07,'FS Postbox Script - After 2s - Summon Undead Postman'),
+(17635300,9,1,0,0,0,100,0,2000,2000,0,0,12,11142,1,300000,0,1,0,8,0,0,0,3503.16,-3294.90,131.09,4.28,'FS Postbox Script - After 2s - Summon Undead Postman'),
+(17635300,9,2,0,0,0,100,0,2000,2000,0,0,12,11142,1,300000,0,1,0,8,0,0,0,3496.26,-3295.40,130.98,5.34,'FS Postbox Script - After 2s - Summon Undead Postman');
diff --git a/src/server/game/AI/EventAI/CreatureEventAI.cpp b/src/server/game/AI/EventAI/CreatureEventAI.cpp
index 43f6a91242a..f1a1b8824c7 100644
--- a/src/server/game/AI/EventAI/CreatureEventAI.cpp
+++ b/src/server/game/AI/EventAI/CreatureEventAI.cpp
@@ -1268,7 +1268,7 @@ bool CreatureEventAI::CanCast(Unit* target, SpellInfo const* spell, bool trigger
         return false;
 
     //Check for power
-    if (!triggered && me->GetPower((Powers)spell->PowerType) < spell->CalcPowerCost(me, spell->GetSchoolMask()))
+    if (!triggered && me->GetPower((Powers)spell->PowerType) < uint32(spell->CalcPowerCost(me, spell->GetSchoolMask())))
         return false;
 
     //Unit is out of range of this spell
diff --git a/src/server/game/Entities/Object/ObjectDefines.h b/src/server/game/Entities/Object/ObjectDefines.h
index e41716dde36..021e3d0aea5 100644
--- a/src/server/game/Entities/Object/ObjectDefines.h
+++ b/src/server/game/Entities/Object/ObjectDefines.h
@@ -23,18 +23,18 @@
 
 enum HighGuid
 {
-    HIGHGUID_ITEM           = 0x400,                       // blizz 4000
-    HIGHGUID_CONTAINER      = 0x400,                       // blizz 4000
-    HIGHGUID_PLAYER         = 0x000,                       // blizz 0000
-    HIGHGUID_GAMEOBJECT     = 0xF11,                       // blizz F110
-    HIGHGUID_TRANSPORT      = 0xF12,                       // blizz F120 (for GAMEOBJECT_TYPE_TRANSPORT)
-    HIGHGUID_UNIT           = 0xF13,                       // blizz F130
-    HIGHGUID_PET            = 0xF14,                       // blizz F140
-    HIGHGUID_VEHICLE        = 0xF15,                       // blizz F550
-    HIGHGUID_DYNAMICOBJECT  = 0xF10,                       // blizz F100
+    HIGHGUID_ITEM           = 0x4000,                      // blizz 4000
+    HIGHGUID_CONTAINER      = 0x4000,                      // blizz 4000
+    HIGHGUID_PLAYER         = 0x0000,                      // blizz 0000
+    HIGHGUID_GAMEOBJECT     = 0xF110,                      // blizz F110
+    HIGHGUID_TRANSPORT      = 0xF120,                      // blizz F120 (for GAMEOBJECT_TYPE_TRANSPORT)
+    HIGHGUID_UNIT           = 0xF130,                      // blizz F130
+    HIGHGUID_PET            = 0xF140,                      // blizz F140
+    HIGHGUID_VEHICLE        = 0xF150,                      // blizz F550
+    HIGHGUID_DYNAMICOBJECT  = 0xF100,                      // blizz F100
     HIGHGUID_CORPSE         = 0xF101,                      // blizz F100
-    HIGHGUID_MO_TRANSPORT   = 0x1FC,                       // blizz 1FC0 (for GAMEOBJECT_TYPE_MO_TRANSPORT)
-    HIGHGUID_GROUP          = 0x1F5
+    HIGHGUID_MO_TRANSPORT   = 0x1FC0,                      // blizz 1FC0 (for GAMEOBJECT_TYPE_MO_TRANSPORT)
+    HIGHGUID_GROUP          = 0x1F05
 };
 
 // used for creating values for respawn for example
diff --git a/src/server/scripts/EasternKingdoms/CMakeLists.txt b/src/server/scripts/EasternKingdoms/CMakeLists.txt
index 854124ee05c..15faf9dfb83 100644
--- a/src/server/scripts/EasternKingdoms/CMakeLists.txt
+++ b/src/server/scripts/EasternKingdoms/CMakeLists.txt
@@ -10,8 +10,8 @@
 
 set(scripts_STAT_SRCS
   ${scripts_STAT_SRCS}
-  EasternKingdoms/ghostlands.cpp
-  EasternKingdoms/eversong_woods.cpp
+  EasternKingdoms/zone_ghostlands.cpp
+  EasternKingdoms/zone_eversong_woods.cpp
   EasternKingdoms/AlteracValley/boss_galvangar.cpp
   EasternKingdoms/AlteracValley/boss_balinda.cpp
   EasternKingdoms/AlteracValley/boss_drekthar.cpp
@@ -31,7 +31,7 @@ set(scripts_STAT_SRCS
   EasternKingdoms/Scholomance/instance_scholomance.cpp
   EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp
   EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp
-  EasternKingdoms/isle_of_queldanas.cpp
+  EasternKingdoms/zone_isle_of_queldanas.cpp
   EasternKingdoms/boss_kruul.cpp
   EasternKingdoms/ZulGurub/boss_hakkar.cpp
   EasternKingdoms/ZulGurub/boss_mandokir.cpp
@@ -48,12 +48,12 @@ set(scripts_STAT_SRCS
   EasternKingdoms/ZulGurub/boss_jindo.cpp
   EasternKingdoms/ZulGurub/boss_wushoolay.cpp
   EasternKingdoms/ZulGurub/boss_thekal.cpp
-  EasternKingdoms/wetlands.cpp
-  EasternKingdoms/arathi_highlands.cpp
+  EasternKingdoms/zone_wetlands.cpp
+  EasternKingdoms/zone_arathi_highlands.cpp
   EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp
   EasternKingdoms/Gnomeregan/gnomeregan.cpp
   EasternKingdoms/Gnomeregan/gnomeregan.h
-  EasternKingdoms/redridge_mountains.cpp
+  EasternKingdoms/zone_redridge_mountains.cpp
   EasternKingdoms/BlackrockDepths/boss_high_interrogator_gerstahn.cpp
   EasternKingdoms/BlackrockDepths/boss_gorosh_the_dervish.cpp
   EasternKingdoms/BlackrockDepths/blackrock_depths.cpp
@@ -67,12 +67,12 @@ set(scripts_STAT_SRCS
   EasternKingdoms/BlackrockDepths/blackrock_depths.h
   EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp
   EasternKingdoms/BlackrockDepths/boss_magmus.cpp
-  EasternKingdoms/ironforge.cpp
+  EasternKingdoms/zone_ironforge.cpp
   EasternKingdoms/ScarletEnclave/chapter2.cpp
   EasternKingdoms/ScarletEnclave/chapter5.cpp
   EasternKingdoms/ScarletEnclave/chapter1.cpp
-  EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp
-  EasternKingdoms/eastern_plaguelands.cpp
+  EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp
+  EasternKingdoms/zone_eastern_plaguelands.cpp
   EasternKingdoms/MoltenCore/boss_gehennas.cpp
   EasternKingdoms/MoltenCore/boss_lucifron.cpp
   EasternKingdoms/MoltenCore/boss_golemagg.cpp
@@ -99,7 +99,7 @@ set(scripts_STAT_SRCS
   EasternKingdoms/Stratholme/boss_postmaster_malown.cpp
   EasternKingdoms/Stratholme/stratholme.h
   EasternKingdoms/Stratholme/stratholme.cpp
-  EasternKingdoms/tirisfal_glades.cpp
+  EasternKingdoms/zone_tirisfal_glades.cpp
   EasternKingdoms/SunkenTemple/sunken_temple.cpp
   EasternKingdoms/SunkenTemple/sunken_temple.h
   EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp
@@ -115,7 +115,7 @@ set(scripts_STAT_SRCS
   EasternKingdoms/Uldaman/uldaman.h
   EasternKingdoms/Uldaman/instance_uldaman.cpp
   EasternKingdoms/Uldaman/boss_archaedas.cpp
-  EasternKingdoms/swamp_of_sorrows.cpp
+  EasternKingdoms/zone_swamp_of_sorrows.cpp
   EasternKingdoms/BlackrockSpire/boss_pyroguard_emberseer.cpp
   EasternKingdoms/BlackrockSpire/boss_drakkisath.cpp
   EasternKingdoms/BlackrockSpire/boss_warmaster_voone.cpp
@@ -139,12 +139,12 @@ set(scripts_STAT_SRCS
   EasternKingdoms/SunwellPlateau/boss_brutallus.cpp
   EasternKingdoms/SunwellPlateau/sunwell_plateau.cpp
   EasternKingdoms/SunwellPlateau/boss_felmyst.cpp
-  EasternKingdoms/stranglethorn_vale.cpp
+  EasternKingdoms/zone_stranglethorn_vale.cpp
   EasternKingdoms/Deadmines/deadmines.h
   EasternKingdoms/Deadmines/deadmines.cpp
   EasternKingdoms/Deadmines/boss_mr_smite.cpp
   EasternKingdoms/Deadmines/instance_deadmines.cpp
-  EasternKingdoms/duskwood.cpp
+  EasternKingdoms/zone_duskwood.cpp
   EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp
   EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp
   EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp
@@ -157,13 +157,13 @@ set(scripts_STAT_SRCS
   EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp
   EasternKingdoms/ScarletMonastery/boss_herod.cpp
   EasternKingdoms/ScarletMonastery/boss_scorn.cpp
-  EasternKingdoms/undercity.cpp
-  EasternKingdoms/silvermoon_city.cpp
-  EasternKingdoms/loch_modan.cpp
+  EasternKingdoms/zone_undercity.cpp
+  EasternKingdoms/zone_silvermoon_city.cpp
+  EasternKingdoms/zone_loch_modan.cpp
   EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp
   EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
   EasternKingdoms/ShadowfangKeep/shadowfang_keep.h
-  EasternKingdoms/burning_steppes.cpp
+  EasternKingdoms/zone_burning_steppes.cpp
   EasternKingdoms/BlackwingLair/boss_chromaggus.cpp
   EasternKingdoms/BlackwingLair/boss_razorgore.cpp
   EasternKingdoms/BlackwingLair/boss_firemaw.cpp
@@ -174,8 +174,8 @@ set(scripts_STAT_SRCS
   EasternKingdoms/BlackwingLair/boss_nefarian.cpp
   EasternKingdoms/BlackwingLair/boss_flamegor.cpp
   EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp
-  EasternKingdoms/blasted_lands.cpp
-  EasternKingdoms/stormwind_city.cpp
+  EasternKingdoms/zone_blasted_lands.cpp
+  EasternKingdoms/zone_stormwind_city.cpp
   EasternKingdoms/ZulAman/boss_halazzi.cpp
   EasternKingdoms/ZulAman/boss_hexlord.cpp
   EasternKingdoms/ZulAman/boss_zuljin.cpp
@@ -185,11 +185,11 @@ set(scripts_STAT_SRCS
   EasternKingdoms/ZulAman/boss_nalorakk.cpp
   EasternKingdoms/ZulAman/zulaman.cpp
   EasternKingdoms/ZulAman/zulaman.h
-  EasternKingdoms/hinterlands.cpp
-  EasternKingdoms/western_plaguelands.cpp
-  EasternKingdoms/alterac_mountains.cpp
-  EasternKingdoms/westfall.cpp
-  EasternKingdoms/silverpine_forest.cpp
+  EasternKingdoms/zone_hinterlands.cpp
+  EasternKingdoms/zone_western_plaguelands.cpp
+  EasternKingdoms/zone_alterac_mountains.cpp
+  EasternKingdoms/zone_westfall.cpp
+  EasternKingdoms/zone_silverpine_forest.cpp
   EasternKingdoms/Karazhan/instance_karazhan.cpp
   EasternKingdoms/Karazhan/boss_nightbane.cpp
   EasternKingdoms/Karazhan/karazhan.cpp
diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp
index a86b15a7f5c..a86b15a7f5c 100644
--- a/src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp
diff --git a/src/server/scripts/EasternKingdoms/alterac_mountains.cpp b/src/server/scripts/EasternKingdoms/zone_alterac_mountains.cpp
index 9b9af494554..9b9af494554 100644
--- a/src/server/scripts/EasternKingdoms/alterac_mountains.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_alterac_mountains.cpp
diff --git a/src/server/scripts/EasternKingdoms/arathi_highlands.cpp b/src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp
index d638a435936..d638a435936 100644
--- a/src/server/scripts/EasternKingdoms/arathi_highlands.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp
diff --git a/src/server/scripts/EasternKingdoms/blasted_lands.cpp b/src/server/scripts/EasternKingdoms/zone_blasted_lands.cpp
index 4f76edf4406..4f76edf4406 100644
--- a/src/server/scripts/EasternKingdoms/blasted_lands.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_blasted_lands.cpp
diff --git a/src/server/scripts/EasternKingdoms/burning_steppes.cpp b/src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp
index b6899c534e4..b6899c534e4 100644
--- a/src/server/scripts/EasternKingdoms/burning_steppes.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp
diff --git a/src/server/scripts/EasternKingdoms/duskwood.cpp b/src/server/scripts/EasternKingdoms/zone_duskwood.cpp
index 1ce83d31a63..1ce83d31a63 100644
--- a/src/server/scripts/EasternKingdoms/duskwood.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_duskwood.cpp
diff --git a/src/server/scripts/EasternKingdoms/eastern_plaguelands.cpp b/src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp
index a2522fd9495..a2522fd9495 100644
--- a/src/server/scripts/EasternKingdoms/eastern_plaguelands.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp
diff --git a/src/server/scripts/EasternKingdoms/eversong_woods.cpp b/src/server/scripts/EasternKingdoms/zone_eversong_woods.cpp
index 432768a51de..432768a51de 100644
--- a/src/server/scripts/EasternKingdoms/eversong_woods.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_eversong_woods.cpp
diff --git a/src/server/scripts/EasternKingdoms/ghostlands.cpp b/src/server/scripts/EasternKingdoms/zone_ghostlands.cpp
index 9e00ceb2aa5..9e00ceb2aa5 100644
--- a/src/server/scripts/EasternKingdoms/ghostlands.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_ghostlands.cpp
diff --git a/src/server/scripts/EasternKingdoms/hinterlands.cpp b/src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
index ffd31937677..ffd31937677 100644
--- a/src/server/scripts/EasternKingdoms/hinterlands.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
diff --git a/src/server/scripts/EasternKingdoms/ironforge.cpp b/src/server/scripts/EasternKingdoms/zone_ironforge.cpp
index f9e8d4d16c6..f9e8d4d16c6 100644
--- a/src/server/scripts/EasternKingdoms/ironforge.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_ironforge.cpp
diff --git a/src/server/scripts/EasternKingdoms/isle_of_queldanas.cpp b/src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp
index bfd4d24cec6..bfd4d24cec6 100644
--- a/src/server/scripts/EasternKingdoms/isle_of_queldanas.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp
diff --git a/src/server/scripts/EasternKingdoms/loch_modan.cpp b/src/server/scripts/EasternKingdoms/zone_loch_modan.cpp
index 30f12718d64..30f12718d64 100644
--- a/src/server/scripts/EasternKingdoms/loch_modan.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_loch_modan.cpp
diff --git a/src/server/scripts/EasternKingdoms/redridge_mountains.cpp b/src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp
index 5ff95f83f25..5ff95f83f25 100644
--- a/src/server/scripts/EasternKingdoms/redridge_mountains.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp
diff --git a/src/server/scripts/EasternKingdoms/silvermoon_city.cpp b/src/server/scripts/EasternKingdoms/zone_silvermoon_city.cpp
index e750faefbf5..e750faefbf5 100644
--- a/src/server/scripts/EasternKingdoms/silvermoon_city.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_silvermoon_city.cpp
diff --git a/src/server/scripts/EasternKingdoms/silverpine_forest.cpp b/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
index 290f7fa6882..290f7fa6882 100644
--- a/src/server/scripts/EasternKingdoms/silverpine_forest.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
diff --git a/src/server/scripts/EasternKingdoms/stormwind_city.cpp b/src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
index e81567a1a7a..e81567a1a7a 100644
--- a/src/server/scripts/EasternKingdoms/stormwind_city.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
diff --git a/src/server/scripts/EasternKingdoms/stranglethorn_vale.cpp b/src/server/scripts/EasternKingdoms/zone_stranglethorn_vale.cpp
index 6e14ef840a3..6e14ef840a3 100644
--- a/src/server/scripts/EasternKingdoms/stranglethorn_vale.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_stranglethorn_vale.cpp
diff --git a/src/server/scripts/EasternKingdoms/swamp_of_sorrows.cpp b/src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp
index f686de5d88f..f686de5d88f 100644
--- a/src/server/scripts/EasternKingdoms/swamp_of_sorrows.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp
diff --git a/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp b/src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
index f36220dec0f..f36220dec0f 100644
--- a/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
diff --git a/src/server/scripts/EasternKingdoms/undercity.cpp b/src/server/scripts/EasternKingdoms/zone_undercity.cpp
index 2c3017a2f1a..2c3017a2f1a 100644
--- a/src/server/scripts/EasternKingdoms/undercity.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_undercity.cpp
diff --git a/src/server/scripts/EasternKingdoms/western_plaguelands.cpp b/src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp
index ee22b766154..ee22b766154 100644
--- a/src/server/scripts/EasternKingdoms/western_plaguelands.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp
diff --git a/src/server/scripts/EasternKingdoms/westfall.cpp b/src/server/scripts/EasternKingdoms/zone_westfall.cpp
index 1b93cf1be71..1b93cf1be71 100644
--- a/src/server/scripts/EasternKingdoms/westfall.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_westfall.cpp
diff --git a/src/server/scripts/EasternKingdoms/wetlands.cpp b/src/server/scripts/EasternKingdoms/zone_wetlands.cpp
index c8a1fc2b2b4..c8a1fc2b2b4 100644
--- a/src/server/scripts/EasternKingdoms/wetlands.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_wetlands.cpp
diff --git a/src/server/scripts/Kalimdor/CMakeLists.txt b/src/server/scripts/Kalimdor/CMakeLists.txt
index ee091c96309..5c44cd7ef27 100644
--- a/src/server/scripts/Kalimdor/CMakeLists.txt
+++ b/src/server/scripts/Kalimdor/CMakeLists.txt
@@ -10,9 +10,9 @@
 
 set(scripts_STAT_SRCS
   ${scripts_STAT_SRCS}
-  Kalimdor/stonetalon_mountains.cpp
-  Kalimdor/silithus.cpp
-  Kalimdor/moonglade.cpp
+  Kalimdor/zone_stonetalon_mountains.cpp
+  Kalimdor/zone_silithus.cpp
+  Kalimdor/zone_moonglade.cpp
   Kalimdor/RazorfenDowns/razorfen_downs.cpp
   Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp
   Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp
@@ -58,10 +58,10 @@ set(scripts_STAT_SRCS
   Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp
   Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp
   Kalimdor/BlackfathomDeeps/blackfathom_deeps.h
-  Kalimdor/azuremyst_isle.cpp
-  Kalimdor/orgrimmar.cpp
-  Kalimdor/desolace.cpp
-  Kalimdor/feralas.cpp
+  Kalimdor/zone_azuremyst_isle.cpp
+  Kalimdor/zone_orgrimmar.cpp
+  Kalimdor/zone_desolace.cpp
+  Kalimdor/zone_feralas.cpp
   Kalimdor/Maraudon/boss_princess_theradras.cpp
   Kalimdor/Maraudon/boss_landslide.cpp
   Kalimdor/Maraudon/boss_celebras_the_cursed.cpp
@@ -78,7 +78,7 @@ set(scripts_STAT_SRCS
   Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp
   Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp
   Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp
-  Kalimdor/darkshore.cpp
+  Kalimdor/zone_darkshore.cpp
   Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp
   Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp
   Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp
@@ -87,27 +87,27 @@ set(scripts_STAT_SRCS
   Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp
   Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.h
   Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp
-  Kalimdor/mulgore.cpp
-  Kalimdor/bloodmyst_isle.cpp
-  Kalimdor/thunder_bluff.cpp
-  Kalimdor/azshara.cpp
+  Kalimdor/zone_mulgore.cpp
+  Kalimdor/zone_bloodmyst_isle.cpp
+  Kalimdor/zone_thunder_bluff.cpp
+  Kalimdor/zone_azshara.cpp
   Kalimdor/RazorfenKraul/razorfen_kraul.h
   Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp
   Kalimdor/RazorfenKraul/razorfen_kraul.cpp
-  Kalimdor/the_barrens.cpp
-  Kalimdor/ungoro_crater.cpp
+  Kalimdor/zone_the_barrens.cpp
+  Kalimdor/zone_ungoro_crater.cpp
   Kalimdor/WailingCaverns/wailing_caverns.h
   Kalimdor/WailingCaverns/instance_wailing_caverns.cpp
   Kalimdor/WailingCaverns/wailing_caverns.cpp
-  Kalimdor/durotar.cpp
-  Kalimdor/felwood.cpp
+  Kalimdor/zone_durotar.cpp
+  Kalimdor/zone_felwood.cpp
   Kalimdor/boss_azuregos.cpp
-  Kalimdor/tanaris.cpp
-  Kalimdor/dustwallow_marsh.cpp
-  Kalimdor/winterspring.cpp
-  Kalimdor/thousand_needles.cpp
-  Kalimdor/ashenvale.cpp
-  Kalimdor/teldrassil.cpp
+  Kalimdor/zone_tanaris.cpp
+  Kalimdor/zone_dustwallow_marsh.cpp
+  Kalimdor/zone_winterspring.cpp
+  Kalimdor/zone_thousand_needles.cpp
+  Kalimdor/zone_ashenvale.cpp
+  Kalimdor/zone_teldrassil.cpp
   Kalimdor/OnyxiasLair/boss_onyxia.cpp
   Kalimdor/OnyxiasLair/onyxias_lair.h
   Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp
diff --git a/src/server/scripts/Kalimdor/ashenvale.cpp b/src/server/scripts/Kalimdor/zone_ashenvale.cpp
index 94c68a1d3ec..94c68a1d3ec 100644
--- a/src/server/scripts/Kalimdor/ashenvale.cpp
+++ b/src/server/scripts/Kalimdor/zone_ashenvale.cpp
diff --git a/src/server/scripts/Kalimdor/azshara.cpp b/src/server/scripts/Kalimdor/zone_azshara.cpp
index 44f7e1e8172..44f7e1e8172 100644
--- a/src/server/scripts/Kalimdor/azshara.cpp
+++ b/src/server/scripts/Kalimdor/zone_azshara.cpp
diff --git a/src/server/scripts/Kalimdor/azuremyst_isle.cpp b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp
index 4b03cd65cad..4b03cd65cad 100644
--- a/src/server/scripts/Kalimdor/azuremyst_isle.cpp
+++ b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp
diff --git a/src/server/scripts/Kalimdor/bloodmyst_isle.cpp b/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp
index 102a9494a65..102a9494a65 100644
--- a/src/server/scripts/Kalimdor/bloodmyst_isle.cpp
+++ b/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp
diff --git a/src/server/scripts/Kalimdor/darkshore.cpp b/src/server/scripts/Kalimdor/zone_darkshore.cpp
index 09f061148d3..09f061148d3 100644
--- a/src/server/scripts/Kalimdor/darkshore.cpp
+++ b/src/server/scripts/Kalimdor/zone_darkshore.cpp
diff --git a/src/server/scripts/Kalimdor/desolace.cpp b/src/server/scripts/Kalimdor/zone_desolace.cpp
index 8f55bb6102c..8f55bb6102c 100644
--- a/src/server/scripts/Kalimdor/desolace.cpp
+++ b/src/server/scripts/Kalimdor/zone_desolace.cpp
diff --git a/src/server/scripts/Kalimdor/durotar.cpp b/src/server/scripts/Kalimdor/zone_durotar.cpp
index fa6b830c1ae..fa6b830c1ae 100644
--- a/src/server/scripts/Kalimdor/durotar.cpp
+++ b/src/server/scripts/Kalimdor/zone_durotar.cpp
diff --git a/src/server/scripts/Kalimdor/dustwallow_marsh.cpp b/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp
index 37941227c78..37941227c78 100644
--- a/src/server/scripts/Kalimdor/dustwallow_marsh.cpp
+++ b/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp
diff --git a/src/server/scripts/Kalimdor/felwood.cpp b/src/server/scripts/Kalimdor/zone_felwood.cpp
index e23eaa961bb..e23eaa961bb 100644
--- a/src/server/scripts/Kalimdor/felwood.cpp
+++ b/src/server/scripts/Kalimdor/zone_felwood.cpp
diff --git a/src/server/scripts/Kalimdor/feralas.cpp b/src/server/scripts/Kalimdor/zone_feralas.cpp
index b2326de86ab..b2326de86ab 100644
--- a/src/server/scripts/Kalimdor/feralas.cpp
+++ b/src/server/scripts/Kalimdor/zone_feralas.cpp
diff --git a/src/server/scripts/Kalimdor/moonglade.cpp b/src/server/scripts/Kalimdor/zone_moonglade.cpp
index e41ffae03e6..e41ffae03e6 100644
--- a/src/server/scripts/Kalimdor/moonglade.cpp
+++ b/src/server/scripts/Kalimdor/zone_moonglade.cpp
diff --git a/src/server/scripts/Kalimdor/mulgore.cpp b/src/server/scripts/Kalimdor/zone_mulgore.cpp
index aca55284b67..aca55284b67 100644
--- a/src/server/scripts/Kalimdor/mulgore.cpp
+++ b/src/server/scripts/Kalimdor/zone_mulgore.cpp
diff --git a/src/server/scripts/Kalimdor/orgrimmar.cpp b/src/server/scripts/Kalimdor/zone_orgrimmar.cpp
index 42ef9843a4e..42ef9843a4e 100644
--- a/src/server/scripts/Kalimdor/orgrimmar.cpp
+++ b/src/server/scripts/Kalimdor/zone_orgrimmar.cpp
diff --git a/src/server/scripts/Kalimdor/silithus.cpp b/src/server/scripts/Kalimdor/zone_silithus.cpp
index 58665224bdd..58665224bdd 100644
--- a/src/server/scripts/Kalimdor/silithus.cpp
+++ b/src/server/scripts/Kalimdor/zone_silithus.cpp
diff --git a/src/server/scripts/Kalimdor/stonetalon_mountains.cpp b/src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp
index 26c92c7404c..26c92c7404c 100644
--- a/src/server/scripts/Kalimdor/stonetalon_mountains.cpp
+++ b/src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp
diff --git a/src/server/scripts/Kalimdor/tanaris.cpp b/src/server/scripts/Kalimdor/zone_tanaris.cpp
index 0648e40416d..0648e40416d 100644
--- a/src/server/scripts/Kalimdor/tanaris.cpp
+++ b/src/server/scripts/Kalimdor/zone_tanaris.cpp
diff --git a/src/server/scripts/Kalimdor/teldrassil.cpp b/src/server/scripts/Kalimdor/zone_teldrassil.cpp
index d7983c2cbe6..d7983c2cbe6 100644
--- a/src/server/scripts/Kalimdor/teldrassil.cpp
+++ b/src/server/scripts/Kalimdor/zone_teldrassil.cpp
diff --git a/src/server/scripts/Kalimdor/the_barrens.cpp b/src/server/scripts/Kalimdor/zone_the_barrens.cpp
index 8f7ab09260b..8f7ab09260b 100644
--- a/src/server/scripts/Kalimdor/the_barrens.cpp
+++ b/src/server/scripts/Kalimdor/zone_the_barrens.cpp
diff --git a/src/server/scripts/Kalimdor/thousand_needles.cpp b/src/server/scripts/Kalimdor/zone_thousand_needles.cpp
index 9c47991a5d5..9c47991a5d5 100644
--- a/src/server/scripts/Kalimdor/thousand_needles.cpp
+++ b/src/server/scripts/Kalimdor/zone_thousand_needles.cpp
diff --git a/src/server/scripts/Kalimdor/thunder_bluff.cpp b/src/server/scripts/Kalimdor/zone_thunder_bluff.cpp
index 0d915dc7c44..0d915dc7c44 100644
--- a/src/server/scripts/Kalimdor/thunder_bluff.cpp
+++ b/src/server/scripts/Kalimdor/zone_thunder_bluff.cpp
diff --git a/src/server/scripts/Kalimdor/ungoro_crater.cpp b/src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
index e72c82bee97..e72c82bee97 100644
--- a/src/server/scripts/Kalimdor/ungoro_crater.cpp
+++ b/src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
diff --git a/src/server/scripts/Kalimdor/winterspring.cpp b/src/server/scripts/Kalimdor/zone_winterspring.cpp
index 06f01033a25..06f01033a25 100644
--- a/src/server/scripts/Kalimdor/winterspring.cpp
+++ b/src/server/scripts/Kalimdor/zone_winterspring.cpp
diff --git a/src/server/scripts/Northrend/CMakeLists.txt b/src/server/scripts/Northrend/CMakeLists.txt
index 233d49192e6..1da1e4ab178 100644
--- a/src/server/scripts/Northrend/CMakeLists.txt
+++ b/src/server/scripts/Northrend/CMakeLists.txt
@@ -10,9 +10,9 @@
 
 set(scripts_STAT_SRCS
   ${scripts_STAT_SRCS}
-  Northrend/wintergrasp.cpp
+  Northrend/zone_wintergrasp.cpp
   Northrend/isle_of_conquest.cpp
-  Northrend/storm_peaks.cpp
+  Northrend/zone_storm_peaks.cpp
   Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp
   Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp
   Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h
@@ -78,8 +78,8 @@ set(scripts_STAT_SRCS
   Northrend/Nexus/Oculus/boss_urom.cpp
   Northrend/Nexus/Oculus/oculus.cpp
   Northrend/Nexus/Oculus/instance_oculus.cpp
-  Northrend/Nexus/Nexus/commander_kolurg.cpp
-  Northrend/Nexus/Nexus/commander_stoutbeard.cpp
+  Northrend/Nexus/Nexus/boss_commander_kolurg.cpp
+  Northrend/Nexus/Nexus/boss_commander_stoutbeard.cpp
   Northrend/Nexus/Nexus/boss_ormorok.cpp
   Northrend/Nexus/Nexus/boss_magus_telestra.cpp
   Northrend/Nexus/Nexus/instance_nexus.cpp
@@ -117,14 +117,14 @@ set(scripts_STAT_SRCS
   Northrend/Naxxramas/instance_naxxramas.cpp
   Northrend/Naxxramas/boss_grobbulus.cpp
   Northrend/Naxxramas/boss_noth.cpp
-  Northrend/crystalsong_forest.cpp
+  Northrend/zone_crystalsong_forest.cpp
   Northrend/VaultOfArchavon/boss_archavon.cpp
   Northrend/VaultOfArchavon/boss_koralon.cpp
   Northrend/VaultOfArchavon/vault_of_archavon.h
   Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp
   Northrend/VaultOfArchavon/boss_emalon.cpp
   Northrend/VaultOfArchavon/boss_toravon.cpp
-  Northrend/sholazar_basin.cpp
+  Northrend/zone_sholazar_basin.cpp
   Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp
   Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
   Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp
@@ -137,8 +137,8 @@ set(scripts_STAT_SRCS
   Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp
   Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp
   Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp
-  Northrend/dragonblight.cpp
-  Northrend/grizzly_hills.cpp
+  Northrend/zone_dragonblight.cpp
+  Northrend/zone_grizzly_hills.cpp
   Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h
   Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp
   Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp
@@ -176,8 +176,8 @@ set(scripts_STAT_SRCS
   Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp
   Northrend/IcecrownCitadel/boss_sindragosa.cpp
   Northrend/IcecrownCitadel/boss_the_lich_king.cpp
-  Northrend/zuldrak.cpp
-  Northrend/icecrown.cpp
+  Northrend/zone_zuldrak.cpp
+  Northrend/zone_icecrown.cpp
   Northrend/Gundrak/boss_slad_ran.cpp
   Northrend/Gundrak/instance_gundrak.cpp
   Northrend/Gundrak/boss_drakkari_colossus.cpp
@@ -185,9 +185,9 @@ set(scripts_STAT_SRCS
   Northrend/Gundrak/boss_gal_darah.cpp
   Northrend/Gundrak/boss_moorabi.cpp
   Northrend/Gundrak/boss_eck.cpp
-  Northrend/borean_tundra.cpp
-  Northrend/howling_fjord.cpp
-  Northrend/dalaran.cpp
+  Northrend/zone_borean_tundra.cpp
+  Northrend/zone_howling_fjord.cpp
+  Northrend/zone_dalaran.cpp
   Northrend/DraktharonKeep/boss_trollgore.cpp
   Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp
   Northrend/DraktharonKeep/boss_novos.cpp
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/commander_kolurg.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_kolurg.cpp
index fedb1f5cebc..fedb1f5cebc 100644
--- a/src/server/scripts/Northrend/Nexus/Nexus/commander_kolurg.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_kolurg.cpp
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/commander_stoutbeard.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard.cpp
index 39c93f15d6f..39c93f15d6f 100644
--- a/src/server/scripts/Northrend/Nexus/Nexus/commander_stoutbeard.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard.cpp
diff --git a/src/server/scripts/Northrend/borean_tundra.cpp b/src/server/scripts/Northrend/zone_borean_tundra.cpp
index 8e7507bce61..8e7507bce61 100644
--- a/src/server/scripts/Northrend/borean_tundra.cpp
+++ b/src/server/scripts/Northrend/zone_borean_tundra.cpp
diff --git a/src/server/scripts/Northrend/crystalsong_forest.cpp b/src/server/scripts/Northrend/zone_crystalsong_forest.cpp
index d12b5176b15..d12b5176b15 100644
--- a/src/server/scripts/Northrend/crystalsong_forest.cpp
+++ b/src/server/scripts/Northrend/zone_crystalsong_forest.cpp
diff --git a/src/server/scripts/Northrend/dalaran.cpp b/src/server/scripts/Northrend/zone_dalaran.cpp
index d16b6fe4588..d16b6fe4588 100644
--- a/src/server/scripts/Northrend/dalaran.cpp
+++ b/src/server/scripts/Northrend/zone_dalaran.cpp
diff --git a/src/server/scripts/Northrend/dragonblight.cpp b/src/server/scripts/Northrend/zone_dragonblight.cpp
index a8fb0215902..a8fb0215902 100644
--- a/src/server/scripts/Northrend/dragonblight.cpp
+++ b/src/server/scripts/Northrend/zone_dragonblight.cpp
diff --git a/src/server/scripts/Northrend/grizzly_hills.cpp b/src/server/scripts/Northrend/zone_grizzly_hills.cpp
index fe1f561071c..fe1f561071c 100644
--- a/src/server/scripts/Northrend/grizzly_hills.cpp
+++ b/src/server/scripts/Northrend/zone_grizzly_hills.cpp
diff --git a/src/server/scripts/Northrend/howling_fjord.cpp b/src/server/scripts/Northrend/zone_howling_fjord.cpp
index ff4d8ec7a79..ff4d8ec7a79 100644
--- a/src/server/scripts/Northrend/howling_fjord.cpp
+++ b/src/server/scripts/Northrend/zone_howling_fjord.cpp
diff --git a/src/server/scripts/Northrend/icecrown.cpp b/src/server/scripts/Northrend/zone_icecrown.cpp
index 2ec5a3e8164..2ec5a3e8164 100644
--- a/src/server/scripts/Northrend/icecrown.cpp
+++ b/src/server/scripts/Northrend/zone_icecrown.cpp
diff --git a/src/server/scripts/Northrend/sholazar_basin.cpp b/src/server/scripts/Northrend/zone_sholazar_basin.cpp
index 2aa355084a1..2aa355084a1 100644
--- a/src/server/scripts/Northrend/sholazar_basin.cpp
+++ b/src/server/scripts/Northrend/zone_sholazar_basin.cpp
diff --git a/src/server/scripts/Northrend/storm_peaks.cpp b/src/server/scripts/Northrend/zone_storm_peaks.cpp
index 85ab1dc1127..85ab1dc1127 100644
--- a/src/server/scripts/Northrend/storm_peaks.cpp
+++ b/src/server/scripts/Northrend/zone_storm_peaks.cpp
diff --git a/src/server/scripts/Northrend/wintergrasp.cpp b/src/server/scripts/Northrend/zone_wintergrasp.cpp
index 8935c77b30e..8935c77b30e 100644
--- a/src/server/scripts/Northrend/wintergrasp.cpp
+++ b/src/server/scripts/Northrend/zone_wintergrasp.cpp
diff --git a/src/server/scripts/Northrend/zuldrak.cpp b/src/server/scripts/Northrend/zone_zuldrak.cpp
index 69e8d900435..69e8d900435 100644
--- a/src/server/scripts/Northrend/zuldrak.cpp
+++ b/src/server/scripts/Northrend/zone_zuldrak.cpp
diff --git a/src/server/scripts/Outland/CMakeLists.txt b/src/server/scripts/Outland/CMakeLists.txt
index 173af3374ad..f038af07634 100644
--- a/src/server/scripts/Outland/CMakeLists.txt
+++ b/src/server/scripts/Outland/CMakeLists.txt
@@ -10,7 +10,7 @@
 
 set(scripts_STAT_SRCS
   ${scripts_STAT_SRCS}
-  Outland/nagrand.cpp
+  Outland/zone_nagrand.cpp
   Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h
   Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp
   Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
@@ -44,7 +44,7 @@ set(scripts_STAT_SRCS
   Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp
   Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp
   Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp
-  Outland/shattrath_city.cpp
+  Outland/zone_shattrath_city.cpp
   Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp
   Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
   Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
@@ -62,7 +62,7 @@ set(scripts_STAT_SRCS
   Outland/TempestKeep/botanica/the_botanica.h
   Outland/TempestKeep/botanica/instance_the_botanica.cpp
   Outland/TempestKeep/botanica/boss_commander_sarannis.cpp
-  Outland/TempestKeep/botanica/thorngrin_the_tender.cpp
+  Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp
   Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp
   Outland/TempestKeep/botanica/boss_warp_splinter.cpp
   Outland/TempestKeep/botanica/boss_laj.cpp
@@ -85,8 +85,8 @@ set(scripts_STAT_SRCS
   Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h
   Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp
   Outland/boss_doomwalker.cpp
-  Outland/terokkar_forest.cpp
-  Outland/hellfire_peninsula.cpp
+  Outland/zone_terokkar_forest.cpp
+  Outland/zone_hellfire_peninsula.cpp
   Outland/boss_doomlord_kazzak.cpp
   Outland/BlackTemple/boss_teron_gorefiend.cpp
   Outland/BlackTemple/black_temple.h
@@ -100,14 +100,14 @@ set(scripts_STAT_SRCS
   Outland/BlackTemple/boss_warlord_najentus.cpp
   Outland/BlackTemple/boss_bloodboil.cpp
   Outland/BlackTemple/boss_illidan.cpp
-  Outland/shadowmoon_valley.cpp
-  Outland/blades_edge_mountains.cpp
+  Outland/zone_shadowmoon_valley.cpp
+  Outland/zone_blades_edge_mountains.cpp
   Outland/GruulsLair/boss_high_king_maulgar.cpp
   Outland/GruulsLair/boss_gruul.cpp
   Outland/GruulsLair/gruuls_lair.h
   Outland/GruulsLair/instance_gruuls_lair.cpp
-  Outland/netherstorm.cpp
-  Outland/zangarmarsh.cpp
+  Outland/zone_netherstorm.cpp
+  Outland/zone_zangarmarsh.cpp
 )
 
 message("  -> Prepared: Outland")
diff --git a/src/server/scripts/Outland/TempestKeep/botanica/thorngrin_the_tender.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp
index ffd48f4dcb5..ffd48f4dcb5 100644
--- a/src/server/scripts/Outland/TempestKeep/botanica/thorngrin_the_tender.cpp
+++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp
diff --git a/src/server/scripts/Outland/blades_edge_mountains.cpp b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp
index d03abc82b9c..d03abc82b9c 100644
--- a/src/server/scripts/Outland/blades_edge_mountains.cpp
+++ b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp
diff --git a/src/server/scripts/Outland/hellfire_peninsula.cpp b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp
index 64b484268df..64b484268df 100644
--- a/src/server/scripts/Outland/hellfire_peninsula.cpp
+++ b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp
diff --git a/src/server/scripts/Outland/nagrand.cpp b/src/server/scripts/Outland/zone_nagrand.cpp
index 0a92b985c95..0a92b985c95 100644
--- a/src/server/scripts/Outland/nagrand.cpp
+++ b/src/server/scripts/Outland/zone_nagrand.cpp
diff --git a/src/server/scripts/Outland/netherstorm.cpp b/src/server/scripts/Outland/zone_netherstorm.cpp
index 769ee7dc68d..769ee7dc68d 100644
--- a/src/server/scripts/Outland/netherstorm.cpp
+++ b/src/server/scripts/Outland/zone_netherstorm.cpp
diff --git a/src/server/scripts/Outland/shadowmoon_valley.cpp b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp
index 0a016f0923c..0a016f0923c 100644
--- a/src/server/scripts/Outland/shadowmoon_valley.cpp
+++ b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp
diff --git a/src/server/scripts/Outland/shattrath_city.cpp b/src/server/scripts/Outland/zone_shattrath_city.cpp
index ac26614ae69..ac26614ae69 100644
--- a/src/server/scripts/Outland/shattrath_city.cpp
+++ b/src/server/scripts/Outland/zone_shattrath_city.cpp
diff --git a/src/server/scripts/Outland/terokkar_forest.cpp b/src/server/scripts/Outland/zone_terokkar_forest.cpp
index 2b046a7518e..2b046a7518e 100644
--- a/src/server/scripts/Outland/terokkar_forest.cpp
+++ b/src/server/scripts/Outland/zone_terokkar_forest.cpp
diff --git a/src/server/scripts/Outland/zangarmarsh.cpp b/src/server/scripts/Outland/zone_zangarmarsh.cpp
index 319da372bf8..319da372bf8 100644
--- a/src/server/scripts/Outland/zangarmarsh.cpp
+++ b/src/server/scripts/Outland/zone_zangarmarsh.cpp
author	Vincent_Michael <Vincent_Michael@gmx.de>	2013-01-02 22:03:35 +0100
committer	Vincent_Michael <Vincent_Michael@gmx.de>	2013-01-02 22:03:35 +0100
commit	ee2e776fea38313669fba1f5cb008be648daf7fc (patch)
tree	783681f4692815351e13524a2cb13124ca5a2093
parent	5bbf7829b21e9a3d7f7c4e068ce779c5975b8c36 (diff)
parent	57c275f3e176d561cff5823ab1a89054aba033ef (diff)