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

Conflicts:
	sql/base/auth_database.sql
	src/server/scripts/EasternKingdoms/CMakeLists.txt

8 files changed, 188 insertions, 0 deletions

diff --git a/sql/updates/world/2014_07_08_05_world_misc.sql b/sql/updates/world/2014_07_08_05_world_misc.sql
new file mode 100644
index 00000000000..ad16a1efc1d
--- /dev/null
+++ b/sql/updates/world/2014_07_08_05_world_misc.sql
@@ -0,0 +1,48 @@
+-- [Q] [H] Catch the Wild Wolpertinger!
+-- Alliance version already had this
+DELETE FROM `creature_queststarter` WHERE `id`=24657 AND `quest`=11431;
+INSERT INTO `creature_queststarter` (`id`,`quest`) VALUES (24657,11431);
+DELETE FROM `creature_questender` WHERE `id`=24657 AND `quest`=11431;
+INSERT INTO `creature_questender` (`id`,`quest`) VALUES (24657,11431);
+
+-- [Q] [A/H] Did Someone Say "Souvenir?" (removed in 2.4.3) & Say, There Wouldn't Happen to be a Souvenir This Year, Would There?
+DELETE FROM `creature_queststarter` WHERE `quest` IN (11321,11413,12193);
+DELETE FROM `creature_questender` WHERE `quest` IN (11321,11413);
+
+-- [Q] [A/H] Save Brewfest! should have pre-req Welcome to Brewfest!
+UPDATE `quest_template` SET `PrevQuestId`=11442 WHERE `id`=12318;
+
+-- [Q] [A/H] Save Brewfest! - removed in 2.4.3
+DELETE FROM `creature_queststarter` WHERE `quest`=12318;
+DELETE FROM `creature_questender` WHERE `quest`=12318;
+
+-- [Q] [A] Direbrew's Dire Brew - removed PrevQuestId in 2010
+-- Horde version already had this
+UPDATE `quest_template` SET `PrevQuestId`=0 WHERE `id`=12491;
+
+-- Misc.
+UPDATE `creature_template_addon` SET `auras`='43905' WHERE `entry`=23698; -- Drunken Brewfest Reveler
+UPDATE `creature_template` SET `AIName`='' WHERE `entry`=23698; -- Drunken Brewfest Reveler
+UPDATE `creature` SET `spawntimesecs`=450 WHERE `id`=24484; -- Brewfest Reveler had 12 hour respawntime ...
+
+-- Send a mail on quest complete "Brew of the Month Club" - there is no wait time so we won't use RewMailDelaySecs
+-- Alliance quest missed quest texts
+SET @MAIL_A := 209;
+SET @MAIL_H := 210;
+UPDATE `quest_template` SET `RewardMailTemplateId`=0 WHERE `id`=12278; -- old "Brew of the Month Club" quests
+UPDATE `quest_template` SET `RewardMailTemplateId`=0 WHERE `id`=12306; -- old "Brew of the Month Club" quests
+UPDATE `quest_template` SET `RewardMailTemplateId`=@MAIL_A,`OfferRewardText`="Your paperwork looks to be in order. Welcome to the club, $N!$B$BYou can expect to get our mail at the start of every month. If you like what you got, stop by and we can sell you some more. This is the club that keeps on giving.",`RequestItemsText`="Do you have your membership forms filled out?" WHERE `id`=12420;
+UPDATE `quest_template` SET `RewardMailTemplateId`=@MAIL_H WHERE `id`=12421;
+
+-- Ray'ma and Larkin were also finishing quest no longer available within the game.
+DELETE FROM `creature_questender` WHERE `quest` IN (12278,12306); -- old "Brew of the Month Club" quests
+DELETE FROM `creature_questender` WHERE `id`=27489 AND `quest`=12421;
+INSERT INTO `creature_questender` (`id`,`quest`) VALUES (27489,12421);
+
+-- Insert missing Wolpertinger's Tankard
+DELETE FROM `npc_vendor` WHERE `item`=32233;
+INSERT INTO `npc_vendor` (`entry`,`slot`,`item`,`maxcount`,`incrtime`,`ExtendedCost`) VALUES
+(23710,0,32233,0,0,0), -- Belbi Quikswitch
+(27478,0,32233,0,0,0), -- Larkin Thunderbrew
+(24495,0,32233,0,0,0), -- Blix Fixwidget
+(27489,0,32233,0,0,0); -- Ray'ma
diff --git a/sql/updates/world/2014_07_08_06_world_misc.sql b/sql/updates/world/2014_07_08_06_world_misc.sql
new file mode 100644
index 00000000000..dfbf6381dee
--- /dev/null
+++ b/sql/updates/world/2014_07_08_06_world_misc.sql
@@ -0,0 +1,14 @@
+-- Corporal Thund Splithoof SAI
+SET @ENTRY := 7750;
+SET @QUEST := 2701;
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `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,20,0,100,0,@QUEST,0,0,0,41,5000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Corporal Thund Splithoof - On Quest Complete - Forced Despawn"),
+(@ENTRY,0,1,2,19,0,100,0,@QUEST,0,0,0,70,0,0,0,0,0,0,14,44733,141980,0,0,0,0,0,"Corporal Thund Splithoof - On Quest Accept - Respawn Spectral Lockbox (GO)"),
+(@ENTRY,0,2,0,61,0,100,0,0,0,0,0,70,0,0,0,0,0,0,14,44732,141981,0,0,0,0,0,"Corporal Thund Splithoof - On Quest Accept - Respawn Spectral Lockbox Particles (GO)");
+
+UPDATE `conditions` SET `ConditionTypeOrReference`=28 WHERE  `SourceTypeOrReferenceId`=15 AND `SourceGroup`=840 AND `SourceEntry`=2 AND `SourceId`=0 AND `ElseGroup`=0 AND `ConditionTypeOrReference`=9 AND `ConditionTarget`=0 AND `ConditionValue1`=2702 AND `ConditionValue2`=0 AND `ConditionValue3`=0;
+
+-- Modifying condition for Gossip on Fallen Hero of the Horde to spawn Corporal Thund Splithoof so condition is met on condition 28 Quest complete instead of 9 quest taken
+-- reason for this change is that this quest is completed as soon as taken and condition taken is not met here as core sees the quest has complete as soon as it is taken by player
diff --git a/sql/updates/world/2014_07_08_07_world_quest_template.sql b/sql/updates/world/2014_07_08_07_world_quest_template.sql
new file mode 100644
index 00000000000..146d8d2d34f
--- /dev/null
+++ b/sql/updates/world/2014_07_08_07_world_quest_template.sql
@@ -0,0 +1,2 @@
+--
+UPDATE `quest_template` SET `RequestItemsText` = 'I was told a visitor from Quel''Thalas was coming. I was expecting a blood elf, to tell you the truth.$b$bWhat news do you bring?' WHERE `id` = 9812;
diff --git a/sql/updates/world/2014_07_08_08_world_quest_template.sql b/sql/updates/world/2014_07_08_08_world_quest_template.sql
new file mode 100644
index 00000000000..1f40994cefd
--- /dev/null
+++ b/sql/updates/world/2014_07_08_08_world_quest_template.sql
@@ -0,0 +1,2 @@
+--
+UPDATE `quest_template` SET `OfferRewardText` = '<Thrall begins to read the letter.>$b$bSo the blood elves finally took care of their little problem.  It is no surprise that it took your help as well as that of an entire Forsaken regiment to get the job done.$b$b<The Warchief breaks into laughter.>$b$bI suppose there''s no stopping this.  In the end we need them just as much as they need us.' WHERE `id` = 9813;
diff --git a/sql/updates/world/2014_07_08_09_world_misc.sql b/sql/updates/world/2014_07_08_09_world_misc.sql
new file mode 100644
index 00000000000..4600cb80847
--- /dev/null
+++ b/sql/updates/world/2014_07_08_09_world_misc.sql
@@ -0,0 +1,17 @@
+-- Darkweb Victim SAI
+-- To Fix 12037  Search and Rescue
+
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry` =27909;
+
+DELETE FROM `smart_scripts` WHERE `entryorguid` =27909 and `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN(2790900,2790901,2790902) 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
+(27909, 0, 0, 0, 11,  0, 100, 0, 0, 0, 0, 0, 42, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Darkweb Victim - On Spawn - Set Invincibility Hp'),
+(27909, 0, 1, 0, 2,  0, 100, 1, 0, 1, 0, 0, 87, 2790900, 2790901, 2790902, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Darkweb Victim - On 1% HP - Set Random script'),
+(2790900, 9, 0, 0, 0,  0, 100, 0, 0, 0, 0, 0, 11, 49952, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Darkweb Victim - Script 1 - Cast Summon Kurzel'),
+(2790900, 9, 1, 0, 0,  0, 100, 0, 0, 0, 0, 0, 37, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Darkweb Victim - Script 1 - Die'),
+(2790901, 9, 0, 0, 0,  0, 100, 0, 0, 0, 0, 0, 11, 49958, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Darkweb Victim - Script 2 - Cast Summon Drakkari Shaman'),
+(2790901, 9, 1, 0, 0,  0, 100, 0, 0, 0, 0, 0, 37, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Darkweb Victim - Script 2 - Die'),
+(2790902, 9, 0, 0, 0,  0, 100, 0, 0, 0, 0, 0, 11, 49959, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Darkweb Victim - Script 3 - Cast Summon Drakkari Guardian'),
+(2790902, 9, 1, 0, 0,  0, 100, 0, 0, 0, 0, 0, 37, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Darkweb Victim - Script 3 - Die');
diff --git a/sql/updates/world/2014_07_08_10_world_misc.sql b/sql/updates/world/2014_07_08_10_world_misc.sql
new file mode 100644
index 00000000000..5e055a61b15
--- /dev/null
+++ b/sql/updates/world/2014_07_08_10_world_misc.sql
@@ -0,0 +1,34 @@
+--
+DELETE FROM `creature_addon` WHERE `guid` IN(124405,124406);
+INSERT INTO `creature_addon` (`guid`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `auras`) VALUES 
+(124405, 0, 0, 0x10000, 0x1, 0, '27622'),
+(124406, 0, 0, 0x10000, 0x1, 0, '27622');
+
+-- Instructor Hroegar
+DELETE FROM `creature_template_addon` WHERE `entry`=29915;
+INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
+(29915,0,0,1,0, '56058');
+
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN(-124405,-124406);
+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 
+(-124406, 0, 0, 0, 1, 0, 100, 0, 5000, 5000, 5000, 5000, 11, 55796, 2, 0, 0, 0, 0, 19, 30056, 0, 0, 0, 0, 0, 0, 'ELM General Purpose Bunny (scale x0.01) - On Respawn - Cast Get the Key: Vaelens Chains - Left Hand'),
+(-124405, 0, 0, 0, 1, 0, 100, 0, 5000, 5000, 5000, 5000, 11, 54112, 2, 0, 0, 0, 0, 19, 30056, 0, 0, 0, 0, 0, 0, 'ELM General Purpose Bunny (scale x0.01) - On Respawn - Cast Get the Key: Vaelens Chains - Right Hand');
+
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE  `entry`IN(30056,29915);
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN(30056,29915);
+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 
+(30056, 0, 0, 0, 25, 0, 100, 0, 0, 0, 0, 0, 11, 27622, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Vaelen the Flayed - On Reset - Cast Get the Key: Vaelens Invisibility & See Invisibility');
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry` IN(55796,54112);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES 
+(13, 1, 55796, 0, 0, 31, 0, 3, 30056, 0, 0, 0, 0, '', ''),
+(13, 1, 54112, 0, 0, 31, 0, 3, 30056, 0, 0, 0, 0, '', '');
+
+DELETE FROM `spell_area` WHERE `spell`IN(27105,56057) AND `area` IN(4492,4497);
+INSERT INTO `spell_area` (`spell`, `area`, `quest_start`, `quest_end`, `aura_spell`, `racemask`, `gender`, `autocast`, `quest_start_status`, `quest_end_status`) VALUES 
+(27105, 4492, 0, 12951, 0, 0, 2, 1, 64, 11), -- Ufrang's Hall: See Vaelen's Invisibility
+(56057, 4497, 0, 12949, 0, 0, 2, 1, 64, 11); -- Savage Ledge: See Instructor Hroegar's Invisibility
+
+DELETE FROM `creature_loot_template` WHERE `entry`=29915 AND `item`=41843;
+INSERT INTO `creature_loot_template` (`entry`, `item`, `ChanceOrQuestChance`, `lootmode`, `groupid`, `mincountOrRef`, `maxcount`) VALUES 
+(29915, 41843, -100, 1, 0, 1, 1); -- Key to Vaelen's Chains
diff --git a/sql/updates/world/2014_07_08_11_world_misc.sql b/sql/updates/world/2014_07_08_11_world_misc.sql
new file mode 100644
index 00000000000..cc957b012d2
--- /dev/null
+++ b/sql/updates/world/2014_07_08_11_world_misc.sql
@@ -0,0 +1,53 @@
+-- Eredar Soul eater
+
+SET @SOULEATER   := 20879;
+SET @SOULEATERHC := 21595;
+SET @GUID        := 52355; -- TC Unused GUID search tool
+SET @POOL        := 368;
+
+UPDATE `creature_template` SET `spell1` = 0, `spell2` = 0, `spell3` = 0, `AIName` = 'SmartAI' WHERE `entry` = @SOULEATER;
+UPDATE `creature_template` SET `spell1` = 0, `spell2` = 0, `spell3` = 0 WHERE `entry` = @SOULEATERHC;
+
+-- Eredar Soul Eater SAI // not sure how to implement behaviour for spell:36778(SOUL STEAL)
+DELETE FROM `smart_scripts` WHERE (`entryorguid`=@SOULEATER 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 
+(@SOULEATER, 0, 0, 0, 1, 0, 100, 0, 0, 0, 0, 0, 11, 36784, 0, 0, 0, 0, 0, 17, 0, 100, 0, 0, 0, 0, 0, "Eredar Soul Eater - At Range - Cast Entropic Aura"),
+(@SOULEATER, 0, 1, 0, 0, 0, 100, 0, 6000, 12000, 30000, 30000, 11, 36786, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, "Eredar Soul Eater - In Combat - Cast Soul Chill");
+
+-- Creature location for Eredar Soul Eater
+DELETE FROM `linked_respawn` WHERE `guid` = 86053;
+DELETE FROM `creature` WHERE `guid` IN (@GUID, @GUID+1) OR id = @SOULEATER;
+INSERT INTO `creature` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `modelid`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`) VALUES 
+(@GUID, @SOULEATER, 552, 3, 1, 19950, 0, 280.787, 145.315, 22.22593, 0.005122, 7200, 0, 0, 39123, 12620, 0, 0, 0, 8),
+(@GUID+1, @SOULEATER, 552, 3, 1, 19950, 0, 307.477, 150.934, 24.85841, 3.959065, 7200, 0, 0, 39123, 12620, 0, 0, 0, 8);
+
+
+-- Creature Loot for Eredar Soul Eater
+DELETE FROM `creature_loot_template` WHERE `entry`=@SOULEATER;
+INSERT INTO `creature_loot_template` VALUES 
+(@SOULEATER, 30809, 70, 1, 0, 1, 1),
+(@SOULEATER, 21877, 39, 1, 0, 2, 3),
+(@SOULEATER, 32902, 11, 1, 0, 1, 2),
+(@SOULEATER, 27854, 7, 1, 0, 1, 1),
+(@SOULEATER, 29740, 5, 1, 0, 1, 1),
+(@SOULEATER, 27860, 1.8, 1, 0, 1, 1);
+
+-- Creature Pickpocketing Loot for Eredar Soul Eater
+DELETE FROM `pickpocketing_loot_template` WHERE (`entry`=@SOULEATER);
+INSERT INTO `pickpocketing_loot_template` VALUES 
+(@SOULEATER, 29570, 67, 1, 0, 1, 1),
+(@SOULEATER, 29569, 42, 1, 0, 1, 1),
+(@SOULEATER, 27855, 25, 1, 0, 1, 1),
+(@SOULEATER, 22829, 17, 1, 0, 1, 1),
+(@SOULEATER, 27854, 8, 1, 0, 1, 1);
+
+-- Pool_template for Eredar Soul Eater Spawns
+DELETE FROM `pool_template` WHERE entry = 1161;
+INSERT INTO `pool_template` (`entry`, `max_limit`, `description`) VALUES
+(@POOL, 2, 'Eredar Soul-Eater');
+
+-- Pool_creature for Eredar Soul Eater Spawns
+DELETE FROM `pool_creature` WHERE guid IN (@GUID, @GUID+1);
+INSERT INTO `pool_creature` (`guid`, `pool_entry`, `chance`, `description`) VALUES
+(@GUID, @POOL, 0, 'Eredar Soul-Eater - Spawn 1'),
+(@GUID+1, @POOL, 0, 'Eredar Soul-Eater - Spawn 2');
diff --git a/sql/updates/world/2014_07_09_00_world_misc.sql b/sql/updates/world/2014_07_09_00_world_misc.sql
new file mode 100644
index 00000000000..ddc83353176
--- /dev/null
+++ b/sql/updates/world/2014_07_09_00_world_misc.sql
@@ -0,0 +1,18 @@
+-- Chromie -- at start of CoS
+SET @SPELL_TRIGGER     := 53435; -- Teleport to CoT Stratholme Phase 4
+SET @SPELL_EFFECT      := 53436; -- Teleport to CoT Stratholme Phase 4
+
+DELETE FROM `gossip_menu_option` WHERE `menu_id` = @MENUID5 or `menu_id` = @MENUID1 and `id` = 2;
+INSERT INTO `gossip_menu_option` (`menu_id`, `id`, `option_icon`, `option_text`, `OptionBroadcastTextID`, `option_id`, `npc_option_npcflag`, `action_menu_id`, `action_poi_id`, `box_coded`, `box_money`, `box_text`, `BoxBroadcastTextID`) VALUES
+(9586, 2, 0, 'Chromie, you and I both know what\'s going to happen in this time stream. We\'ve seen this all before. Can you just skip us ahead to all the real action?', 39667, 1, 1, 11277, 0, 0, 0, '', 0),
+(11277, 0, 0, 'Yes, please!', 32024, 1, 1, 0, 0, 0, 0, '', 0);
+
+DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=@SPELL_TRIGGER;
+INSERT INTO `spell_linked_spell` (`spell_trigger`,`spell_effect`,`type`,`comment`) VALUES
+(@SPELL_TRIGGER,@SPELL_EFFECT,1,'Teleport to CoT Stratholme Phase 4');
+
+DELETE FROM `spell_target_position` WHERE `id`=@SPELL_EFFECT;
+INSERT INTO `spell_target_position` (`id`,`target_map`,`target_position_x`,`target_position_y`,`target_position_z`,`target_orientation`) VALUES
+(@SPELL_EFFECT,595,2071.55,1287.68,141.687,0);
+
+UPDATE `creature_template` SET `ScriptName`='' WHERE `entry`=18338;