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

# Conflicts:
#	src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
#	src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp
#	src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h
This commit is contained in:
Ovahlord committed 2018-01-02 01:23:06 +01:00
commit 98fdf72c7b
1535 files changed
+2852 -2917

No files matched your search

@@ -0,0 +1,12 @@
--
UPDATE `creature_template` SET `faction`=14 WHERE `entry`=49311;
UPDATE `creature_template` SET `unit_class`=2 WHERE `entry`=49043;
UPDATE `gameobject` SET `spawnMask` = 1 WHERE `id` = 185434 AND `map` IN (0,1);
UPDATE `creature_template` SET `maxgold` = 3360 WHERE `entry` = 37662;
UPDATE `creature_template` SET `maxgold` = 5456 WHERE `entry` = 37031;
UPDATE `creature_template` SET `maxgold` = 4747 WHERE `entry` = 37029;
UPDATE `creature_template` SET `maxgold` = 4607 WHERE `entry` = 37028;
UPDATE `creature_template` SET `maxgold` = 837154 WHERE `entry` = 36855;
UPDATE `creature_template` SET `maxgold` = 18320 WHERE `entry` = 36829;
UPDATE `creature_template` SET `maxgold` = 2673 WHERE `entry` = 36805;
@@ -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);