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

Conflicts:
	src/server/game/Movement/Spline/MoveSplineInit.h

7 files changed, 87 insertions, 0 deletions

diff --git a/sql/updates/world/2013_01_01_01_world_creature_text.sql b/sql/updates/world/2013_01_01_01_world_creature_text.sql
new file mode 100644
index 00000000000..c0055f8e1d0
--- /dev/null
+++ b/sql/updates/world/2013_01_01_01_world_creature_text.sql
@@ -0,0 +1,30 @@
+-- NPC talk text convert from creature_ai_text. Moving boss to cpp.
+UPDATE `creature_template` SET `AIName`= '', `ScriptName`= 'boss_commander_sarannis' WHERE `entry`=17976;
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=17976;
+DELETE FROM `creature_ai_texts` WHERE `entry` BETWEEN -39 AND -34;
+DELETE FROM `creature_text` WHERE `entry` IN (17976);
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(17976,0,0, 'Step forward! I will see that you are properly welcomed.',14,0,100,0,0,11071, 'Commander Sarannis - On Aggro Say'),
+(17976,1,0, 'Oh stop your whimpering.',14,0,100,0,0,11072, 'Commander Sarannis - On Player Death Say'),
+(17976,1,1, 'Mission accomplished.',14,0,100,0,0,11073, 'Commander Sarannis - On Player Death Say'),
+(17976,2,0, 'You are no longer dealing with some underling.',14,0,100,0,0,11076, 'Commander Sarannis - On Cast Arcane Resonance Say'),
+(17976,3,0, 'Band''or shorel''aran!',14,0,100,0,0,11077, 'Commander Sarannis - On Cast Arcane Devastation Say'),
+(17976,4,0, '%s calls for reinforcements.',16,0,100,0,0,0, 'Commander Sarannis - On HP@50% Summon emote'),
+(17976,5,0, 'Guards! Come and kill these intruders!',14,0,100,0,0,11078, 'Commander Sarannis - On HP@50% Summon Say'),
+(17976,6,0, 'I have not yet... begun to...',14,0,100,0,0,11079, 'Commander Sarannis - On Death Say');
+
+-- NPC talk text convert from creature_ai_text. Moving boss to cpp.
+UPDATE `creature_template` SET `AIName`= '', `ScriptName`= 'thorngrin_the_tender' WHERE `entry`=17978;
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=17978;
+DELETE FROM `creature_ai_texts` WHERE entry BETWEEN -16 AND -9;
+DELETE FROM `creature_text` WHERE `entry` IN (17978);
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(17978,0,0, 'What aggravation is this? You will die!',14,0,100,0,0,11205, 'Thorngrin the Tender - Aggro Say'),
+(17978,1,0, 'You seek a prize, eh? How about death?',14,0,100,0,0,11206, 'Thorngrin the Tender - 20% Health Say'),
+(17978,2,0, 'I hate to say I told you so...',14,0,100,0,0,11207, 'Thorngrin the Tender - Player Death Say'),
+(17978,3,0, 'Your life will be mine!',14,0,100,0,0,11208, 'Thorngrin the Tender - Cast Sacrifice Say'),
+(17978,4,0, 'I revel in your pain!',14,0,100,0,0,11209, 'Thorngrin the Tender - 50% Health Say'),
+(17978,5,0, 'I''ll incinerate you!',14,0,100,0,0,11210, 'Thorngrin the Tender - Cast Hellfire Say'),
+(17978,5,1, 'Scream while you burn!',14,0,100,0,0,11211, 'Thorngrin the Tender - Cast Hellfire Say'),
+(17978,6,0, 'You won''t... get far.',14,0,100,0,0,11212, 'Thorngrin the Tender - On Death Say'),
+(17978,7,0, '%s becomes enraged!',16,0,100,0,0,0, 'Thorngrin the Tender - On Enrage Say');
diff --git a/sql/updates/world/2013_01_02_00_world_misc.sql b/sql/updates/world/2013_01_02_00_world_misc.sql
new file mode 100644
index 00000000000..8527b8ab145
--- /dev/null
+++ b/sql/updates/world/2013_01_02_00_world_misc.sql
@@ -0,0 +1,7 @@
+DELETE FROM `creature_template_addon` WHERE `entry`=32535;
+INSERT INTO `creature_template_addon` (`entry`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `auras`) VALUES
+(32535, 0, 0, 0x3020400, 0x1, 0, '60534');
+
+DELETE FROM `npc_spellclick_spells` WHERE `npc_entry`=32535;
+INSERT INTO `npc_spellclick_spells` (`npc_entry`, `spell_id`, `cast_flags`, `user_type`) VALUE
+(32535, 61245, 1, 0);
diff --git a/sql/updates/world/2013_01_02_01_world_spell_script.sql b/sql/updates/world/2013_01_02_01_world_spell_script.sql
new file mode 100644
index 00000000000..a839ca6dc7b
--- /dev/null
+++ b/sql/updates/world/2013_01_02_01_world_spell_script.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_script_names` WHERE `spell_id`=34803;
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(34803,'spell_commander_sarannis_summon_reinforcements');
diff --git a/sql/updates/world/2013_01_02_02_world_instance_template.sql b/sql/updates/world/2013_01_02_02_world_instance_template.sql
new file mode 100644
index 00000000000..f63a2c3ba2e
--- /dev/null
+++ b/sql/updates/world/2013_01_02_02_world_instance_template.sql
@@ -0,0 +1 @@
+UPDATE `instance_template` SET `script`='instance_the_botanica' WHERE `map`=553;
diff --git a/sql/updates/world/2013_01_02_03_world_sai.sql b/sql/updates/world/2013_01_02_03_world_sai.sql
new file mode 100644
index 00000000000..6f6318b55bd
--- /dev/null
+++ b/sql/updates/world/2013_01_02_03_world_sai.sql
@@ -0,0 +1,18 @@
+-- Summoned Bloodwarder Mender SAI
+SET @ENTRY := 20083;
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,63,0,100,7,0,0,0,0,11,34815,0,0,0,0,0,1,0,0,0,0,0,0,0,'Summoned Bloodwarder Mender - Just Created - Cast Teleport Effect'),
+(@ENTRY,0,1,0,0,0,100,6,5000,5000,185000,185000,11,34809,0,0,0,0,0,1,0,0,0,0,0,0,0,'Summoned Bloodwarder Mender - Combat - Cast Holy Fury'),
+(@ENTRY,0,2,0,0,0,100,2,8000,8000,10000,14000,11,17194,0,0,0,0,0,2,0,0,0,0,0,0,0,'Summoned Bloodwarder Mender (Normal) - Combat - Cast Mind Blast'),
+(@ENTRY,0,3,0,0,0,100,4,8000,8000,10000,14000,11,17287,0,0,0,0,0,2,0,0,0,0,0,0,0,'Summoned Bloodwarder Mender (Heroic) - Combat - Cast Mind Blast'),
+(@ENTRY,0,4,0,2,0,100,7,0,30,0,0,11,35096,0,0,0,0,0,1,0,0,0,0,0,0,0,"Summoned Bloodwarder Mender - At 30% Health - Cast Greater Heal");
+
+-- Summoned Bloodwarder Reservist SAI
+SET @ENTRY := 20078;
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,63,0,100,7,0,0,0,0,11,34815,0,0,0,0,0,1,0,0,0,0,0,0,0,'Summoned Bloodwarder Mender - Just Created - Cast Teleport Effect'),
+(@ENTRY,0,1,0,0,0,100,6,4000,8000,10000,12000,11,34820,0,0,0,0,0,2,0,0,0,0,0,0,0,'Summoned Bloodwarder Mender - Combat - Cast Arcane Strike');
diff --git a/sql/updates/world/2013_01_02_04_world_creature.sql b/sql/updates/world/2013_01_02_04_world_creature.sql
new file mode 100644
index 00000000000..686909ce57e
--- /dev/null
+++ b/sql/updates/world/2013_01_02_04_world_creature.sql
@@ -0,0 +1 @@
+DELETE FROM `creature` WHERE `id`=28318; -- Grand Apothecary Putress
diff --git a/sql/updates/world/2013_01_02_05_eye_of_eternity.sql b/sql/updates/world/2013_01_02_05_eye_of_eternity.sql
new file mode 100644
index 00000000000..89cc8f08cce
--- /dev/null
+++ b/sql/updates/world/2013_01_02_05_eye_of_eternity.sql
@@ -0,0 +1,27 @@
+-- Add missing text and update old one
+-- Malygos
+UPDATE `creature_text` SET `probability`=100 WHERE `entry`=28859; -- Was at 0 for some reason
+UPDATE `creature_text` SET `text`='Unthinkable! The mortals will destroy... everything! My sister, what have you...',`sound`=14540 WHERE `entry`=28859 AND `groupid`=14 AND `id`=0;
+DELETE FROM `creature_text` WHERE `entry`=28859 AND `groupid` IN (15,16);
+DELETE FROM `creature_text` WHERE `entry`=30084;
+INSERT INTO `creature_text` (`entry`,`groupid`,`text`,`type`,`probability`,`sound`,`comment`) VALUES
+(28859,15, '%s fixes his eyes on you!', 42,100,0, 'Malygos'),
+(28859,16, 'I am without limits here. The rules of your cherished reality do not apply. In this realm, I am in control!',14,100,14515, 'Malygos'),
+(30084,0, 'A Power Spark forms from a nearby rift!',41,100,14522, 'Power spark to portal');
+-- Alexstrasza, add missing sounds
+UPDATE `creature_text` SET `probability`=100,`sound`=14406 WHERE `entry`=32295 AND `groupid`=0 AND `id`=0;
+UPDATE `creature_text` SET `probability`=100,`sound`=14407 WHERE `entry`=32295 AND `groupid`=1 AND `id`=0;
+UPDATE `creature_text` SET `probability`=100,`sound`=14408 WHERE `entry`=32295 AND `groupid`=2 AND `id`=0;
+UPDATE `creature_text` SET `probability`=100,`sound`=14409 WHERE `entry`=32295 AND `groupid`=3 AND `id`=0;
+
+-- Update portal InhabitType, otherwise it falls on summon
+UPDATE `creature_template` SET `InhabitType`=4 WHERE `entry`=30118;
+
+-- Update drakes templates
+UPDATE `creature_template` SET `unit_flags`=8,`InhabitType`=4 WHERE `entry`=30161; -- no fly aura present only enabled gravity in sniffs
+
+-- Addon data
+DELETE FROM `creature_template_addon` WHERE `entry` IN (30084,30161);
+INSERT INTO `creature_template_addon` (`entry`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
+(30084,0,0,50331648,1,0,'55845'), -- Power Spark
+(30161,0,0,50331648,1,0,'60534'); -- Wyrmrest Skytalon (uses no fly aura)