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

Conflicts:
	src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp

19 files changed, 309 insertions, 0 deletions

diff --git a/sql/updates/world/2013_01_07_00_world_sai.sql b/sql/updates/world/2013_01_07_00_world_sai.sql
new file mode 100644
index 00000000000..e289130ddef
--- /dev/null
+++ b/sql/updates/world/2013_01_07_00_world_sai.sql
@@ -0,0 +1,24 @@
+-- SAI for Amani'shi Guardian
+SET @ENTRY := 23597;
+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,2,0,38,0,100,2,0,1,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Amani''shi Guardian - On data set 1 - Set Phase 1'),
+(@ENTRY,0,3,0,38,0,100,2,0,2,0,0,22,2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Amani''shi Guardian - On data set 2 - Set Phase 2'),
+-- Script 0
+(@ENTRY,0,4,0,1,1,100,3,0,0,0,0,45,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Amani''shi Guardian - Script - Set data 0'),
+(@ENTRY,0,5,0,1,1,100,3,0,0,0,0,59,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Amani''shi Guardian - Script - Set Run on'),
+(@ENTRY,0,6,0,1,1,100,3,2000,2000,2000,2000,69,0,0,0,0,0,0,8,0,0,0,138.2242,1586.994,43.5488,0, 'Amani''shi Guardian - Script - Move to'),
+(@ENTRY,0,7,0,1,1,100,3,3000,3000,3000,3000,69,0,0,0,0,0,0,8,0,0,0,131.8407,1590.247,43.61384,0, 'Amani''shi Guardian - Script - Move to'),
+(@ENTRY,0,8,0,1,1,100,3,4000,4000,4000,4000,66,0,0,0,0,0,0,8,0,0,0,0,0,0,2.024582, 'Amani''shi Guardian - Script - Turn to'),
+(@ENTRY,0,9,0,1,1,100,3,5000,5000,5000,5000,11,43647,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Amani''shi Guardian - Script - Cast'),
+(@ENTRY,0,10,0,1,1,100,3,5200,5200,5200,5200,71,0,1,33979,0,0,0,1,0,0,0,0,0,0,0, 'Amani''shi Guardian - Script - Change equipment'),
+(@ENTRY,0,11,0,1,1,100,3,6000,6000,6000,6000,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Amani''shi Guardian - Script - Say 0'),
+(@ENTRY,0,12,0,1,1,100,3,6200,6200,6200,6200,19,256,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Amani''shi Guardian - Script - Remove Unit Flag'),
+(@ENTRY,0,13,0,1,1,100,3,7000,7000,7000,7000,49,0,0,0,0,0,0,21,50,0,0,0,0,0,0, 'Amani''shi Guardian - Script - Attack Cloest player'),
+-- Script 1
+(@ENTRY,0,14,0,1,2,100,3,0,0,0,0,45,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Amani''shi Guardian - Script - Set data 0'),
+(@ENTRY,0,15,0,1,2,100,3,0,0,0,0,59,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Amani''shi Guardian - Script - Set Run on'),
+(@ENTRY,0,16,0,1,2,100,3,6000,6000,6000,6000,69,0,0,0,0,0,0,8,0,0,0,107.7912,1586.498,43.61609,0, 'Amani''shi Guardian - Script - Move to'),
+(@ENTRY,0,17,0,1,2,100,3,6800,6800,6800,6800,66,0,0,0,0,0,0,8,0,0,0,0,0,0,1.047198, 'Amani''shi Guardian - Script - Turn to'),
+(@ENTRY,0,18,0,1,2,100,3,7600,7600,7600,7600,19,256,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Amani''shi Guardian - Script - Remove Unit Flag'),
+(@ENTRY,0,19,0,1,2,100,3,7800,7800,7800,7800,49,0,0,0,0,0,0,21,50,0,0,0,0,0,0, 'Amani''shi Guardian - Script - Attack Cloest player');
diff --git a/sql/updates/world/2013_01_07_01_world_creature_addon.sql b/sql/updates/world/2013_01_07_01_world_creature_addon.sql
new file mode 100644
index 00000000000..a83bd028343
--- /dev/null
+++ b/sql/updates/world/2013_01_07_01_world_creature_addon.sql
@@ -0,0 +1,30 @@
+DELETE FROM `creature_addon` WHERE `guid` IN (
+ -- Defias Evoker
+79171,79177,79281,79360,79374,
+ -- Defias Squallshaper
+79302,79306,79313,79322,79327,79329,79335,79338,79351,79352,79354,79355,
+ -- Defias Rogue Wizard
+80383,80389,80390,80744,81105,81170,81173,81176,
+ -- Shadowfang Whitescalp
+3479,3480,3482,3483,11514,18308,18313,
+ -- Defias Enchanter
+4279,4321,4874,
+ -- Skeletal Mage
+5992,5996,5997,6000,6003,6004,
+ -- Defias Pillager
+45549,53862,53962,54439,89667,90286,90291,90334,90356,
+ -- Mosshide Mistweaver
+9822,9868,10490,10620,
+ -- Drywhisker Surveyor
+11944,11946,11955,
+ -- Magistrate Henry Maleb
+15322,
+ -- Hillsbrad Councilman
+15642,15751,15957,15967,15986,15988,15989,15995,
+ -- Syndicate Wizard
+16959,17007,17011,17012,17015,17016,17022,17023,17024,17025,17027,
+ -- Dalaran Wizard
+17608,17609,17742,17743,17749,17750,17751,17753,17754,17837,17840,17843,17847,17852,17995,18009,18010,18122,18123,18124,18351,18357,18363,18368,18369,19213,19215,28321,28378,28409,
+-- Vile Fin Tidehunter
+17615,17616,17640,17668,17694,17715,17716,17728,17737,17764,17766,17805,17806,17818,17819,17820,17900,17932,17933,18213,18215,19043,19045,19054); 
+
diff --git a/sql/updates/world/2013_01_07_02_world_creature_text.sql b/sql/updates/world/2013_01_07_02_world_creature_text.sql
new file mode 100644
index 00000000000..3e916464615
--- /dev/null
+++ b/sql/updates/world/2013_01_07_02_world_creature_text.sql
@@ -0,0 +1,15 @@
+-- Texts for Valkyr Battle Maiden
+DELETE FROM `creature_text` WHERE `entry`= 28534;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(28534,0,0, 'It is not yet your time, champion. Rise! Rise and fight once more!',15,0,100,0,0,0, 'Valkyr Battle Maiden');
+
+-- Texts for Dark Rider of Acherus
+DELETE FROM `creature_text` WHERE `entry`= 28654;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(28654,0,0, 'The realm of shadows awaits...',12,0,100,0,0,0, 'Dark Rider of Acherus');
+
+-- Texts for Scarlet Miner
+DELETE FROM `creature_text` WHERE `entry`= 28841;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(28841,0,0, 'Where''d this come from? I better get this down to the ships before the foreman sees it!',12,0,100,0,0,0, 'Scarlet Miner'),
+(28841,1,0, "Now I can have a rest!",12,0,100,0,0,0, 'Scarlet Miner');
diff --git a/sql/updates/world/2013_01_07_03_world_creature_text.sql b/sql/updates/world/2013_01_07_03_world_creature_text.sql
new file mode 100644
index 00000000000..c006dc5ef99
--- /dev/null
+++ b/sql/updates/world/2013_01_07_03_world_creature_text.sql
@@ -0,0 +1,10 @@
+-- Texts for Akil'zon
+DELETE FROM `creature_text` WHERE `entry`= 23574;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(23574,0,0, 'I be da predator! You da prey...',14,0,100,0,0,12013, 'Akil''zon On Aggro'),
+(23574,1,0, 'Feed, me bruddahs!',14,0,100,0,0,12014, 'Akil''zon On Summon'),
+(23574,2,0, 'Your death gonna be quick, strangers. You shoulda never have come to this place...',14,0,100,0,0,12015, 'Akil''zon Intro'),
+(23574,3,0, 'All you be doing is wasting my time!',14,0,100,0,0,12016, 'Akil''zon On Enrage'),
+(23574,4,0, 'Ya got nothin''!',14,0,100,0,0,12017, 'Akil''zon On Player Kill'),
+(23574,4,1, 'Stop your cryin''!',14,0,100,0,0,12018, 'Akil''zon On Player Kill'),
+(23574,5,0, 'You can''t... kill... me spirit!',14,0,100,0,0,12019, 'Akil''zon On Dearh');
diff --git a/sql/updates/world/2013_01_07_04_world_creature_text.sql b/sql/updates/world/2013_01_07_04_world_creature_text.sql
new file mode 100644
index 00000000000..6fd1d3b95a7
--- /dev/null
+++ b/sql/updates/world/2013_01_07_04_world_creature_text.sql
@@ -0,0 +1,7 @@
+-- Texts for Archaedas
+DELETE FROM `creature_text` WHERE `entry`= 2748;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(2748,0,0, 'Who dares awaken Archaedas? Who dares the wrath of the makers!',14,0,100,0,0,5855, 'Archaedas On Aggro'),
+(2748,1,0, 'Awake ye servants, defend the discs!',14,0,100,0,0,5856, 'Archaedas On Summon Guardians'),
+(2748,2,0, 'To my side, brothers. For the makers!',14,0,100,0,0,5857, 'Archaedas On Summon Vault Walkers'),
+(2748,3,0, 'Reckless mortal.',14,0,100,0,0,5858, 'Archaedas On Player Kill');
diff --git a/sql/updates/world/2013_01_07_05_world_creature_text.sql b/sql/updates/world/2013_01_07_05_world_creature_text.sql
new file mode 100644
index 00000000000..d9d91e784ba
--- /dev/null
+++ b/sql/updates/world/2013_01_07_05_world_creature_text.sql
@@ -0,0 +1,4 @@
+-- Texts for Archavon the Stone Watcher
+DELETE FROM `creature_text` WHERE `entry`= 31125 AND `groupid`=1;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(31125,1,0, 'Archavon the Stone Watcher lunges for $N!',16,0,100,0,0,0, 'Archavon the Stone Watcher Leap Emote');
diff --git a/sql/updates/world/2013_01_07_06_world_creature_text.sql b/sql/updates/world/2013_01_07_06_world_creature_text.sql
new file mode 100644
index 00000000000..5c7d09f9887
--- /dev/null
+++ b/sql/updates/world/2013_01_07_06_world_creature_text.sql
@@ -0,0 +1,4 @@
+-- Texts for Ayamiss the Hunter
+DELETE FROM `creature_text` WHERE `entry`= 15369;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(15369,0,0, '%s goes into a frenzy!',16,0,100,0,0,0, 'Ayamiss the Hunter Frenzy Emote');
diff --git a/sql/updates/world/2013_01_07_07_world_creature_text.sql b/sql/updates/world/2013_01_07_07_world_creature_text.sql
new file mode 100644
index 00000000000..6f6a0b75713
--- /dev/null
+++ b/sql/updates/world/2013_01_07_07_world_creature_text.sql
@@ -0,0 +1,9 @@
+-- Texts for Baron Rivendare (Strathhome)
+DELETE FROM `creature_text` WHERE `entry`= 15369;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(15369,0,0, 'Intruders! More pawns of the Argent Dawn, no doubt. I already count one of their number among my prisoners. Withdraw from my domain before she is executed!',14,0,100,0,0,0, 'Baron Rivendare - Baron Run Start'),
+(15369,1,0, 'You''re still here? Your foolishness is amusing! The Argent Dawn wench needn''t suffer in vain. Leave at once and she shall be spared!',14,0,100,0,0,0, 'Baron Rivendare - Baron Run in progress random'),
+(15369,1,1, 'I shall take great pleasure in taking this poor wretch''s life! It''s not too late, she needn''t suffer in vain. Turn back and her death shall be merciful!',14,0,100,0,0,0, 'Baron Rivendare - Baron Run in progress random'),
+(15369,2,0, 'May this prisoner''s death serve as a warning. None shall defy the Scourge and live!',14,0,100,0,0,0, 'Baron Rivendare - Baron Run Fail'),
+(15369,3,0, 'So you see fit to toy with the Lich King''s creations? Ramstein, be sure to give the intruders a proper greeting.',14,0,100,0,0,0, 'Baron Rivendare - Event Ramstein'),
+(15369,4,0, 'Time to take matters into my own hands. Come. Enter my domain and challenge the might of the Scourge!',14,0,100,0,0,0, 'Baron Rivendare - Event Baron');
diff --git a/sql/updates/world/2013_01_07_08_world_creature_text.sql b/sql/updates/world/2013_01_07_08_world_creature_text.sql
new file mode 100644
index 00000000000..94ab4d925ee
--- /dev/null
+++ b/sql/updates/world/2013_01_07_08_world_creature_text.sql
@@ -0,0 +1,14 @@
+-- Texts for Zul'jin
+DELETE FROM `creature_text` WHERE `entry`= 23863;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(23863,0,0, 'Everybody always wanna take from us. Now we gonna start takin'' back. Anybody who get in our way...gonna drown in their own blood! De Amani empire be back now...seekin'' vengeance. And we gonna start...with you!',14,0,100,0,0,12090, 'Zul''jin YELL_INTRO'),
+(23863,1,0, 'Nobody badduh dan me!',14,0,100,0,0,12091, 'Zul''jin YELL_AGGRO'),
+(23863,2,0, 'Got me some new tricks...like me bruddah bear!',14,0,100,0,0,12092, 'Zul''jin YELL_TRANSFORM_TO_BEAR'),
+(23863,3,0, 'Dere be no hidin'' from da eagle!',14,0,100,0,0,12093, 'Zul''jin YELL_TRANSFORM_TO_EAGLE'),
+(23863,4,0, 'Let me introduce to you my new bruddahs: fang and claw!',14,0,100,0,0,12094, 'Zul''jin YELL_TRANSFORM_TO_LYNX'),
+(23863,5,0, 'Ya don'' have to look to da sky to see da dragonhawk!',14,0,100,0,0,12095, 'Zul''jin YELL_TRANSFORM_TO_DRAGONHAWK'),
+(23863,6,0, 'Fire kill you just as quick!',14,0,100,0,0,12096, 'Zul''jin YELL_FIRE_BREATH'),
+(23863,7,0, 'You too slow! Me too strong!',14,0,100,0,0,12097, 'Zul''jin YELL_BERSERK'),
+(23863,8,0, 'Da Amani de chuka!',14,0,100,0,0,12098, 'Zul''jin YELL_KILL'),
+(23863,8,1, 'Lot more gonna fall like you!',14,0,100,0,0,12099, 'Zul''jin YELL_KILL'),
+(23863,9,0, 'Mebbe me fall...but da Amani empire...never gonna die...',14,0,100,0,0,12100, 'Zul''jin YELL_DEATH');
diff --git a/sql/updates/world/2013_01_07_09_world_buru.sql b/sql/updates/world/2013_01_07_09_world_buru.sql
new file mode 100644
index 00000000000..a7e1d5a0ef1
--- /dev/null
+++ b/sql/updates/world/2013_01_07_09_world_buru.sql
@@ -0,0 +1,23 @@
+UPDATE `creature_template` SET ScriptName='npc_buru_egg' WHERE entry=15514;
+UPDATE `creature_template` SET `faction_A`=16,`faction_H`=16 WHERE `entry` IN (15514,15370);
+DELETE FROM `creature` WHERE `id`=15521; -- because **** you, thats why
+SET @GUID :=61988;
+DELETE FROM `creature` WHERE `id`=15514;
+INSERT INTO `creature` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `MovementType`) VALUES
+(@GUID, 15514, 509, 1, 1, -9270.393, 1243.896, -63.76731, 2.722714, 7200, 0, 0),
+(@GUID+1, 15514, 509, 1, 1, -9300.067, 1305.085, -63.69709, 4.18879, 7200, 0, 0),
+(@GUID+2, 15514, 509, 1, 1, -9263.014, 1295.236, -63.80813, 1.797689, 7200, 0, 0),
+(@GUID+3, 15514, 509, 1, 1, -9243.427, 1280.498, -63.59377, 3.822271, 7200, 0, 0),
+(@GUID+4, 15514, 509, 1, 1, -9234.326, 1243.826, -63.52806, 3.490659, 7200, 0, 0),
+(@GUID+5, 15514, 509, 1, 1, -9300.189, 1266.665, -63.74272, 0.2617994, 7200, 0, 0);
+DELETE FROM `linked_respawn` WHERE `linkedGuid`=90873;
+INSERT INTO `linked_respawn` (`guid`, `linkedGuid`, `linkType`) VALUES
+(@GUID, 90873, 0),
+(@GUID+1, 90873, 0),
+(@GUID+2, 90873, 0),
+(@GUID+3, 90873, 0),
+(@GUID+4, 90873, 0),
+(@GUID+5, 90873, 0);
+DELETE FROM `spell_script_names` WHERE `spell_id`=19593;
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(19593, 'spell_egg_explosion');
diff --git a/sql/updates/world/2013_01_07_10_world_skeram.sql b/sql/updates/world/2013_01_07_10_world_skeram.sql
new file mode 100644
index 00000000000..fb62da5e994
--- /dev/null
+++ b/sql/updates/world/2013_01_07_10_world_skeram.sql
@@ -0,0 +1,5 @@
+DELETE FROM `spell_target_position` WHERE id IN (4801,8195,20449);
+INSERT INTO `spell_target_position` VALUES
+(4801,531,-8306.68,2060.84,133.062,0),
+(8195,531,-8344.97,2081.36,125.649,0),
+(20449,531,-8330.63,2123.14,133.062,0);
diff --git a/sql/updates/world/2013_01_07_11_world_sai.sql b/sql/updates/world/2013_01_07_11_world_sai.sql
new file mode 100644
index 00000000000..bf4a1ed3c78
--- /dev/null
+++ b/sql/updates/world/2013_01_07_11_world_sai.sql
@@ -0,0 +1,9 @@
+-- Snowfall Glade Pup SAI
+SET @ENTRY := 26200;
+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,8,0,100,0,39996,0,0,0,11,65208,2,0,0,0,0,1,0,0,0,0,0,0,0,"Snowfall Glade Pup - On Spellhit 40yd Dummy - Cast Self Stun"),
+(@ENTRY,0,1,2,61,0,100,0,0,0,0,0,11,46773,2,0,0,0,0,7,0,0,0,0,0,0,0,"Snowfall Glade Pup - On Spellhit 40yd Dummy - Cast Planning for the Future: Create Snowfall Glade Pup"),
+(@ENTRY,0,2,0,61,0,100,0,0,0,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Snowfall Glade Pup - On Spellhit 40yd Dummy - Forced Despawn");
diff --git a/sql/updates/world/2012_01_05_00_world_sai.sql b/sql/updates/world/2013_01_07_12_world_sai.sql
index bfa06980983..bfa06980983 100644
--- a/sql/updates/world/2012_01_05_00_world_sai.sql
+++ b/sql/updates/world/2013_01_07_12_world_sai.sql
diff --git a/sql/updates/world/2013_01_07_13_world_creature_text.sql b/sql/updates/world/2013_01_07_13_world_creature_text.sql
new file mode 100644
index 00000000000..60d69e3c32a
--- /dev/null
+++ b/sql/updates/world/2013_01_07_13_world_creature_text.sql
@@ -0,0 +1,4 @@
+-- Texts for Timmy the Cruel
+DELETE FROM `creature_text` WHERE `entry`= 10808;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(10808,0,0, 'TIMMY!',14,0,100,0,0,0, 'Timmy the Cruel - Yell on Spawn');
diff --git a/sql/updates/world/2013_01_07_14_world_creature_text.sql b/sql/updates/world/2013_01_07_14_world_creature_text.sql
new file mode 100644
index 00000000000..d68eb93ff4e
--- /dev/null
+++ b/sql/updates/world/2013_01_07_14_world_creature_text.sql
@@ -0,0 +1,4 @@
+-- Texts for Shirrak the Dead Watcher
+DELETE FROM `creature_text` WHERE `entry`= 18371;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(18371,0,0, '%s focuses on $n!',41,0,100,0,0,0, 'Shirrak the Dead Watcher - Emote Focus');
diff --git a/sql/updates/world/2013_01_07_15_world_creature_addon.sql b/sql/updates/world/2013_01_07_15_world_creature_addon.sql
new file mode 100644
index 00000000000..2b5ec6c2413
--- /dev/null
+++ b/sql/updates/world/2013_01_07_15_world_creature_addon.sql
@@ -0,0 +1,38 @@
+DELETE FROM `creature_template_addon` WHERE `entry`IN (48,1027,1179,1708,3737,3749,3921,6221,7011,7396);
+INSERT INTO `creature_template_addon` (`entry`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES 
+-- Removed Battle Stance Aura, it should be set via SAI, same for any fake mining emotes) 
+(  48,0,0,1114112,4097,0,''), -- Skeletal Warrior
+(1027,0,0,1114112,4097,0,''), -- Bluegill Warrior
+(1179,0,0,1114112,4097,0,''), -- Mogrosh Enforcer
+(1708,0,0,1114112,4097,0,''), -- Defias Inmate
+(3737,0,0,0,285216769,0,''), -- Saltspittle Puddlejumper
+(3749,0,0,0,285216769,0,''), -- Foulweald Ursa
+(3921,0,0,0,285216769,0,''), -- Thistlefur Ursa
+(6221,0,0,1114112,4097,0,''), -- Addled Leper
+(7011,0,0,1114112,4097,0,''), -- Earthen Rocksmasher
+(7396,0,0,1114112,4097,0,''); -- Earthen Stonebreaker
+-- Remove creature_addon templates in favor of general creature_template_addon ones, and possible SAI
+DELETE FROM `creature_addon` WHERE `guid` IN (
+-- Skeletal Warrior
+4914,5008,5968,5974,5984,5985,5986,5987,5988,5989,6005,
+-- Bluegill Warrior
+9543,9544,9545,9605,9607,9686,9690,9759,9788,9796,9823,10730,10925,10928,11055,11058,
+-- Mogrosh Enforcer
+8366,8789,9082,9211,9216,9217,9227,9376,
+-- Defias Inmate
+79082,79095,79097,79103,79106,
+-- Saltspittle Puddlejumper
+32919,32920,32921,32922,32923,32924,32925,
+-- Foulweld Ursa
+33080,33081,33082,33083,
+-- Thistlefur Ursa
+32440,32441,32442,32443,32445,32446,32447,32448,
+-- Addled Leper
+2446,2447,2448,
+-- Earthen Rocksmasher
+28369,28370,28371,28374,28376,28377,28532,28535,28536,28537,28538,28539,28541,28542,28543,28544,28546,28547,28784,28795,28796,28797,28798,28799,29384,29488,29573,29574,
+-- Earthen Stonebreaker
+27764,27766,27767,27770,27789,27790,27791,33505,33506,33507,33508);
+-- Remove Battle Stance Aura as that should already be done via SAI:
+UPDATE `creature_addon` SET `auras`='' WHERE `auras`='7165' AND `guid` IN (90212,32617,12218,2443); 
+
diff --git a/sql/updates/world/2013_01_07_16_world_creature_addon.sql b/sql/updates/world/2013_01_07_16_world_creature_addon.sql
new file mode 100644
index 00000000000..bd5c17c6f67
--- /dev/null
+++ b/sql/updates/world/2013_01_07_16_world_creature_addon.sql
@@ -0,0 +1,96 @@
+DELETE FROM `creature_addon` WHERE `guid` IN (
+-- ---------------------------------------------------------------
+-- Lightning Shield (12550)
+-- ---------------------------------------------------------------
+-- Shadowpine Witch
+81831,81833,81839,81842,81844,81896,
+-- Deadwind Ogre Mage
+3964,3980,3982,3994,3995,3996,3999,4038,
+-- ---------------------------------------------------------------
+-- Demon Armor (13787)
+-- ---------------------------------------------------------------
+-- Morganth
+6268,
+ -- Shadowmoon Deathshaper
+13234,13233,13232,13231,12891,12890,
+ -- Skeletal Guardian
+52616,52620,52622,52643,52644,52647,52649,52650,52653,52683,52837,52852,52853,52934,52997,52998,52999,53000,53003,53005,53006,53007,53009,53010,53092,53093,53095,
+-- ---------------------------------------------------------------
+-- Chain Heal (1604)
+-- ---------------------------------------------------------------
+-- Crazed Mana-Wraith
+126548,126552,
+-- Scarlet Peasant
+128784,
+-- Scarlet Infantryman
+129286,129287,
+-- Flesh Behemoth
+130392,
+-- Marsh Fawn
+133083,
+-- ---------------------------------------------------------------
+-- Stealth Detection (8279)
+-- ---------------------------------------------------------------
+-- Scarlet Sentinel
+45391,45396,48219,48593,48617,48624,49992,51744,51745,52001,52245,52247,52510,
+-- Eyeless Watcher
+54277,56694,69687,69707,92177,92204,92518,
+-- Unseen Servant
+92527,92713,
+-- ---------------------------------------------------------------
+-- Retribution Aura (8990)
+-- ---------------------------------------------------------------
+-- Crimson Conjuror
+54079,54082,
+-- Crimson Gallant
+54180,54201,54204,54205,54206,54207,54208,54219,54221,54222,54223,54224,54225,54227,54228,54229,
+-- Crimson Battle Mage
+54230,54231,54232,54233,
+-- ---------------------------------------------------------------
+-- Frost Armor (18100)
+-- ---------------------------------------------------------------
+-- Scarlet Archmage
+54267,84783,84784,84963,86414,90955,92330,92436,92444,92452,
+-- ---------------------------------------------------------------
+-- Invisibility and Stealth Detection
+-- ---------------------------------------------------------------
+-- Ravaged Cadaver
+52172,52171,52170,52169,52168,52167,52166,52165,52164,52163,52162,52161,52160,52159,52158,52157,52156,52155,52154,52153,52152,52173,52174,52175,52176,52177,52179,52180,52181,52182,
+-- Mangled Cadaver
+52183,52184,52185,52186,52187,52188,52189,52190,52191,52192,52193,52194,52195,52196,52197,52198,52199,52200,52201,52202,52203,52204,52205,52206,52207,52208,52209,52210,52211,52212,52213,52214,52215,52216,52217,
+-- Ghoul Ravener
+53678,53691,53692,53693,53694,53695,53696,53697,53698,53702,53706,53707,53708,53709,53715,53716,53726,
+-- Fleshflayer Ghoul
+53727,53728,53729,53761,53777,53778,53779,53780,53781,53782,
+-- Bloodseeker Bat
+49123,49124,49125,49127,49128,49139,49140,49143,49144,49145,49146,49150,49151,49156,49157,49158,49186,49187,49188,49190,49191,49192,51874,91548,91549,91551,91554,
+-- Hooktooth Frenzy
+49068,49069,49070,49071,49072,49073,49074,49075,49076,49722,49723,49724,49725,49727,49728,49730,49731,51443,51445,51446,51447,51449,51450,51963,
+-- Ancient Core Hound
+56675,56676,56742,
+-- Embalming Slime
+128103,128104,128105,128106,128107,128108,128109,128110,128111,128112,128113,128114,128115,128116,128117,128118,
+-- Shade of Naxxramas
+127755,127757,
+-- Stoneskin Gargoyle
+127776,127777,127778,127779,127780,
+-- Argent Sentry
+53857,53863,53864,53868,53869,53875,53895,53896,54751,54752,54753,54755,54756,54757,54758,68491,68500,68931,68963,69677,69679,
+-- Aqueous Lord
+12869,12868,12867,12866,
+-- Amani'shi Guardian
+86194,86204,86205,86239,86280,86307,86308,86906,86910,86914,89133,89134,89143,89165,89168,89170,89171,89192,89194,89195,89219,89220,89241,89243,89255,89331,
+-- Amani'shi Savage
+85580,86132,86162,86913,86915,86916,86918,86920,
+-- Amani'shi Handler
+86923,86927,89136,89138,89142,89174,89199,
+-- Amani'shi Wind Walker
+89207,86210,
+-- Mage Slayer
+126474,126475,126476,126477,126478,126479,
+-- Savage Worg
+125993,125994,125995,125996,125997,125998,
+-- Vigilant Shade
+128065);
+
+
diff --git a/sql/updates/world/2013_01_07_17_world_creature_text.sql b/sql/updates/world/2013_01_07_17_world_creature_text.sql
new file mode 100644
index 00000000000..137308da214
--- /dev/null
+++ b/sql/updates/world/2013_01_07_17_world_creature_text.sql
@@ -0,0 +1,4 @@
+-- Texts for Postmaster Malown
+DELETE FROM `creature_text` WHERE `entry`= 11143;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(11143,0,0, 'You just got MALOWNED!',14,0,100,0,0,0, 'Postmaster Malown - Yell on Kill');
diff --git a/sql/updates/world/2013_01_07_18_world_creature_text.sql b/sql/updates/world/2013_01_07_18_world_creature_text.sql
new file mode 100644
index 00000000000..b9c6ef8d0c1
--- /dev/null
+++ b/sql/updates/world/2013_01_07_18_world_creature_text.sql
@@ -0,0 +1,9 @@
+-- Texts for Nightbane
+DELETE FROM `creature_text` WHERE `entry`= 17225;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(17225,0,0, 'An ancient being awakens in the distance...',16,0,100,0,0,0, 'Nightbane - EMOTE_SUMMON'),
+(17225,1,0, 'What fools! I shall bring a quick end to your suffering!',14,0,100,0,0,0, 'Nightbane - YELL_AGGRO'),
+(17225,2,0, 'Miserable vermin. I shall exterminate you from the air!',14,0,100,0,0,0, 'Nightbane - YELL_FLY_PHASE'),
+(17225,3,0, 'Enough! I shall land and crush you myself!',14,0,100,0,0,0, 'Nightbane - YELL_LAND_PHASE'),
+(17225,3,1, 'Insects! Let me show you my strength up close!',14,0,100,0,0,0, 'Nightbane - YELL_LAND_PHASE'),
+(17225,4,0, 'takes a deep breath.',16,0,100,0,0,0, 'Nightbane - EMOTE_BREATH');