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

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

6 files changed, 88 insertions, 2 deletions

diff --git a/sql/updates/world/2012_01_05_00_world_sai.sql b/sql/updates/world/2012_01_05_00_world_sai.sql
new file mode 100644
index 00000000000..bfa06980983
--- /dev/null
+++ b/sql/updates/world/2012_01_05_00_world_sai.sql
@@ -0,0 +1,8 @@
+-- Fixup some runtime errors, linked events that were not SMART_EVENT_LINK
+UPDATE `smart_scripts` SET `event_type`=61 WHERE `entryorguid`=38017 AND `id`=1 AND `source_type`=0;
+UPDATE `smart_scripts` SET `event_type`=61 WHERE `entryorguid`=1443 AND `id`=1 AND `source_type`=0;
+UPDATE `smart_scripts` SET `event_type`=61 WHERE `entryorguid`=3448 AND `id` IN (1, 2, 3) AND `source_type`=0;
+UPDATE `smart_scripts` SET `event_type`=61 WHERE `entryorguid`=3616 AND `id` IN (1, 2) AND `source_type`=0;
+UPDATE `smart_scripts` SET `event_type`=61 WHERE `entryorguid`=4049 AND `id`=1 AND `source_type`=0;
+UPDATE `smart_scripts` SET `event_type`=61 WHERE `entryorguid`=305400 AND `id` IN (1, 2) AND `source_type`=9;
+UPDATE `smart_scripts` SET `event_type`=61 WHERE `entryorguid`=83600 AND `id` IN (1, 2, 3) AND `source_type`=9;
diff --git a/sql/updates/world/2013_01_03_14_world_spell_area.sql b/sql/updates/world/2013_01_03_14_world_spell_area.sql
index a670ed7c455..352fe0e9d85 100644
--- a/sql/updates/world/2013_01_03_14_world_spell_area.sql
+++ b/sql/updates/world/2013_01_03_14_world_spell_area.sql
@@ -1,4 +1,4 @@
 -- add aura to be able to hand in quests
 DELETE FROM `spell_area` WHERE `spell`=52217;
-INSERT INTO `spell_area` (`spell`,`area`,`quest_start`,`quest_start_active`,`quest_end`,`aura_spell`,`racemask`,`gender`,`autocast`) VALUES
-(52217,4306,12574,1,0,0,0,2,1);
+INSERT INTO `spell_area` (`spell`,`area`,`quest_start`,`quest_end`,`aura_spell`,`racemask`,`gender`,`autocast`,`quest_start_status`,`quest_end_status`) VALUES
+(52217,4306,12574,0,0,0,2,1,1,64);
diff --git a/sql/updates/world/2013_01_03_16_world_various_fixes.sql b/sql/updates/world/2013_01_03_16_world_various_fixes.sql
new file mode 100644
index 00000000000..bc5f4f4b6ec
--- /dev/null
+++ b/sql/updates/world/2013_01_03_16_world_various_fixes.sql
@@ -0,0 +1,8 @@
+-- NPC talk text convert from creature_ai_text. Moving boss to cpp.
+UPDATE `creature_template` SET `minlevel`=63,`maxlevel`=63,`InhabitType`=5,`AIName`= '', `ScriptName`= 'boss_kirtonos_the_herald' WHERE `entry`=10506;
+UPDATE `gameobject_template` SET `AIName`= '', `ScriptName`= 'go_brazier_of_the_herald' WHERE `entry`=175564;
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=10506;
+DELETE FROM `creature_ai_texts` WHERE `entry`=-448;
+DELETE FROM `creature_text` WHERE `entry` IN (10506);
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(10506,0,0, '%s lets out a shrill cry.',16,0,100,0,0,0, 'Kirtonos The Herald - Emote');
diff --git a/sql/updates/world/2013_01_04_00_world_creature_text.sql b/sql/updates/world/2013_01_04_00_world_creature_text.sql
new file mode 100644
index 00000000000..ae38180e1ac
--- /dev/null
+++ b/sql/updates/world/2013_01_04_00_world_creature_text.sql
@@ -0,0 +1,3 @@
+DELETE FROM `creature_text` WHERE `entry`=4295;
+INSERT INTO `creature_text`(`entry`,`text`,`type`,`language`,`comment`) VALUES
+(4295,"There is no escape for you.  The Crusade shall destroy all who carry the scourge's taint.",12,7,"Scarlet Myrmidon - Talk on low HP");
diff --git a/sql/updates/world/2013_01_04_01_world_sai.sql b/sql/updates/world/2013_01_04_01_world_sai.sql
new file mode 100644
index 00000000000..8e7127e5728
--- /dev/null
+++ b/sql/updates/world/2013_01_04_01_world_sai.sql
@@ -0,0 +1,38 @@
+-- Arcane Wraith SAI
+SET @ENTRY := 15273;
+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,8,0,100,1,28730,0,0,0,27,15468,28730,0,0,0,0,7,0,0,0,0,0,0,0,"Arcane Wraith - On Spellhit Arcane Torrent - Quest Credit"),
+(@ENTRY,0,1,0,8,0,100,1,25046,0,0,0,27,15468,28730,0,0,0,0,7,0,0,0,0,0,0,0,"Arcane Wraith - On Spellhit Arcane Torrent - Quest Credit"),
+(@ENTRY,0,2,0,0,0,100,0,10100,16500,12700,24800,11,37361,0,0,0,0,0,2,0,0,0,0,0,0,0,"Arcane Wraith - In Combat - Cast Arcane Bolt");
+
+-- Mana Wyrm SAI
+SET @ENTRY := 15274;
+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,8,0,100,1,28730,0,0,0,27,15468,28730,0,0,0,0,7,0,0,0,0,0,0,0,"Mana Wyrm - On Spellhit Arcane Torrent - Quest Credit"),
+(@ENTRY,0,1,0,8,0,100,1,25046,0,0,0,27,15468,28730,0,0,0,0,7,0,0,0,0,0,0,0,"Mana Wyrm - On Spellhit Arcane Torrent - Quest Credit");
+
+-- Feral Tender SAI
+SET @ENTRY := 15294;
+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,8,0,100,1,28730,0,0,0,27,15468,28730,0,0,0,0,7,0,0,0,0,0,0,0,"Feral Tender - On Spellhit Arcane Torrent - Quest Credit"),
+(@ENTRY,0,1,0,8,0,100,1,25046,0,0,0,27,15468,28730,0,0,0,0,7,0,0,0,0,0,0,0,"Feral Tender - On Spellhit Arcane Torrent - Quest Credit"),
+(@ENTRY,0,2,0,2,0,100,0,0,50,15300,22900,11,31325,0,0,0,0,0,1,0,0,0,0,0,0,0,"Feral Tender - At 50% HP - Cast Renew");
+
+-- Tainted Arcane Wraith SAI
+SET @ENTRY := 15298;
+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,8,0,100,1,28730,0,0,0,27,15468,28730,0,0,0,0,7,0,0,0,0,0,0,0,"Tainted Arcane Wraith - On Spellhit Arcane Torrent - Quest Credit"),
+(@ENTRY,0,1,0,8,0,100,1,25046,0,0,0,27,15468,28730,0,0,0,0,7,0,0,0,0,0,0,0,"Tainted Arcane Wraith - On Spellhit Arcane Torrent - Quest Credit"),
+(@ENTRY,0,2,0,0,0,100,0,9000,18800,21100,32200,11,25603,0,0,0,0,0,2,0,0,0,0,0,0,0,"Tainted Arcane Wraith - In Combat - Cast Slow");
diff --git a/sql/updates/world/2013_01_04_02_world_misc.sql b/sql/updates/world/2013_01_04_02_world_misc.sql
new file mode 100644
index 00000000000..6833a22ff23
--- /dev/null
+++ b/sql/updates/world/2013_01_04_02_world_misc.sql
@@ -0,0 +1,29 @@
+-- Add Gossip for Harrison Jones
+UPDATE `creature_template` SET `gossip_menu_id`=8932 WHERE `entry`=24358;
+DELETE FROM `gossip_menu` WHERE `entry`=8932 AND `text_id`=12135;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (8932,12135);
+DELETE FROM `gossip_menu_option` WHERE `menu_id`=8932 AND `id`=0;
+INSERT INTO `gossip_menu_option` (`menu_id`,`id`,`option_icon`,`option_text`,`option_id`,`npc_option_npcflag`) VALUES
+(8932,0,0, 'Thanks for the concern, but we intend to explore Zul''Aman.',1,1);
+
+-- Pathing for Harrison Jones Entry: 24358
+SET @NPC := 86177;
+SET @PATH := @NPC * 10;
+DELETE FROM `waypoint_data` WHERE `id`IN (@PATH,@PATH+1,@PATH+2);
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,112.1772,1670.18,42.02158,0,0,0,100,0),
+(@PATH,2,82.44975,1655.312,42.02155,0,0,0,100,0),
+(@PATH,3,114.1627,1661.469,42.02158,0,0,0,100,0),
+(@PATH,4,131.8243,1644.853,42.0216,0,0,0,100,0),
+(@PATH+1,1,121.897,1639.106,42.19081,0,0,0,100,0),
+(@PATH+1,2,120.8522,1637.931,42.37172,0,0,0,100,0),
+(@PATH+1,3,120.7898,1609.063,43.49005,0,0,0,100,0),
+(@PATH+2,1,120.6967,1603.713,43.4503,0,0,0,100,0);
+
+-- Text for Harrison Jones from sniff
+DELETE FROM `creature_text` WHERE `entry` IN (24358);
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(24358,0,0, 'Suit yourself. At least five of you must assist me if we''re to get inside. Follow me....',14,0,100,1,0,0, 'Harrison Jones - Gong Event Say 0'),
+(24358,1,0, 'According to my calculations, if enough of us bang the gong at once the seal on these doors will break and we can enter.',14,0,100,1,0,0, 'Harrison Jones - Gong Event Say 1'),
+(24358,2,0, 'I''ve researched this site extensively and I won''t allow any dim-witted treasure hunters to swoop in and steal what belongs in a museum. I''ll lead this charge...',14,0,100,0,0,0, 'Harrison Jones - Gong Event Say 2'),
+(24358,3,0, 'In fact, it would be best if you just stay here. You''d only get in my way....',14,0,100,0,0,0, 'Harrison Jones - Gong Event Say 3');