Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-24 10:56:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	sql/base/auth_database.sql
	src/server/game/Battlegrounds/Battleground.h
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/World/World.cpp
This commit is contained in:
Vincent-Michael
2014-07-09 21:09:47 +02:00
parent c8eb69df10 b78d0a1c6d
commit 79062dd5ae
19 changed files with 280 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/base/auth_database.sql
View File

File diff suppressed because one or more lines are too long

10
sql/updates/auth/2014_07_09_00_auth_rbac_permission.sql Normal file
View File

@@ -0,0 +1,10 @@
SET @id = 631;
-- Add new permissions
DELETE FROM `rbac_permissions` WHERE `id`=@id;
INSERT INTO `rbac_permissions` (`id`, `name`) VALUES
(@id, 'Command: reload battleground_template');
DELETE FROM `rbac_linked_permissions` WHERE `linkedId`=@id;
INSERT INTO `rbac_linked_permissions` (`id`, `linkedId`) VALUES
(196, @id);

2
sql/updates/world/2014_07_08_11_world_misc.sql
View File

@@ -42,7 +42,7 @@ INSERT INTO `pickpocketing_loot_template` VALUES
(@SOULEATER, 27854, 8, 1, 0, 1, 1);
-- Pool_template for Eredar Soul Eater Spawns
DELETE FROM `pool_template` WHERE entry = 1161;
DELETE FROM `pool_template` WHERE entry = @POOL;
INSERT INTO `pool_template` (`entry`, `max_limit`, `description`) VALUES
(@POOL, 2, 'Eredar Soul-Eater');

2
sql/updates/world/2014_07_09_00_world_misc.sql
View File

@@ -2,7 +2,7 @@
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;
DELETE FROM `gossip_menu_option` WHERE `menu_id` = 11277 or `menu_id` = 9586 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);

1
sql/updates/world/2014_07_09_01_world_creature.sql Normal file
View File

@@ -0,0 +1 @@
UPDATE `creature` SET `modelid`=0 WHERE `id`=10262;

7
sql/updates/world/2014_07_09_02_world_creature_template_addon.sql Normal file
View File

@@ -0,0 +1,7 @@
DELETE FROM `creature_addon` WHERE `guid` IN (SELECT guid FROM `creature` WHERE `id` = 684);
DELETE FROM `creature_template_addon` WHERE `entry` IN (21337,636,684);
INSERT INTO `creature_template_addon` (`entry`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `auras`) VALUES
(21337, 0, 0, 131072, 1, 0, '5916 30982'),
(636, 0, 0, 131072, 1, 0, '6408'),
(684, 0, 0, 131072, 1, 0, '22766');

3
sql/updates/world/2014_07_09_03_world_command.sql Normal file
View File

@@ -0,0 +1,3 @@
DELETE FROM `command` WHERE `name` LIKE 'reload battleground_template';
INSERT INTO `command` (`name`, `permission`, `help`) VALUES
('reload battleground_template', 631, 'Syntax: .reload battleground_template\r\nReload Battleground Templates.');

12
sql/updates/world/2014_07_09_04_world_quest_template.sql Normal file
View File

@@ -0,0 +1,12 @@
--
UPDATE `quest_template` SET `NextQuestId`=13722 WHERE `Id` =13696;
UPDATE `quest_template` SET `NextQuestId`=13593 WHERE `Id` =13593;
-- The below is to fix the alliance chain, horde chain works fine with above 2 changes, but http://www.wowhead.com/quest=13593
-- Valiant Of Stormwind had `NextQuestIdChain` set to http://www.wowhead.com/quest=13722 The Valiant's Charge which is
-- Horde (Bloodelf) quest, wowhead says quest is horde but wrongly says it grants stormwind rep too so maybe someone got this wrong
-- whole chain worked fine for humans but for non-humans chain would break after turning in http://www.wowhead.com/quest=13593 as
-- http://www.wowhead.com/quest=13718 would never be offered to non humans once they picked to champion stormwind after doing own faction
-- Basically the non human quest for starting stormwind chain had nextquestchainid pointing to horde quest and thats what
-- was breaking it for alliance.
UPDATE `quest_template` SET `NextQuestIdChain`=13718 WHERE `Id`=13593;

2
sql/updates/world/2014_07_09_05_world_gameobject_template.sql Normal file
View File

@@ -0,0 +1,2 @@
-- Template updates for gameobject 1721 (Locked ball and chain)
UPDATE `gameobject_template` SET `flags`=`flags`|4 WHERE `entry`=1721;

16
sql/updates/world/2014_07_09_06_world_misc.sql Normal file
View File

@@ -0,0 +1,16 @@
--
UPDATE `creature_template` SET `ainame`='SmartAI' WHERE `entry`=19823;
DELETE FROM `smart_scripts` WHERE `entryorguid`=19823 AND `source_type`=0;
INSERT INTO `smart_scripts` VALUES
(19823,0,0,0,6,0,100,0,0,0,0,0,33,22051,0,0,0,0,0,16,0,0,0,0,0,0,0,'Crazed Colossus - On Death - Quest Credit');
DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=22 AND `SourceEntry`=19823;
INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
(22,1,19823,0,0,1,0,38224,0,0,0,0,0,'','Execute only if invoker has equipped Enchanted Illidari Tabard');
DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=38224;
INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES
(38224, 38225, 2, 'Illidari Agent Illusion - Illidari Disguise (Male)');
UPDATE `quest_template` SET `NextQuestId`=13718 WHERE `Id` =13593;