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

Conflicts:
	sql/base/auth_database.sql
	src/server/game/Entities/Player/Player.cpp

8 files changed, 232 insertions, 0 deletions

diff --git a/sql/updates/auth/2014_08_28_01_auth_rbac_permissions.sql b/sql/updates/auth/2014_08_28_01_auth_rbac_permissions.sql
new file mode 100644
index 00000000000..4c885bfd92e
--- /dev/null
+++ b/sql/updates/auth/2014_08_28_01_auth_rbac_permissions.sql
@@ -0,0 +1,8 @@
+-- Permissions for .guild info command
+DELETE FROM `rbac_permissions` WHERE `id`=794;
+INSERT INTO `rbac_permissions` (`id`, `name`) VALUES
+(794, 'Command: .guild info');
+
+DELETE FROM `rbac_linked_permissions` WHERE `linkedId`=794;
+INSERT INTO `rbac_linked_permissions` (`id`, `linkedId`) VALUES
+(192, 794);
diff --git a/sql/updates/world/2014_08_28_02_world_sai.sql b/sql/updates/world/2014_08_28_02_world_sai.sql
new file mode 100644
index 00000000000..243d960b182
--- /dev/null
+++ b/sql/updates/world/2014_08_28_02_world_sai.sql
@@ -0,0 +1,6 @@
+--
+SET @ENTRY := 17589;
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,0,0,100,0,0,0,12000,14000,11,21067,64,0,0,0,0,2,0,0,0,0,0,0,0,'Veridian Broodling - In combat CMC - Spellcast Poison Bolt');
diff --git a/sql/updates/world/2014_08_28_03_world_ulduar.sql b/sql/updates/world/2014_08_28_03_world_ulduar.sql
new file mode 100644
index 00000000000..6405efd18f7
--- /dev/null
+++ b/sql/updates/world/2014_08_28_03_world_ulduar.sql
@@ -0,0 +1,106 @@
+--
+DELETE FROM `vehicle_template_accessory` WHERE `entry` IN (33651, 33432);
+INSERT INTO `vehicle_template_accessory` (`entry`, `accessory_entry`, `seat_id`, `minion`, `description`, `summontype`) VALUES
+(33651, 34050, 5, 1, 'VX-001 Rocket Seat 6', 8),
+(33651, 34050, 6, 1, 'VX-001 Rocket Seat 7', 8),
+(33432, 34071, 3, 1, 'MKII MKII turret Seat 1', 8);
+
+DELETE FROM `npc_spellclick_spells` WHERE `npc_entry` IN (33651, 33432);
+INSERT INTO `npc_spellclick_spells` (`npc_entry`, `spell_id`, `cast_flags`, `user_type`) VALUES
+(33651, 46598, 1, 1),
+(33432, 46598, 1, 1);
+
+UPDATE `creature_template` SET `HoverHeight` = 15, `ScriptName` = 'boss_aerial_command_unit', `InhabitType` = 4, `mechanic_immune_mask` = 646135679 WHERE `entry` = 33670;
+UPDATE `creature_template` SET `HoverHeight` = 15, `InhabitType` = 4, `mechanic_immune_mask` = 646135679 WHERE `entry` = 34109;
+UPDATE `creature_template` SET `unit_flags` = 33554438, `ScriptName` = 'boss_vx_001', `mechanic_immune_mask` = 646135679 WHERE `entry` = 33651;
+UPDATE `creature_template` SET `unit_flags` = 33554438, `mechanic_immune_mask` = 646135679 WHERE `entry` = 34108;
+UPDATE `creature_template` SET `ScriptName` = 'boss_leviathan_mk_ii', `mechanic_immune_mask` = 646135679 WHERE `entry` = 33432;
+UPDATE `creature_template` SET `mechanic_immune_mask` = 646135679 WHERE `entry` = 34106;
+UPDATE `creature_template` SET `InhabitType` = 4, `ScriptName` = 'boss_mimiron' WHERE `entry` = 33350;
+UPDATE `creature_template` SET `unit_flags` = 131078, `ScriptName` = 'npc_mimiron_proximity_mine' WHERE `entry` = 34362;
+UPDATE `creature_template` SET `unit_flags` = 33685510, `faction` = 14, `ScriptName` = 'npc_mimiron_frost_bomb' WHERE `entry` = 34149;
+UPDATE `creature_template` SET `unit_flags` = 33685510  WHERE `entry` IN( 34047, 34110, 34050, 34071);
+UPDATE `creature_template` SET `unit_flags` = 33685510, `ScriptName` = 'npc_magnetic_core' WHERE `entry` = 34068;
+UPDATE `creature_template` SET `unit_flags` = 33554436, `ScriptName` = 'npc_mimiron_flames' WHERE `entry` IN (34363, 34121);
+UPDATE `creature_template` SET `faction` = 14 , `ScriptName` = 'npc_mimiron_emergency_fire_bot' WHERE `entry` = 34147;
+UPDATE `creature_template` SET `faction` = 14 WHERE `entry` IN (34148, 34114, 33855);
+UPDATE `creature_template` SET `ScriptName` = 'npc_mimiron_assault_bot' WHERE `entry` = 34057;
+UPDATE `creature_template` SET `ScriptName` = 'npc_mimiron_computer' WHERE `entry` = 34143;
+UPDATE `creature_template` SET `speed_walk` = 2.5 , `speed_run` = 4.5 , `MovementType` = 2 , `InhabitType` = 7 WHERE `entry` = 33576;
+
+UPDATE `creature_model_info` SET `bounding_radius` = 0.31 , `combat_reach` = 5 WHERE `modelid` = 28979;
+UPDATE `creature_model_info` SET `bounding_radius` = 0.306 , `combat_reach` = 7 WHERE `modelid` = 28841;
+UPDATE `creature_model_info` SET `bounding_radius` = 0.31 , `combat_reach` = 7.7 WHERE `modelid` = 28831;
+
+UPDATE `gameobject_template` SET `flags` = 32, `ScriptName` = 'go_mimiron_hardmode_button' WHERE `entry` = 194739;
+
+UPDATE `creature_addon` SET `path_id` = 1376200 WHERE `guid` = 137620;
+
+UPDATE `creature` SET `position_x` = 2785.423 , `position_y` = 2673.119, `MovementType` = 2 WHERE `guid` = 137620;
+DELETE FROM `creature` WHERE `id` = 34071;
+
+
+DELETE FROM `creature_template_addon` WHERE `entry` IN (34047, 34148, 33836, 34149, 34147, 33670, 34363, 34121, 34109);
+INSERT INTO `creature_template_addon` (`entry`, `bytes1`, `bytes2`, `auras`) VALUES
+(33670, 50331648, 1, ''),
+(34109, 50331648, 1, ''),
+(34363, 0, 1, '64561'),
+(34121, 0, 1, '64561'),
+(34047, 0, 1, '64064'),
+(34148, 0, 1, '64616 64617'),
+(33836, 0, 1, '63767'),
+(34149, 0, 1, '64624'),
+(34147, 0, 1, '64617');
+
+DELETE FROM `creature_text` WHERE `entry` = 34143;
+INSERT INTO `creature_text` (`entry`, `groupid`, `text`, `type`, `probability`, `sound`, `BroadcastTextID`) VALUES
+(34143, 0, 'Self-destruct sequence initiated.', 14, 100, 15413, 34268),
+(34143, 1, 'Self-destruct sequence terminated. Override code A905..', 14, 100, 15414, 34284),
+(34143, 2, 'This area will self-destruct in ten minutes.', 14, 100, 15415, 34283),
+(34143, 3, 'This area will self-destruct in nine minutes.', 14, 100, 15416, 34282),
+(34143, 4, 'This area will self-destruct in eight minutes.', 14, 100, 15417, 34281),
+(34143, 5, 'This area will self-destruct in seven minutes.', 14, 100, 15418, 34280),
+(34143, 6, 'This area will self-destruct in six minutes.', 14, 100, 15419, 34273),
+(34143, 7, 'This area will self-destruct in five minutes.', 14, 100, 15420, 34274),
+(34143, 8, 'This area will self-destruct in four minutes.', 14, 100, 15421, 34275),
+(34143, 9, 'This area will self-destruct in three minutes.', 14, 100, 15422, 34276),
+(34143, 10, 'This area will self-destruct in two minutes.', 14, 100, 15423, 34277),
+(34143, 11, 'This area will self-destruct in one minute.', 14, 100, 15424, 34278),
+(34143, 12, 'Self-destruct sequence finalized. Have a nice day.', 14, 100, 15425, 34279);
+
+DELETE FROM `waypoint_data` WHERE `id` = 1376200;
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES
+(1376200, 0, 2785.423, 2673.119, 372.3605, 0, 0, 1, 0, 100, 0),
+(1376200, 1, 2823.024, 2649.059, 371.9791, 0, 0, 1, 0, 100, 0),
+(1376200, 2, 2854.097, 2590.826, 371.9791, 0, 0, 1, 0, 100, 0),
+(1376200, 3, 2852.951, 2547.112, 372.3605, 0, 0, 1, 0, 100, 0),
+(1376200, 4, 2822.796, 2489.515, 372.3605, 0, 0, 1, 0, 100, 0),
+(1376200, 5, 2784.964, 2465.247, 372.3605, 0, 0, 1, 0, 100, 0),
+(1376200, 6, 2741.24, 2456.771, 372.3605, 0, 0, 1, 0, 100, 0),
+(1376200, 7, 2701.036, 2464.319, 372.3605, 0, 0, 1, 0, 100, 0),
+(1376200, 8, 2660.476, 2489.578, 372.3605, 0, 0, 1, 0, 100, 0),
+(1376200, 9, 2636.893, 2525.687, 372.3605, 0, 0, 1, 0, 100, 0),
+(1376200, 10, 2631.294, 2547.831, 372.3605, 0, 0, 1, 0, 100, 0),
+(1376200, 11, 2631.437, 2591.752, 372.3605, 0, 0, 1, 0, 100, 0),
+(1376200, 12, 2637.362, 2613.7, 372.3605, 0, 0, 1, 0, 100, 0),
+(1376200, 13, 2650.221, 2636.163, 372.3605, 0, 0, 1, 0, 100, 0),
+(1376200, 14, 2661.572, 2649.715, 372.3605, 0, 0, 1, 0, 100, 0),
+(1376200, 15, 2696.595, 2672.664, 372.3605, 0, 0, 1, 0, 100, 0),
+(1376200, 16, 2711.099, 2677.791, 372.3605, 0, 0, 1, 0, 100, 0),
+(1376200, 17, 2740.676, 2683.12, 372.3605, 0, 0, 1, 0, 100, 0),
+(1376200, 18, 2771.834, 2677.767, 372.3605, 0, 0, 1, 0, 100, 0);
+
+DELETE FROM `disables` WHERE `sourceType` = 4 AND `entry` IN (10544, 10547, 10543, 10546, 10548, 10545, 10450, 10463, 10406, 10405);
+
+DELETE FROM `achievement_criteria_data` WHERE `criteria_id` IN (10406, 10405) AND `type` = 18;
+DELETE FROM `achievement_criteria_data` WHERE `criteria_id` IN (10545,10548,10546,10543,10547,10544, 10450, 10463) AND `type` = 11;
+INSERT INTO `achievement_criteria_data` (`criteria_id`, `type`, `value1`, `value2`, `ScriptName`) VALUES
+(10544, 11, 0, 0, 'achievement_setup_rocket'),
+(10547, 11, 0, 0, 'achievement_setup_rocket'),
+(10543, 11, 0, 0, 'achievement_setup_mine'),
+(10546, 11, 0, 0, 'achievement_setup_mine'),
+(10548, 11, 0, 0, 'achievement_setup_boom'),
+(10545, 11, 0, 0, 'achievement_setup_boom'),
+(10450, 11, 0, 0, 'achievement_firefighter'),
+(10463, 11, 0, 0, 'achievement_firefighter');
+--
diff --git a/sql/updates/world/2014_08_28_04_world_creature_template.sql b/sql/updates/world/2014_08_28_04_world_creature_template.sql
new file mode 100644
index 00000000000..ebd483850fb
--- /dev/null
+++ b/sql/updates/world/2014_08_28_04_world_creature_template.sql
@@ -0,0 +1,2 @@
+--
+UPDATE `creature_template` SET `faction`=14 WHERE `entry` IN (37672,38605,38786,38787);
diff --git a/sql/updates/world/2014_08_28_04_world_misc.sql b/sql/updates/world/2014_08_28_04_world_misc.sql
new file mode 100644
index 00000000000..3921b40998d
--- /dev/null
+++ b/sql/updates/world/2014_08_28_04_world_misc.sql
@@ -0,0 +1,15 @@
+-- .guild info command
+DELETE FROM `command` WHERE `name`='guild info';
+INSERT INTO `command` (`name`, `permission`, `help`) VALUES
+('guild info', 794, 'Shows information about target''''s guild or a given guild Id or Name.');
+
+-- .guild info command strings
+DELETE FROM `trinity_string` WHERE `entry` IN (1177,1178,1179,1180,1181,1182,1183);
+INSERT INTO `trinity_string` (`entry`, `content_default`) VALUES
+(1177, 'Displaying Guild Details for %s (Id: %u)'),
+(1178, '| Guild Master: %s (GUID: %u)'),
+(1179, '| Guild Creation Date: %s'),
+(1180, '| Guild Members: %u'),
+(1181, '| Guild Bank: %u gold'),
+(1182, '| Guild MOTD: %s'),
+(1183, '| Guild Information: %s');
diff --git a/sql/updates/world/2014_08_28_05_world_sai.sql b/sql/updates/world/2014_08_28_05_world_sai.sql
new file mode 100644
index 00000000000..acab7bfa4db
--- /dev/null
+++ b/sql/updates/world/2014_08_28_05_world_sai.sql
@@ -0,0 +1,90 @@
+DELETE FROM `creature_text` WHERE `entry` IN (26666,27221,27227);
+DELETE FROM `creature_text` WHERE `entry` =26484 and `groupid`>1;
+
+INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `comment`, `BroadcastTextID`) VALUES
+(27227, 0, 0, 'Where... where am I?', 12, 0, 100, 0, 0, 0, 'Prospector Rokar',26240),
+(27227, 1, 0, 'Wait a minute here! You promised to spare me if I helped you. I held up my end o'' the bargain!', 12, 0, 100, 5, 0, 0, 'Prospector Rokar',26874),
+(27227, 2, 0, 'By the Light, Brann''s alive? I''d never help you capture him!', 12, 0, 100, 1, 0, 0, 'Prospector Rokar',26879),
+(26666, 0, 0, 'Stay your blade, Chieftain. He may yet have value to us.', 12, 0, 100, 1, 0, 0, 'Scout Vor''takh',26875),
+(26666, 1, 0, 'Remember the dwarven journal that was discovered? Well, this dwarf could be exactly what we need to track down Brann Bronzebeard and capture him.', 12, 0, 100, 1, 0, 0, 'Scout Vor''takh',26878),
+(26666, 2, 0, 'You will if you wish to keep your head attached to your shoulders.', 12, 0, 100, 1, 0, 0, 'Scout Vor''takh',26880),
+(26666, 3, 0, 'Does that satisfy you, Tormak?', 12, 0, 100, 6, 0, 0, 'Scout Vor''takh',26881),
+(27221, 0, 0, 'Let''s see if this works.', 12, 0, 100, 1, 0, 0, 'Tormak the Scarred',26239),
+(27221, 1, 0, 'You are among the Taunka of Camp Oneqwah, dwarf.', 12, 0, 100, 1, 0, 0, 'Tormak the Scarred',26251),
+(27221, 2, 0, 'If you agree to help us against our mutual enemy, you will come to no harm here.', 12, 0, 100, 1, 0, 0, 'Tormak the Scarred',26252),
+(27221, 3, 0, 'Think about it, prospector, but make up your mind swiftly. We must act soon.', 12, 0, 100, 25, 0, 0, 'Tormak the Scarred',26253),
+(27221, 4, 0, 'I''ll admit, dwarf, I was pleasantly surprised to see your plan succeed.', 12, 0, 100, 1, 0, 0, 'Tormak the Scarred',26871),
+(27221, 5, 0, 'We can''t just let you return to your companions and we can''t take you with us...', 12, 0, 100, 1, 0, 0, 'Tormak the Scarred',26873),
+(27221, 6, 0, 'He will live so long as he proves useful. I''d be careful if I was you, dwarf.', 12, 0, 100, 273, 0, 0, 'Tormak the Scarred',26882),
+(26484, 2, 0, 'By the Light, you killed Limpy Joe and took the meat! How did you know where to find us?', 12, 0, 100, 5, 0, 0, 'Hugh Glass',26639),
+(26484, 3, 0, 'Well, if you''ve come to kill me, too, can you at least wait until I''ve fed Griselda? Poor girl hasn''t eaten in days.', 12, 0, 100, 20, 0, 0, 'Hugh Glass',26642),
+(26484, 4, 0, 'Here, girl. I''ve got one last meal for you before Limpy Joe''s killer does us in!', 12, 0, 100, 22, 0, 0, 'Hugh Glass',26643),
+(26484, 5, 0, 'How could you kill poor, defenseless old Joe? And why did you bring the meat back?', 12, 0, 100, 6, 0, 0, 'Hugh Glass',26645),
+(26484, 6, 0, 'You''re an enigma, that''s what you are... And let me tell you, enigmas and I don''t get along....', 12, 0, 100, 1, 0, 0, 'Hugh Glass',26646),
+(26484, 7, 0, 'I think you''d best leave before Griselda decides she''s in the mood for dessert.', 12, 0, 100, 25, 0, 0, 'Hugh Glass',26647),
+(26484, 8, 0, 'Wake up, Griselda. Here, girl.', 12, 0, 100, 0, 0, 0, 'Hugh Glass',25700),
+(26484, 9, 0, 'They''ll never find us here, will they? We won''t let them get us like they got Limpy Joe and Flannel McGee!', 12, 0, 100, 5, 0, 0, 'Hugh Glass',25701),
+(26484, 9, 1, 'No, we escaped from those monsters! They''re nothing like us, Griselda.', 12, 0, 100, 1, 0, 0, 'Hugh Glass',25702),
+(26484, 9, 2, 'We''re hunters, you and I. No wolfmen here, no ma''am.', 12, 0, 100, 274, 0, 0, 'Hugh Glass',25703),
+(26484, 9, 3, 'Keep an eye out for them, girl! Don''t let them get us!', 12, 0, 100, 25, 0, 0, 'Hugh Glass',25704);
+
+UPDATE `creature_text` SET `emote`=396 WHERE  `entry`=26604;
+
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry` IN (26666,27221);
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (26666,27221) AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` =26484 AND `source_type`=0 and `id`IN(1,2);
+
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (2722100,2722101,2648401) AND `source_type`=9;
+UPDATE `smart_scripts` SET `event_type`=20, `event_param1`=12484, `event_param2`=0, `event_param3`=0, `event_param4`=0, `comment`='Mack Fearsen - On Quest Complete (Scourgekabob)  - Say Line 0' WHERE  `entryorguid`=26604 AND `source_type`=0 AND `id`=2 AND `link`=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
+(27221, 0, 0, 0, 20, 0, 100, 0, 12195, 0, 0, 0, 80, 2722100, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Tormak the Scarred - On Quest Reward (The Unexpected Guest) - Run Script'),
+(27221, 0, 1, 0, 20, 0, 100, 0, 12199, 0, 0, 0, 80, 2722101, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Tormak the Scarred - On Quest Reward (Bringing Down The Iron Thane) - Run Script 2'),
+(26666, 0, 0, 0, 38, 0, 100, 0, 1, 1, 0, 0, 53, 0, 26666, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Scout Vor''takh - On Data Set 1 1 - Start WP'),
+(26666, 0, 1, 0, 40, 0, 100, 0, 6, 26666, 0, 0, 54, 32000, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Scout Vor''takh - On On reached wp6 - Pause WP'),
+(26666, 0, 2, 0, 40, 0, 100, 0, 7, 26666, 0, 0, 66, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 4.55531, 'Scout Vor''takh - On On reached wp7 - Set Orientation'),
+(26484, 0, 1, 0, 20, 0, 100, 0, 12279, 0, 0, 0, 80, 2648401, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Hugh Glass - On Quest reward (A Bear of an Appetite) - Run Script'),
+(26484, 0, 2, 0, 1, 0, 100, 0, 15000, 60000, 90000, 120000, 1, 9, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Hugh Glass - OOC - Say'),
+(2722100, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 66, 0, 0, 0, 0, 0, 0, 19, 27227, 0, 0, 0, 0, 0, 0, 'Tormak the Scarred - Script - Set Orientation'),
+(2722100, 9, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 81, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Tormak the Scarred - Script - Set NPC Flags'),
+(2722100, 9, 2, 0, 0, 0, 100, 0, 1000, 1000, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Tormak the Scarred - Script - Say Line 1'),
+(2722100, 9, 3, 0, 0, 0, 100, 0, 6000, 6000, 0, 0, 1, 0, 0, 0, 0, 0, 0, 19, 27227, 0, 0, 0, 0, 0, 0, 'Tormak the Scarred - Script - Say Line 1 on Prospector Rokar'),
+(2722100, 9, 4, 0, 0, 0, 100, 0, 6000, 6000, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Tormak the Scarred - Script - Say Line 2'),
+(2722100, 9, 5, 0, 0, 0, 100, 0, 6000, 6000, 0, 0, 1, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Tormak the Scarred - Script - Say Line 3'),
+(2722100, 9, 6, 0, 0, 0, 100, 0, 6000, 6000, 0, 0, 1, 3, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Tormak the Scarred - Script - Say Line 4'),
+(2722100, 9, 7, 0, 0, 0, 100, 0, 2000, 2000, 0, 0, 81, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Tormak the Scarred - Script - Set NPC Flags'),
+(2722100, 9, 8, 0, 0, 0, 100, 0, 0, 0, 0, 0, 66, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 2.80998, 'Tormak the Scarred - Script - Set Orientation'),
+(2722101, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 66, 0, 0, 0, 0, 0, 0, 19, 27227, 0, 0, 0, 0, 0, 0, 'Tormak the Scarred - Script 2 - Set Orientation'),
+(2722101, 9, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 81, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Tormak the Scarred - Script 2 - Set NPC Flags'),
+(2722101, 9, 2, 0, 0, 0, 100, 0, 1000, 1000, 0, 0, 1, 4, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Tormak the Scarred - Script 2 - Say Line 5'),
+(2722101, 9, 3, 0, 0, 0, 100, 0, 6000, 6000, 0, 0, 1, 5, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Tormak the Scarred - Script 2 - Say Line 6'),
+(2722101, 9, 4, 0, 0, 0, 100, 0, 6000, 6000, 0, 0, 1, 1, 0, 0, 0, 0, 0, 19, 27227, 0, 0, 0, 0, 0, 0, 'Tormak the Scarred - Script 2 - Say Line 2 on Prospector Rokar'),
+(2722101, 9, 5, 0, 0, 0, 100, 0, 3000, 3000, 0, 0, 45, 1, 1, 0, 0, 0, 0, 19, 26666, 0, 0, 0, 0, 0, 0, 'Tormak the Scarred - Script 2 - Set Data 1 1 on Scout Vor''takh'),
+(2722101, 9, 6, 0, 0, 0, 100, 0, 3000, 3000, 0, 0, 1, 0, 0, 0, 0, 0, 0, 19, 26666, 0, 0, 0, 0, 0, 0, 'Tormak the Scarred - Script - Say Line 1 on Scout Vor''takh'),
+(2722101, 9, 7, 0, 0, 0, 100, 0, 6000, 6000, 0, 0, 1, 1, 0, 0, 0, 0, 0, 19, 26666, 0, 0, 0, 0, 0, 0, 'Tormak the Scarred - Script - Say Line 2 on Scout Vor''takh'),
+(2722101, 9, 8, 0, 0, 0, 100, 0, 6000, 6000, 0, 0, 1, 2, 0, 0, 0, 0, 0, 19, 27227, 0, 0, 0, 0, 0, 0, 'Tormak the Scarred - Script 2 - Say Line 3 on Prospector Rokar'),
+(2722101, 9, 9, 0, 0, 0, 100, 0, 6000, 6000, 0, 0, 1, 2, 0, 0, 0, 0, 0, 19, 26666, 0, 0, 0, 0, 0, 0, 'Tormak the Scarred - Script - Say Line 3 on Scout Vor''takh'),
+(2722101, 9, 10, 0, 0, 0, 100, 0, 6000, 6000, 0, 0, 1, 3, 0, 0, 0, 0, 0, 19, 26666, 0, 0, 0, 0, 0, 0, 'Tormak the Scarred - Script 2 - Say Line 3 on Scout Vor''takh'),
+(2722101, 9, 11, 0, 0, 0, 100, 0, 6000, 6000, 0, 0, 1, 6, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Tormak the Scarred - Script 2 - Say Line 7'),
+(2722101, 9, 12, 0, 0, 0, 100, 0, 2000, 2000, 0, 0, 81, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Tormak the Scarred - Script 2 - Set NPC Flags'),
+(2722101, 9, 13, 0, 0, 0, 100, 0, 0, 0, 0, 0, 66, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 2.80998, 'Tormak the Scarred - Script 2 - Set Orientation'),
+(2648401, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 81, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Hugh Glass - Script 2 - Set NPC Flags'),
+(2648401, 9, 1, 0, 0, 0, 100, 0, 1000, 1000, 0, 0, 1, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Hugh Glass - Script 2 - Say Line 3'),
+(2648401, 9, 2, 0, 0, 0, 100, 0, 6000, 6000, 0, 0, 1, 3, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Hugh Glass - Script 2 - Say Line 4'),
+(2648401, 9, 3, 0, 0, 0, 100, 0, 6000, 6000, 0, 0, 1, 4, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Hugh Glass - Script 2 - Say Line 4'),
+(2648401, 9, 4, 0, 0, 0, 100, 0, 6000, 6000, 0, 0, 1, 5, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Hugh Glass - Script 2 - Say Line 4'),
+(2648401, 9, 5, 0, 0, 0, 100, 0, 6000, 6000, 0, 0, 1, 6, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Hugh Glass - Script 2 - Say Line 4'),
+(2648401, 9, 6, 0, 0, 0, 100, 0, 6000, 6000, 0, 0, 1, 7, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Hugh Glass - Script 2 - Say Line 4'),
+(2648401, 9, 7, 0, 0, 0, 100, 0, 6000, 6000, 0, 0, 1, 8, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Hugh Glass - Script 2 - Say Line 4'),
+(2648401, 9, 8, 0, 0, 0, 100, 0, 2000, 2000, 0, 0, 81, 643, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Hugh Glass - Script 2 - Set NPC Flags');
+
+DELETE FROM `waypoints` WHERE `entry` =26666;
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES
+(26666, 1,3849.295, -4532.052, 209.5975, 'Scout Vor''takh'),
+(26666, 2,3850.295, -4531.552, 209.5975, 'Scout Vor''takh'),
+(26666, 3,3851.545, -4530.302, 210.3475, 'Scout Vor''takh'),
+(26666, 4,3851.795, -4530.052, 210.3475, 'Scout Vor''takh'),
+(26666, 5,3853.545, -4529.802, 209.5975, 'Scout Vor''takh'),
+(26666, 6,3855.295, -4529.802, 209.5975, 'Scout Vor''takh'),
+(26666, 7,3848.19, -4531.66, 209.344, 'Scout Vor''takh');
+
diff --git a/sql/updates/world/2014_08_28_06_world_command.sql b/sql/updates/world/2014_08_28_06_world_command.sql
new file mode 100644
index 00000000000..963d7ca4269
--- /dev/null
+++ b/sql/updates/world/2014_08_28_06_world_command.sql
@@ -0,0 +1 @@
+UPDATE `command` SET `help`='Shows information about target''s guild or a given guild identifier or name.' WHERE `name`='guild info';
diff --git a/sql/updates/world/2014_08_29_00_world_creature_template.sql b/sql/updates/world/2014_08_29_00_world_creature_template.sql
new file mode 100644
index 00000000000..da298a0f6c5
--- /dev/null
+++ b/sql/updates/world/2014_08_29_00_world_creature_template.sql
@@ -0,0 +1,4 @@
+--
+UPDATE `creature_template` SET `faction`=834 WHERE `entry` IN (40681,40682,40683,40684);
+UPDATE `creature_template` SET `faction`=14 WHERE `entry` IN (38285,38788,38789,38790);
+UPDATE `creature_template` SET `faction`=21 WHERE `entry` IN (38184,38185);