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

2018-01-19 17:01:29 +01:00
commit 4b10a17f9e
@@ -25,6 +25,9 @@ addons:
      - libbz2-dev
      - libzmq3-dev

+services:
+  - mysql
+
 before_install:
  - git config user.email "travis@build.bot" && git config user.name "Travis CI"
  - git tag -a -m "Travis build" init
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
+# Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -7,18 +7,18 @@ Contributing is not only about creating fixes, but also reporting bugs. Before r
 Issues
 ======

-Read [this](http://www.trinitycore.org/f/topic/37-the-trinitycore-issuetracker-and-you/) before creating a ticket.  
-If you have problems with TrinityCore installation, read [this](http://www.trinitycore.org/f/topic/1518-trouble-with-your-trinity-install-readme-1st-faqs/).
+Read [this](https://www.trinitycore.org/f/topic/37-the-trinitycore-issuetracker-and-you/) before creating a ticket.  
+If you have problems with TrinityCore installation, read [this](https://www.trinitycore.org/f/topic/1518-trouble-with-your-trinity-install-readme-1st-faqs/).

 Mandatory things when creating a ticket:  
 ========================================

 - Branch  
- commit hash (if you get something like TrinityCore rev. unknown 1970-01-01 00:00:00 +0000 (Archived branch) (Win64, Release), please read this [post](http://www.trinitycore.org/f/topic/345-howto-properly-install-git-on-windows-fix-trinitycore-rev-1970-01-01-000000-0000/) or clone this repository instead downloading the source code.  
+- commit hash (if you get something like TrinityCore rev. unknown 1970-01-01 00:00:00 +0000 (Archived branch) (Win64, Release), please read this [post](https://www.trinitycore.org/f/topic/345-howto-properly-install-git-on-windows-fix-trinitycore-rev-1970-01-01-000000-0000/) or clone this repository instead downloading the source code.  
 - entries of affected creatures / items / quests with a link to the relevant wowhead page.  
 - clear title and description of the bug - if your english is very bad, please use google translate or yandex to translate to english and include one text in your native language.

-When reporting a crash, you MUST compile in debug mode because release dumps are useless (not enough information) - if you don't know how to compile in debug, read [this](http://www.trinitycore.org/f/topic/1518-trouble-with-your-trinity-install-readme-1st-faqs/#entry47672)
+When reporting a crash, you MUST compile in debug mode because release dumps are useless (not enough information) - if you don't know how to compile in debug, read [this](https://www.trinitycore.org/f/topic/1518-trouble-with-your-trinity-install-readme-1st-faqs/#entry47672)

 We sugest the title and body to have the next style:

@@ -39,8 +39,8 @@ Creating Pull Requests:


 When creating patches read:
- [TrinityCore Development Standards](http://www.trinitycore.org/f/topic/6-trinitycore-developing-standards/)
- [WDB Fields](http://www.trinitycore.org/f/topic/58-wdb-fields/)
+- [TrinityCore Development Standards](https://www.trinitycore.org/f/topic/6-trinitycore-developing-standards/)
+- [WDB Fields](https://www.trinitycore.org/f/topic/58-wdb-fields/)
 - [Git Squash](https://ariejan.net/2011/07/05/git-squash-your-latests-commits-into-one/)


@@ -53,7 +53,7 @@ Since it's very unlikely that your Pull Request will be merged on the day that y
 Wiki
 ====

-The wiki is located at [http://trinitycore.info](http://trinitycore.info).
+The wiki is located at [https://trinitycore.info](https://trinitycore.info).

 You are welcome to create an account and help us improve and extend the wiki.

@@ -62,7 +62,7 @@ Requirements
 ============


-Software requirements are available in the [wiki](http://www.trinitycore.info/display/tc/Requirements) for
+Software requirements are available in the [wiki](https://www.trinitycore.info/display/tc/Requirements) for
 Windows, Linux and Mac OSX.

 If you choose Linux, we recommend to use Debian 8, since it's the Linux that we use to test compilations.
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
+# Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
+# Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
+# Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
+# Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
+# Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
+# Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
+# Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
+# Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w

-# Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
+# Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
 # Author: leak
 # Date: 2010-12-06
 # Note: Based on conf file format of rev 10507
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
+# Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
+# Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
+# Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
+# Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
+# Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
+# Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
+# Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
+# Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
+# Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
+# Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
+# Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
+# Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
 # Copyright (C) 2005-2011 MaNGOS project <http://getmangos.com/>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
+# Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
+# Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
+# Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
+# Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
+# Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
+# Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
+# Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2017 TrinityCore <http://www.trinitycore.org/>
+# Copyright (C) 2008-2018 TrinityCore <https://www.trinitycore.org/>
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -1,15 +1,15 @@
 = TrinityCore -- Linux installation =
-Copyright (C) 2008-2017 TrinityCore (http://www.trinitycore.org/)
+Copyright (C) 2008-2018 TrinityCore (https://www.trinitycore.org/)

 =========================================================
 WARNING: THIS DOCUMENTATION IS NOT ALWAYS UP TO DATE.
 FOR MORE UP-TO-DATE INFORMATION, CHECK THE TRINITY WIKI.
 =========================================================

-CHECK http://www.trinitycore.info/How-to:Linux FOR FURTHER HELP
+CHECK https://www.trinitycore.info/display/tc/Requirements FOR FURTHER HELP

 These are instructions for installation in a Linux environment, if you are
-using Windows refer to http://www.trinitycore.info/How-to:Win
+using Windows refer to https://trinitycore.atlassian.net/wiki/spaces/tc/pages/10977296/Windows+Requirements

 Installing TrinityCore is fairly simple on a Linux machine, assuming you 
 have all required applications
@@ -17,9 +17,9 @@ have all required applications
 The most important ones are:

    g++
-    gcc version 4.3.x or greater
+    gcc version 6.3.x or greater
    make
-    cmake version 2.6.x or greater
+    cmake version 3.2.x or greater
    libmysql++-dev
    git (for checking out the core and database)
    openssl
@@ -7,9 +7,9 @@
 #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-2017 TrinityCore"
+ #define VER_LEGALCOPYRIGHT_STR     "(c)2008-2018 TrinityCore"
 #define VER_FILEVERSION            0,0,0
 #define VER_FILEVERSION_STR        "@rev_hash@ @rev_date@ (@rev_branch@ branch)"
 #define VER_PRODUCTVERSION         VER_FILEVERSION
@@ -38,7 +38,7 @@ CREATE TABLE `account` (
  `failed_logins` int(10) unsigned NOT NULL DEFAULT '0',
  `locked` tinyint(3) unsigned NOT NULL DEFAULT '0',
  `lock_country` varchar(2) NOT NULL DEFAULT '00',
-  `last_login` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `last_login` timestamp NULL,
  `online` tinyint(3) unsigned NOT NULL DEFAULT '0',
  `expansion` tinyint(3) unsigned NOT NULL DEFAULT '3',
  `mutetime` bigint(20) NOT NULL DEFAULT '0',
@@ -212,7 +212,7 @@ CREATE TABLE `battlenet_accounts` (
  `failed_logins` int(10) unsigned NOT NULL DEFAULT '0',
  `locked` tinyint(3) unsigned NOT NULL DEFAULT '0',
  `lock_country` varchar(2) NOT NULL DEFAULT '00',
-  `last_login` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `last_login` timestamp NULL,
  `online` tinyint(3) unsigned NOT NULL DEFAULT '0',
  `locale` tinyint(3) unsigned NOT NULL DEFAULT '0',
  `os` varchar(3) NOT NULL DEFAULT '',
@@ -1998,7 +1998,9 @@ INSERT INTO `updates` VALUES
 ('2017_11_08_00_auth.sql','DB37CC4B077D6C2413F4091E48C3382411F59228','ARCHIVED','2017-11-08 01:40:04',0),
 ('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);
+('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_15_00_auth.sql','1C5C28490B27D86EBC14F6034AA4D34E66D5545D','ARCHIVED','2018-01-15 01:40:04',0);
 /*!40000 ALTER TABLE `updates` ENABLE KEYS */;
 UNLOCK TABLES;

@@ -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;

@@ -785,6 +785,7 @@ CREATE TABLE `game_event` (
  `occurence` bigint(20) unsigned NOT NULL DEFAULT '5184000' COMMENT 'Delay in minutes between occurences of the event',
  `length` bigint(20) unsigned NOT NULL DEFAULT '2592000' COMMENT 'Length in minutes of the event',
  `holiday` mediumint(8) unsigned NOT NULL DEFAULT '0' COMMENT 'Client side holiday id',
+  `holidayStage` TINYINT UNSIGNED NOT NULL DEFAULT '0' COMMENT '',
  `description` varchar(255) DEFAULT NULL COMMENT 'Description of the event displayed in console',
  `world_event` tinyint(3) unsigned NOT NULL DEFAULT '0' COMMENT '0 if normal event, 1 if world event',
  `announce` tinyint(3) unsigned DEFAULT '2' COMMENT '0 dont announce, 1 announce, 2 value from config',
@@ -0,0 +1,14 @@
+SET @sql_mode = @@session.sql_mode;
+SET SESSION sql_mode = '';
+
+ALTER TABLE `account`
+  CHANGE `last_login` `last_login` TIMESTAMP NULL;
+
+UPDATE `account` SET `last_login`=NULL WHERE `last_login`='0000-00-00 00:00:00';
+
+ALTER TABLE `battlenet_accounts`
+  CHANGE `last_login` `last_login` TIMESTAMP NULL;
+
+UPDATE `battlenet_accounts` SET `last_login`=NULL WHERE `last_login`='0000-00-00 00:00:00';
+
+SET SESSION sql_mode = @@sql_mode;
@@ -0,0 +1,11 @@
+-- Restore deleted pool
+SET @POOL_1 := 382;
+
+DELETE FROM `pool_template` WHERE `entry`=@POOL_1;
+INSERT INTO `pool_template` VALUES 
+(@POOL_1, 1, "Eye of DarKhan/Wailer Spawn 1");
+
+DELETE FROM `pool_creature` WHERE `guid` IN (82897, 85744);
+INSERT INTO `pool_creature` VALUES 
+(82897, @POOL_1, 0, "Wailer Spawn 1"),
+(85744, @POOL_1, 0, "Eye of DarKhan Spawn 1");
@@ -0,0 +1,4 @@
+DELETE FROM `lfg_dungeon_template` WHERE `dungeonId` IN (30, 276);
+INSERT INTO `lfg_dungeon_template` (`dungeonId`, `name`, `position_x`, `position_y`, `position_z`, `orientation`, `VerifiedBuild`) VALUES
+(30,  'Blackrock Depths - Prison',     456.929, 34.0923, -68.0896, 4.712389, 11159),
+(276, 'Blackrock Depths - Upper City', 456.929, 34.0923, -68.0896, 4.712389, 11159);
@@ -0,0 +1,6 @@
+DELETE FROM `spell_area` WHERE `spell` IN (30550, 30557, 30562, 30567);
+INSERT INTO `spell_area` (`spell`, `area`, `quest_start`, `quest_end`, `aura_spell`, `raceMask`, `gender`, `autocast`, `quest_start_status`, `quest_end_status`) VALUES
+(30550, 3457, 0, 0, 0, 0, 2, 0, 64, 11),
+(30557, 3457, 0, 0, 0, 0, 2, 0, 64, 11),
+(30562, 3457, 0, 0, 0, 0, 2, 0, 64, 11),
+(30567, 3457, 0, 0, 0, 0, 2, 0, 64, 11);
@@ -0,0 +1 @@
+UPDATE `creature_template` SET `flags_extra`=128 WHERE `entry`=23224;
@@ -0,0 +1 @@
+UPDATE `reference_loot_template` SET `Chance` = 40 WHERE `Entry` IN (34278,34279) AND `Item` IN (52025,52028);
@@ -0,0 +1,3 @@
+DELETE FROM `gameobject` WHERE `id` = 190557 AND `map` = 631;
+INSERT INTO `gameobject` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`, `VerifiedBuild`) VALUES
+(1498,190557,631,0,0,15,1,-59.4583,2157.47,30.6542,2.75761,0,0,0,1,6000,100,1,0);
@@ -0,0 +1,3 @@
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_hor_quel_delars_will';
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(70698, 'spell_hor_quel_delars_will');
@@ -0,0 +1,2 @@
+-- Update spells for Thunder Bluff Kodo
+UPDATE `creature_template` SET `spell1`=62544, `spell3`=62960 WHERE `entry`=33322;
@@ -0,0 +1,3 @@
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_item_valanyr_hammer_of_ancient_kings';
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(64415,'spell_item_valanyr_hammer_of_ancient_kings');
@@ -0,0 +1 @@
+UPDATE `creature_template` SET `mechanic_immune_mask` = `mechanic_immune_mask` & 0xFFFFFF7F;
@@ -0,0 +1,2 @@
+--
+UPDATE `creature` SET `MovementType` = 0 WHERE `guid` = 82823;
@@ -0,0 +1,5 @@
+-- 
+DELETE FROM `smart_scripts` WHERE `entryorguid`=27283 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
+(27283, 0, 0, 0, 0, 0, 100, 0, 1000, 2000, 3400, 4800, 11, 9672, 64, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, "Risen Wintergarde Mage - IC - Cast 'Frostbolt'"),
+(27283, 0, 1, 0, 0, 0, 100, 0, 8000, 12000, 9000, 14000, 11, 13339, 65, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, "Risen Wintergarde Mage - In Combat - Cast 'Fire Blast'");
@@ -0,0 +1,2 @@
+-- 
+UPDATE `creature` SET `position_x`=469.25, `position_y`=12.05, `position_z`=49.299, `orientation`=1.5708 WHERE `guid`=10997 AND `id`=21962;
@@ -0,0 +1,2 @@
+-- 
+UPDATE `creature_template` SET `unit_flags`=`unit_flags`|768 WHERE `entry` IN(40495);
@@ -0,0 +1 @@
+UPDATE `spell_proc` SET `SpellPhaseMask`=0x1,`AttributesMask`=0x2 WHERE `SpellId` IN (44543,44545);
@@ -0,0 +1,12 @@
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (13,17) AND `SourceEntry`=32307;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(13, 3, 32307, 0, 0, 31, 0, 3, 17148, 0, 0, 0, 0, '', 'Spell Plant Warmaul Ogre Banner (effects 0 & 1) will hit the potential target of the spell if target is unit Kil''sorrow Deathsworn.'),
+(13, 3, 32307, 0, 0, 36, 0, 0, 0, 0, 1, 0, 0, '', 'Spell Plant Warmaul Ogre Banner (effects 0 & 1) will hit the potential target of the spell if target is dead'),
+(13, 3, 32307, 0, 1, 31, 0, 3, 18658, 0, 0, 0, 0, '', 'Spell Plant Warmaul Ogre Banner (effects 0 & 1) will hit the potential target of the spell if target is unit Kil''sorrow Ritualist.'),
+(13, 3, 32307, 0, 1, 36, 0, 0, 0, 0, 1, 0, 0, '', 'Spell Plant Warmaul Ogre Banner (effects 0 & 1) will hit the potential target of the spell if target is dead'),
+(13, 3, 32307, 0, 2, 31, 0, 3, 17147, 0, 0, 0, 0, '', 'Spell Plant Warmaul Ogre Banner (effects 0 & 1) will hit the potential target of the spell if target is unit Kil''sorrow Cultist.'),
+(13, 3, 32307, 0, 2, 36, 0, 0, 0, 0, 1, 0, 0, '', 'Spell Plant Warmaul Ogre Banner (effects 0 & 1) will hit the potential target of the spell if target is dead'),
+(13, 3, 32307, 0, 3, 31, 0, 3, 17146, 0, 0, 0, 0, '', 'Spell Plant Warmaul Ogre Banner (effects 0 & 1) will hit the potential target of the spell if target is unit Kil''sorrow Spellbinder.'),
+(13, 3, 32307, 0, 3, 36, 0, 0, 0, 0, 1, 0, 0, '', 'Spell Plant Warmaul Ogre Banner (effects 0 & 1) will hit the potential target of the spell if target is dead'),
+(13, 3, 32307, 0, 4, 31, 0, 3, 18391, 0, 0, 0, 0, '', 'Spell Plant Warmaul Ogre Banner (effects 0 & 1) will hit the potential target of the spell if target is unit Giselda the Crone.'),
+(13, 3, 32307, 0, 4, 36, 0, 0, 0, 0, 1, 0, 0, '', 'Spell Plant Warmaul Ogre Banner (effects 0 & 1) will hit the potential target of the spell if target is dead');
@@ -0,0 +1,4 @@
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_yogg_saron_squeeze';
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(64125, 'spell_yogg_saron_squeeze'),
+(64126, 'spell_yogg_saron_squeeze');
@@ -0,0 +1,3 @@
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_item_power_circle';
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(45043, 'spell_item_power_circle');
@@ -0,0 +1 @@
+DELETE FROM `spell_group` WHERE `spell_id`=17624;
@@ -0,0 +1,46 @@
+-- 
+-- ELM General Purpose Bunny
+DELETE FROM `smart_scripts` WHERE `entryorguid`=23837 AND `source_type`=0 AND `id` IN (7,8);
+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
+(23837,0,7,0,38,0,100,0,29,29,0,0,11,40163,2,0,0,0,0,1,0,0,0,0,0,0,0,"ELM General Purpose Bunny - On Data Set - Cast Teleport"),
+(23837,0,8,0,38,0,100,0,29,29,0,0,50,186943,30,0,0,0,0,1,0,0,0,0,0,0,0,"ELM General Purpose Bunny - On Data Set - Summon Gameobject 'Scuttle's Mop and Bucket'");
+
+-- Scuttle Frostprow
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=24784;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=24784 AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=2478400 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
+(24784,0,0,0,20,0,100,0,11469,0,0,0,80,2478400,0,0,0,0,0,1,0,0,0,0,0,0,0,"Scuttle Frostprow - On Quest 'Swabbin' Soap' Finished - Run Script"),
+(2478400,9,0,0,0,0,100,0,0,0,0,0,83,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Scuttle Frostprow - On Script - Remove Npc Flag Questgiver"),
+(2478400,9,1,0,0,0,100,0,500,500,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Scuttle Frostprow - On Script - Say Line 0"),
+(2478400,9,2,0,0,0,100,0,2000,2000,0,0,11,44433,0,0,0,0,0,1,0,0,0,0,0,0,0,"Scuttle Frostprow - On Script - Cast Summon Swabbin' Mops and Buckets"),
+(2478400,9,3,0,0,0,100,0,3000,3000,0,0,45,29,29,0,0,0,0,11,23837,30,0,0,0,0,0,"Scuttle Frostprow - On Script - Set Data to ELM General Purpose Bunny"),
+(2478400,9,4,0,0,0,100,0,0,0,0,0,45,1,1,0,0,0,0,10,102072,24642,0,0,0,0,0,"Scuttle Frostprow - On Script - Set Data to Drunken Northsea Pirate"),
+(2478400,9,5,0,0,0,100,0,6000,6000,0,0,1,1,0,0,0,0,0,7,0,0,0,0,0,0,0,"Scuttle Frostprow - On Script - Say Line 1"),
+(2478400,9,6,0,0,0,100,0,24000,24000,0,0,82,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Scuttle Frostprow - On Script - Add Npc Flag Questgiver");
+
+-- Drunken Northsea Pirate
+DELETE FROM `smart_scripts` WHERE `entryorguid`=-102072 AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=2464200 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
+(-102072,0,0,0,1,1,50,0,0,45000,90000,180000,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Drunken Northsea Pirate - Out of Combat - Say Line 0'),
+(-102072,0,1,0,11,0,100,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Drunken Northsea Pirate - On Respawn - Set Event Phase 1'),
+(-102072,0,2,0,38,0,100,0,1,1,0,0,80,2464200,0,0,0,0,0,1,0,0,0,0,0,0,0,'Drunken Northsea Pirate - On Data Set - Run Script'),
+(2464200,9,0,0,0,0,100,0,0,0,0,0,22,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Drunken Northsea Pirate - On Script - Set Event Phase 0"),
+(2464200,9,1,0,0,0,100,0,3000,3000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Drunken Northsea Pirate - On Script - Say Line 1"),
+(2464200,9,2,0,0,0,100,0,7000,7000,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,1.64061,"Drunken Northsea Pirate - On Script - Set Orientation"),
+(2464200,9,3,0,0,0,100,0,1000,1000,0,0,11,44435,0,0,0,0,0,1,0,0,0,0,0,0,0,"Drunken Northsea Pirate - On Script - Cast 'Swabbin' Soap: Drunken Northsea Pirate Throws Bottle'"),
+(2464200,9,4,0,0,0,100,0,0,0,0,0,40,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Drunken Northsea Pirate - On Script - Set Sheath Unarmed"),
+(2464200,9,5,0,0,0,100,0,4000,4000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Drunken Northsea Pirate - On Script - Say Line 2"),
+(2464200,9,6,0,0,0,100,0,15000,15000,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,4.18879,"Drunken Northsea Pirate - On Script - Set Orientation"),
+(2464200,9,7,0,0,0,100,0,0,0,0,0,40,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Drunken Northsea Pirate - On Script - Set Sheath Melee"),
+(2464200,9,8,0,0,0,100,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Drunken Northsea Pirate - On Script - Set Event Phase 0");
+
+-- Texts
+DELETE FROM `creature_text` WHERE `CreatureID`=24784;
+DELETE FROM `creature_text` WHERE `CreatureID`=24642 AND `GroupID` IN (1,2);
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(24784,0,0,"There we go, $n! This fat'll do the trick fer sure! And now for some real swabbin'!",12,0,100,1,0,0,23831,0,"Scuttle Frostprow"),
+(24784,1,0,"Look at 'em go! Spotless!",12,0,100,4,0,0,23832,0,"Scuttle Frostprow"),
+(24642,1,0,"What ...hic?!",12,0,100,5,0,0,23834,0,"Drunken Northsea Pirate"),
+(24642,2,0,"That's it... no more grog for me!",12,0,100,1,0,0,23835,0,"Drunken Northsea Pirate");
@@ -0,0 +1,2 @@
+-- Dream Vision
+UPDATE `creature_template` SET `unit_flags`=`unit_flags`|768 WHERE `entry`=7863;
@@ -0,0 +1,2 @@
+-- 'Cabal Agent' is not a CIVILIAN
+UPDATE `creature_template` SET `flags_extra`=`flags_extra`&(~2) WHERE `entry`=19503;
@@ -0,0 +1,5 @@
+-- Add condition to gossip text of Thassarian
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=9840;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES 
+(14, 9840, 13609, 0, 0, 8, 0, 12019, 0, 0, 0, 0, 0, "", "Gossip if quest=12019 is completed"), 
+(14, 9840, 13608, 0, 0, 8, 0, 12019, 0, 0, 1, 0, 0, "", "Gossip if quest=12019 isn't completed");
@@ -0,0 +1 @@
+UPDATE `spell_proc` SET `SpellPhaseMask`=0x1 WHERE `SpellId`=-51521;
@@ -0,0 +1,11 @@
+SET @sql_mode = @@session.sql_mode;
+SET SESSION sql_mode = '';
+
+ALTER TABLE `game_event`
+  CHANGE `start_time` `start_time` TIMESTAMP NULL COMMENT 'Absolute start date, the event will never start before',
+  CHANGE `end_time` `end_time` TIMESTAMP NULL COMMENT 'Absolute end date, the event will never start after';
+
+UPDATE `game_event` SET `start_time`=NULL WHERE `start_time`='0000-00-00 00:00:00';
+UPDATE `game_event` SET `end_time`=NULL WHERE `end_time`='0000-00-00 00:00:00';
+
+SET SESSION sql_mode = @@sql_mode;
@@ -0,0 +1,4 @@
+--
+DELETE FROM `event_scripts` WHERE `id`=17209 AND `command`=8;
+INSERT INTO `event_scripts` (`id`, `delay`, `command`, `datalong`, `datalong2`, `dataint`, `x`, `y`, `z`, `o`) VALUES 
+(17209, 1, 8, 27995, 1, 0, 0, 0, 0, 0);
@@ -0,0 +1,9 @@
+--
+DELETE FROM `quest_template_addon` WHERE `ID` IN (26150, 46);
+INSERT INTO `quest_template_addon` (`ID`, `MaxLevel`, `AllowableClasses`, `SourceSpellID`, `PrevQuestID`, `NextQuestID`, `ExclusiveGroup`, `RewardMailTemplateID`, `RewardMailDelay`, `RequiredSkillID`, `RequiredSkillPoints`, `RequiredMinRepFaction`, `RequiredMaxRepFaction`, `RequiredMinRepValue`, `RequiredMaxRepValue`, `ProvidedItemCount`, `SpecialFlags`) VALUES
+(26150,0,0,0,60,0,0,0,0,0,0,0,0,0,0,0,0),
+(46,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
+
+DELETE FROM `creature_loot_template` WHERE `Entry`=13159 AND `Item`=1307;
+INSERT INTO `creature_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`, `Comment`) VALUES
+(13159,1307,0,100,0,1,0,1,1,NULL);
@@ -0,0 +1,19 @@
+/*
+-- Remove unique items from reference table 24077
+DELETE FROM `reference_loot_template` WHERE `Entry`=24077 AND `Item` IN (827, 1214, 1219, 1405, 1925, 1928, 1958, 1959, 4676);
+-- Add former items from reference table 24077 to their proper NPCs
+DELETE FROM `creature_loot_template` WHERE `Item` IN (827, 1214, 1219, 1405, 1925, 1928, 1958, 1959, 4676);
+INSERT INTO `creature_loot_template` (`Entry`, `Item`, `Chance`, `LootMode`, `MinCount`, `MaxCount`, `GroupId`, `Comment`) VALUES
+(122, 827, 0.1, 1, 1, 1, 0, 'Defias Highwayman - Wicked Blackjack'),
+(449, 827, 0.1, 1, 1, 1, 0, 'Defias Knuckleduster - Wicked Blackjack'),
+(426, 1214, 0.1, 1, 1, 1, 0, 'Redridge Brute - Gnoll Punisher'),
+(424, 1219, 0.1, 1, 1, 1, 0, 'Redridge Poacher - Redridge Machete'),
+(517, 1405, 0.1, 1, 1, 1, 0, 'Murloc Oracle - Foamspittle Staff'),
+(1725, 1925, 0.1, 1, 1, 1, 0, 'Defias Watchman - Defias Rapier'),
+(1726, 1928, 0.1, 1, 1, 1, 0, 'Defias Magician - Defias Mage Staff'),
+(623, 1958, 0.1, 1, 1, 1, 2, 'Skeletal Miner - Petrified Shinbone'),
+(623, 1959, 0.1, 1, 1, 1, 2, 'Skeletal Miner - Cold Iron Pick'),
+(624, 1958, 0.1, 1, 1, 1, 2, 'Undead Excavator - Petrified Shinbone'),
+(624, 4676, 0.1, 1, 1, 1, 2, 'Undead Excavator - Skeletal Gauntlets'),
+(625, 1958, 0.1, 1, 1, 1, 0, 'Undead Dynamiter - Petrified Shinbone');
+*/
@@ -0,0 +1,3 @@
+-- Stabled Argent Warhorse
+DELETE FROM `conditions` WHERE `SourceGroup`=33870 AND `SourceTypeOrReferenceId`=18 AND SourceEntry=63663; 
+INSERT INTO `conditions` VALUES (18,33870,63663,0,0,9,0,13664,0,0,0,0,0,'','Spellclick requires quest 13664 active');
@@ -0,0 +1,32 @@
+-- Ruby Sanctum white damage update
+UPDATE `creature_template` SET `DamageModifier`=114 WHERE `entry` IN (39863,40142); -- Halion/Halion Twilight 10N
+UPDATE `creature_template` SET `DamageModifier`=172 WHERE `entry` IN (39864,40143); -- Halion/Halion Twilight 25N
+UPDATE `creature_template` SET `DamageModifier`=172 WHERE `entry` IN (39944,40144); -- Halion/Halion Twilight 10H
+UPDATE `creature_template` SET `DamageModifier`=257 WHERE `entry` IN (39945,40145); -- Halion/Halion Twilight 25H
+
+UPDATE `creature_template` SET `DamageModifier`= 86 WHERE `entry`=39746; -- General Zarithrian 10
+UPDATE `creature_template` SET `DamageModifier`=129 WHERE `entry`=39805; -- General Zarithrian 25
+
+UPDATE `creature_template` SET `DamageModifier`= 86 WHERE `entry`=39747; -- Saviana Ragefire 10
+UPDATE `creature_template` SET `DamageModifier`=129 WHERE `entry`=39823; -- Saviana Ragefire 25
+
+UPDATE `creature_template` SET `DamageModifier`= 86 WHERE `entry`=39751; -- Baltharus the Warborn 10
+UPDATE `creature_template` SET `DamageModifier`=129 WHERE `entry`=39920; -- Baltharus the Warborn 25
+
+UPDATE `creature_template` SET `DamageModifier`= 86 WHERE `entry`=39899; -- Baltharus Clone 10
+UPDATE `creature_template` SET `DamageModifier`=129 WHERE `entry`=39922; -- Baltharus Clone 25
+
+UPDATE `creature_template` SET `DamageModifier`= 20 WHERE `entry` IN (40429); -- Sanctum Guardian Xerestrasza
+
+-- Trash Mobs: Charscale Invoker, Charscale Assaulter, Charscale Elite, Charscale Commander
+UPDATE `creature_template` SET `DamageModifier`= 20 WHERE `entry` IN (40417,40419,40421,40423); -- 10
+UPDATE `creature_template` SET `DamageModifier`= 40 WHERE `entry` IN (40418,40420,40422,40424); -- 25
+
+-- Ruby Drakonid, Ruby Drake, Ruby Scalebane, Ruby Dragon
+UPDATE `creature_template` SET `DamageModifier`= 20 WHERE `entry` IN (40626,40627,40628,40870);
+
+UPDATE `creature_template` SET `DamageModifier`= 14 WHERE `entry`=40683; -- Living Ember 10
+UPDATE `creature_template` SET `DamageModifier`= 22 WHERE `entry`=40684; -- Living Ember 25
+
+UPDATE `creature_template` SET `DamageModifier`= 86 WHERE `entry`=40681; -- Living Inferno 10
+UPDATE `creature_template` SET `DamageModifier`=129 WHERE `entry`=40682; -- Living Inferno 25
@@ -0,0 +1,2 @@
+-- 
+DELETE FROM `linked_respawn` WHERE `guid`=79370 AND `linkedGuid`=79336;
@@ -0,0 +1,2 @@
+--
+UPDATE `creature_template_addon` SET `auras`='32811' WHERE `entry` IN (20882,21613); -- Skulking Witch (Normal,Heroic)
				`@@ -0,0 +1 @@`
				UPDATE `creature_template` SET `flags_extra`=128 WHERE `entry`=23224;
				`@@ -0,0 +1 @@`
				UPDATE `reference_loot_template` SET `Chance` = 40 WHERE `Entry` IN (34278,34279) AND `Item` IN (52025,52028);
				`@@ -0,0 +1 @@`
				UPDATE `creature_template` SET `mechanic_immune_mask` = `mechanic_immune_mask` & 0xFFFFFF7F;
				`@@ -0,0 +1 @@`
				UPDATE `spell_proc` SET `SpellPhaseMask`=0x1,`AttributesMask`=0x2 WHERE `SpellId` IN (44543,44545);
				`@@ -0,0 +1 @@`
				DELETE FROM `spell_group` WHERE `spell_id`=17624;