Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4

# Conflicts:
#	sql/old/4.3.4/world/25_2018_01_15/2017_12_27_00_world.sql
#	sql/old/4.3.4/world/25_2018_01_15/2017_12_27_01_world.sql
#	sql/old/4.3.4/world/25_2018_01_15/2017_12_27_02_world.sql
#	sql/updates/world/4.3.4/2017_12_27_00_world.sql
#	sql/updates/world/4.3.4/2017_12_27_01_world.sql
#	sql/updates/world/4.3.4/2017_12_27_02_world.sql
#	sql/updates/world/4.3.4/custom_2017_12_19_00_world.sql
#	sql/updates/world/4.3.4/custom_2017_12_19_05_world.sql
#	sql/updates/world/4.3.4/custom_2017_12_22_01_world.sql

revision_data.h.in.cmake

@@ -7,7 +7,7 @@
  #define _SOURCE_DIRECTORY          R"(@CMAKE_SOURCE_DIR@)"
  #define _BUILD_DIRECTORY           R"(@BUILDDIR@)"
  #define _MYSQL_EXECUTABLE          R"(@MYSQL_EXECUTABLE@)"
- #define _FULL_DATABASE             "TDB_full_world_434.25_2017_12_17.sql"
+ #define _FULL_DATABASE             "TDB_full_world_434.26_2018_01_15.sql"
  #define VER_COMPANYNAME_STR        "TrinityCore Developers"
  #define VER_LEGALCOPYRIGHT_STR     "(c)2008-2018 TrinityCore"
  #define VER_FILEVERSION            0,0,0

sql/base/auth_database.sql

@@ -1999,7 +1999,8 @@ INSERT INTO `updates` VALUES
 ('2017_11_15_00_auth.sql','BF17A1BAF2C3B5A64AEB4DC9C0E46508AA704129','ARCHIVED','2017-10-16 01:40:04',0),
 ('2017_11_16_00_auth.sql','A53D70B4DB8686AB3A0B0E62471717F4F3902ADD','ARCHIVED','2017-11-16 01:40:04',0),
 ('2017_12_17_00_auth.sql','E2EC5999D5305FC12EA576D08EFB95D1660DCF4D','ARCHIVED','2017-12-17 01:40:04',0),
-('2018_01_06_00_auth.sql','CD9B826B9D95697DC412DEF780E814FA3991D6CD','ARCHIVED','2018-01-06 01:40:04',0);
+('2018_01_06_00_auth.sql','CD9B826B9D95697DC412DEF780E814FA3991D6CD','ARCHIVED','2018-01-06 01:40:04',0),
+('2018_01_15_00_auth.sql','1C5C28490B27D86EBC14F6034AA4D34E66D5545D','ARCHIVED','2018-01-15 01:40:04',0);
 /*!40000 ALTER TABLE `updates` ENABLE KEYS */;
 UNLOCK TABLES;
 

sql/base/characters_database.sql

@@ -2874,7 +2874,8 @@ INSERT INTO `updates` VALUES
 ('2017_11_15_00_characters.sql','22D0C3854EE6D0983CD8C43DF0AC4269386F587C','ARCHIVED','2017-11-15 00:00:00',0),
 ('2017_11_26_00_characters.sql','4609CDC122E0A7F27A09C2605B329A06FC7FB7C2','ARCHIVED','2017-11-27 00:00:00',0),
 ('2017_11_28_00_characters.sql','6FF1F84B8985ADFC7FF97F0BF8E53403CF13C320','ARCHIVED','2017-11-28 00:00:00',0),
-('2017_12_17_00_characters.sql','937E8F51DC74AC41FF8F213CE36C69DDEB878D6A','ARCHIVED','2017-12-17 00:00:00',0);
+('2017_12_17_00_characters.sql','937E8F51DC74AC41FF8F213CE36C69DDEB878D6A','ARCHIVED','2017-12-17 00:00:00',0),
+('2018_01_15_00_characters.sql','43C8E4549E1AA9610B377BC7139C88C63D0DC193','ARCHIVED','2018-01-15 00:00:00',0);
 /*!40000 ALTER TABLE `updates` ENABLE KEYS */;
 UNLOCK TABLES;
 

sql/old/4.3.4/world/25_2018_01_15/2017_12_27_00_world.sql

@@ -0,0 +1,41 @@
+-- Lockmaw
+UPDATE `creature_template` SET `difficulty_entry_1`= 49043, `mechanic_immune_mask`= 667893759, `scriptname`= 'boss_lockmaw' WHERE `entry`= 43614;
+UPDATE `creature_template` SET `minlevel`= 87, `maxlevel`= 87, `faction`= 16, `exp`= 3, `mechanic_immune_mask`= 667893759 WHERE `entry`= 49043;
+-- Dust Flail Front
+UPDATE `creature_template` SET `minlevel`= 80, `maxlevel`= 80, `faction`= 14, `unit_flags`= 33554944, `flags_extra`= 128 WHERE `entry`= 43655;
+-- Dust Flail Back
+UPDATE `creature_template` SET `minlevel`= 85, `maxlevel`= 85, `faction`= 14, `unit_flags`= 33554944, `flags_extra`= 128 WHERE `entry`= 43650;
+-- Frenzied Crocolisk
+UPDATE `creature_template` SET `minlevel`= 84, `maxlevel`= 84, `difficulty_entry_1`= 49311, `flags_extra`= 256, `scriptname`= 'npc_lockmaw_frenzied_crocolisk' WHERE `entry`= 43658;
+UPDATE `creature_template` SET `minlevel`= 85, `maxlevel`= 85, `faction`= 16, `exp`= 3, `flags_extra`= 256 WHERE `entry`= 49311;
+-- Augh 1 and 2
+UPDATE `creature_template` SET `unit_flags`= 32832, `mechanic_immune_mask`= 667893759, `scriptname`= 'npc_lockmaw_augh' WHERE `entry` IN (45379, 45378);
+-- Augh
+UPDATE `creature_template` SET `mechanic_immune_mask`= 667893759, `scriptname`= 'boss_augh' WHERE `entry`= 49045;
+-- Add Stalker
+UPDATE `creature_template` SET `unit_flags`= 33554432, `flags_extra`= 131 WHERE `entry`= 45124;
+
+DELETE FROM `spell_script_names` WHERE `ScriptName` IN
+('spell_lockmaw_paralytic_blow_dart',
+'spell_lockmaw_scent_of_blood',
+'spell_lockmaw_random_aggro_taunt');
+
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(84799, 'spell_lockmaw_paralytic_blow_dart'),
+(89989, 'spell_lockmaw_paralytic_blow_dart'),
+(81690, 'spell_lockmaw_scent_of_blood'),
+(89998, 'spell_lockmaw_scent_of_blood'),
+(50230, 'spell_lockmaw_random_aggro_taunt');
+
+DELETE FROM `creature_template_addon` WHERE `entry`= 43650;
+INSERT INTO `creature_template_addon` (`entry`, `Auras`) VALUES
+(43650, '81646');
+
+DELETE FROM `creature_text` WHERE `CreatureID`= 49045;
+INSERT INTO `creature_text` (`CreatureID`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `BroadcastTextId`, `comment`) VALUES 
+(49045, 0, 0, 'Augh appears from the distance!', 41, 0, 0, 0, 0, 0, 50638, 'Augh - Intro 1'),
+(49045, 1, 0, 'GAAAH! How you kill croc?!', 12, 0, 0, 53, 0, 0, 49169, 'Augh - Intro 2'),
+(49045, 2, 0, 'Augh smart! Augh already steal treasure while you no looking!', 12, 0, 0, 1, 0, 0, 49170, 'Augh - Intro 3'),
+(49045, 3, 0, 'Augh da boss! Oh yeah!', 12, 0, 0, 0, 0, 0, 49171, 'Augh Taunt'),
+(49045, 4, 0, 'Augh steal your treasure. Uhn uhn uhnnn!', 12, 0, 0, 0, 0, 0, 49173, 'Augh Taunt'),
+(49045, 5, 0, 'Who bad?! Augh bad!! Ugn!', 12, 0, 0, 0, 0, 0, 49172, 'Augh Taunt');

sql/old/4.3.4/world/25_2018_01_15/2017_12_27_01_world.sql

@@ -0,0 +1,77 @@
+DELETE FROM `spell_area` WHERE `spell`= 59073 AND `area` IN (4756, 4755, 4757, 4714);
+INSERT INTO `spell_area` (`spell`, `area`, `gender`, `quest_start`, `quest_start_status`, `autocast`, `quest_end`, `quest_end_status`) VALUES
+(59073, 4756, 2, 14078, 64, 1, 14159, 1|2|8|32),
+(59073, 4755, 2, 14099, 2|64, 1, 14159, 1|2|8|32),
+(59073, 4757, 2, 14099, 2|64, 1, 14159, 1|2|8|32),
+(59073, 4714, 2, 14099, 2|64, 1, 14159, 1|2|8|32);
+
+DELETE FROM `spell_area` WHERE `spell`= 49416 AND `area`= 4756;
+INSERT INTO `spell_area` (`spell`, `area`, `gender`, `quest_start`, `quest_start_status`, `autocast`, `quest_end`, `quest_end_status`) VALUES
+(49416, 4756, 2, 14078, 64, 1, 14099, 1|8|32);
+
+-- Generic NPC phasing fixups
+UPDATE `creature` SET `phaseId`= 0, `phaseGroup`= 371 WHERE `id` IN (39095, 34863);
+
+-- Generic trigger bunny (multiphase)
+UPDATE `creature` SET `phaseId`= 0, `phaseGroup`= 372 WHERE `id` IN (35374, 35830, 35010, 35011) AND `map`= 654 AND `areaId`= 4756;
+
+-- Conditions
+DELETE FROM `conditions` WHERE `SourceEntry` IN (68087, 68070, 80281) AND `SourceTypeOrReferenceId`= 13;
+INSERT INTO conditions (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ScriptName`, `Comment`) VALUES
+(13, 1, 68087, 0, 0, 31, 0, 3, 35374, 0, 0, 0, '', 'Just Citizen'),
+(13, 1, 80281, 0, 0, 31, 0, 3, 35374, 0, 0, 0, '', 'Summon Citizen and Worgen'),
+(13, 3, 68070, 0, 0, 31, 0, 3, 35374, 0, 0, 0, '', 'Summon Citizen and Worgen');
+
+DELETE FROM `spell_script_names` WHERE `ScriptName` IN (
+'spell_q14098_knocking_67869');
+
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(67869, 'spell_q14098_knocking_67869');
+
+DELETE FROM `smart_scripts` WHERE `entryorguid`= 34981;
+UPDATE `creature_template` SET `AIName`= '', `ScriptName`= 'npc_frightened_citizen' WHERE `entry` IN (34981, 35836);
+
+-- Rampaging Worgen fixups
+UPDATE `creature_template` SET `flags_extra` = `flags_extra` | 2 WHERE `entry`= 34884;
+
+-- Merchant Square Quest Chain
+DELETE FROM `quest_template_addon` WHERE `ID` IN (14093, 14098, 14099, 14094);
+INSERT INTO `quest_template_addon` (`ID`, `PrevQuestID`, `NextQuestID`, `ExclusiveGroup`) VALUES
+(14093, 14091, 0, -14093),
+(14098, 14091, 0, -14093),
+(14094, 14091, 0, -14093),
+(14099, 14093, 0, 0); -- Royal Orders
+
+-- Remove questgiver entry from rampaging worgens
+DELETE FROM `creature_queststarter` WHERE `id`= 34884;
+
+DELETE FROM `creature_text` WHERE `CreatureID` IN (34981, 35836, 34913);
+INSERT INTO `creature_text` (`CreatureID`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `BroadcastTextId`, `comment`) VALUES
+-- Frightened Citizen
+(34981, 0, 0, 'What in the world?  Let''s get out of here!', 12, 0, 100, 1, 0, 0, 35235, 'Frightened Citizen to Player'),
+(34981, 0, 1, 'Let''s go!', 12, 0, 100, 1, 0, 0, 35236, 'Frightened Citizen to Player'),
+(34981, 0, 2, 'No time to waste!', 12, 0, 100, 1, 0, 0, 35237, 'Frightened Citizen to Player'),
+(34981, 0, 3, 'Worgen!  Worgen everywhere!', 12, 0, 100, 1, 0, 0, 35238, 'Frightened Citizen to Player'),
+(34981, 0, 4, 'Flee!  They''re everywhere!', 12, 0, 100, 1, 0, 0, 35240, 'Frightened Citizen to Player'),
+(34981, 0, 5, 'This place isn''t safe.  Let''s leave!', 12, 0, 100, 1, 0, 0, 35239, 'Frightened Citizen to Player'),
+(34981, 0, 6, 'Protect me, please!', 12, 0, 100, 1, 0, 0, 35234, 'Frightened Citizen to Player'),
+(35836, 0, 0, 'It''s coming right for me!!', 12, 0, 100, 1, 0, 0, 36037, 'Frightened Citizen to Player'),
+(35836, 0, 1, 'Help me, please!', 12, 0, 100, 1, 0, 0, 36038, 'Frightened Citizen to Player'),
+(35836, 0, 2, 'There''s one after me!', 12, 0, 100, 1, 0, 0, 36039, 'Frightened Citizen to Player'),
+(35836, 0, 3, 'Help!', 12, 0, 100, 1, 0, 0, 36040, 'Frightened Citizen to Player'),
+(35836, 0, 4, 'I don''t want to die!', 12, 0, 100, 1, 0, 0, 36041, 'Frightened Citizen to Player'),
+-- Liam Greyman Phase 170
+(34913, 0, 0, 'Stand your ground, men!', 14, 0, 100, 0, 0, 19617, 35166, 'Prince Liam Greymane'),
+(34913, 0, 1, 'Defeat these foul beasts!', 14, 0, 100, 0, 0, 19618, 35167, 'Prince Liam Greymane'),
+(34913, 0, 2, 'Protect the civilians!', 14, 0, 100, 0, 0, 19619, 35168, 'Prince Liam Greymane'),
+(34913, 0, 3, 'Push them back!', 14, 0, 100, 0, 0, 19620, 35169, 'Prince Liam Greymane'),
+(34913, 0, 4, 'Take heart, men!  We must protect our city!', 14, 0, 100, 0, 0, 19621, 35170, 'Prince Liam Greymane');
+
+-- Creature Prince Liam Greymane 34913 SAI
+SET @ENTRY := 34913;
+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, 4, 0, 100, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "On aggro - None: Talk 0 // ");
+
+UPDATE `gameobject_template_addon` SET `flags`= 4 WHERE `entry`= 195306;

sql/old/4.3.4/world/25_2018_01_15/2017_12_27_02_world.sql

@@ -0,0 +1,53 @@
+-- General Husam
+UPDATE creature_template SET `difficulty_entry_1` = 48932, `lootid` = 44577 WHERE `entry` = 44577;
+DELETE FROM `creature_loot_template` WHERE entry IN (44577, 48932);
+INSERT INTO `creature_loot_template` (`Entry`, `Item`, `Chance`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`) VALUES
+(44577, 55858, 0, 1, 1, 1, 1),
+(44577, 55857, 0, 1, 1, 1, 1),
+(44577, 55856, 0, 1, 1, 1, 1),
+(44577, 55859, 0, 1, 1, 1, 1),
+(44577, 55860, 0, 1, 1, 1, 1);
+
+UPDATE `creature_template` SET `lootid` = 48932 WHERE `entry` = 48932;
+INSERT INTO `creature_loot_template` (`Entry`, `Item`, `Chance`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`) VALUES
+(48932, 56379, 0, 1, 1, 1, 1),
+(48932, 56383, 0, 1, 1, 1, 1),
+(48932, 56381, 0, 1, 1, 1, 1),
+(48932, 56380, 0, 1, 1, 1, 1),
+(48932, 56382, 0, 1, 1, 1, 1);
+
+-- Siamat
+DELETE FROM `creature_loot_template` WHERE `Entry` IN (44819, 51088);
+DELETE FROM `reference_loot_template` WHERE `Entry` IN (44819, 51088);
+INSERT INTO `creature_loot_template` (`Entry`, `Chance`, `LootMode`, `Reference`, `MinCount`, `MaxCount`) VALUES
+(44819, 100, 1, 448190, 2, 2);
+INSERT INTO `reference_loot_template` (`Entry`, `Item`, `Chance`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`) VALUES
+(448190, 55872, 0, 1, 1, 1, 1),
+(448190, 55876, 0, 1, 1, 1, 1),
+(448190, 55878, 0, 1, 1, 1, 1),
+(448190, 55877, 0, 1, 1, 1, 1),
+(448190, 55871, 0, 1, 1, 1, 1),
+(448190, 55873, 0, 1, 1, 1, 1),
+(448190, 55874, 0, 1, 1, 1, 1),
+(448190, 55879, 0, 1, 1, 1, 1),
+(448190, 55875, 0, 1, 1, 1, 1),
+(448190, 55880, 0, 1, 1, 1, 1);
+
+UPDATE `creature_template` SET `lootid`= 51088 WHERE `entry`= 51088;
+INSERT INTO `creature_loot_template` (`Entry`, `Chance`, `LootMode`, `Reference`, `MinCount`, `MaxCount`) VALUES
+(51088, 100, 1, 510880, 2, 2);
+INSERT INTO `reference_loot_template` (`Entry`, `Item`, `Chance`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`) VALUES
+(510880, 56397, 0, 1, 1, 1, 1),
+(510880, 56399, 0, 1, 1, 1, 1),
+(510880, 56403, 0, 1, 1, 1, 1),
+(510880, 56401, 0, 1, 1, 1, 1),
+(510880, 56395, 0, 1, 1, 1, 1),
+(510880, 56398, 0, 1, 1, 1, 1),
+(510880, 56394, 0, 1, 1, 1, 1),
+(510880, 56400, 0, 1, 1, 1, 1),
+(510880, 56396, 0, 1, 1, 1, 1),
+(510880, 56402, 0, 1, 1, 1, 1),
+(510880, 52078, 100, 1, 2, 1, 1); -- Chaos Orb
+
+-- Gold Loot
+UPDATE `creature_template` SET `mingold`= 19800, `maxgold`= 19900 WHERE entry IN (44577, 48932, 43614, 49045, 43612, 48951, 44819, 51088);

sql/updates/auth/4.3.4/2018_01_15_00_auth.sql

@@ -0,0 +1,2 @@
+-- TDB 4.3.4-26 auth database
+UPDATE `updates` SET `state`='ARCHIVED';

sql/updates/characters/4.3.4/2018_01_15_00_characters.sql

@@ -0,0 +1,2 @@
+-- TDB 4.3.4-26 characters database
+UPDATE `updates` SET `state`='ARCHIVED';

sql/updates/world/4.3.4/2018_01_15_00_world.sql

@@ -0,0 +1,3 @@
+UPDATE `version` SET `db_version`='TDB 434.26', `cache_id`=26 LIMIT 1;
+
+UPDATE `updates` SET `state`='ARCHIVED';