josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Vincent_Michael
2013-12-20 17:26:42 +01:00
parent 736093e91b 9ac96fd702
commit 52a5213e46
4 changed files with 28250 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sql/updates/world/2013_12_19_03_world_misc.sql
+3 -3
View File
@@ -24,7 +24,7 @@ DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=56
INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
-- Both of these must be true
(15,5675,0,0,0,14,0,7785,0,0,0,0,0, '', 'Gossip Option - Show Option if Quest 7785 is not taken'),
(15,5675,0,1,0,2,0,19016,1,0,1,0,0, '', 'Gossip Option - Show Option if player does not have Vessel of Rebirth'),
(15,5675,0,0,1,2,0,19016,1,0,1,0,0, '', 'Gossip Option - Show Option if player does not have Vessel of Rebirth'),
-- One of these must be true
(15,5675,0,2,0,2,0,18563,0,0,1,0,0, '', 'Gossip Option - Show Option if player has Bindings of the Windseeker'),
(15,5675,0,2,0,2,0,18564,0,0,1,0,0, '', 'Gossip Option - Show Option if player has Bindings of the Windseeker');
(15,5675,0,0,2,2,0,18563,1,0,1,0,0, '', 'Gossip Option - Show Option if player has Bindings of the Windseeker'),
(15,5675,0,0,2,2,0,18564,1,0,1,0,0, '', 'Gossip Option - Show Option if player has Bindings of the Windseeker');
sql/updates/world/2013_12_20_00_world_misc.sql
+1 -2
View File
@@ -12,8 +12,7 @@ UPDATE `creature_template` SET `gossip_menu_id`=10662 WHERE `entry` IN (35597,35
UPDATE `creature_template` SET `gossip_menu_id`=10666 WHERE `entry` IN (35596,35598);
UPDATE `creature_template` SET `faction_A`=2123, `faction_H`=2123 WHERE `entry` IN (35603,35611,35612);
UPDATE `creature_template` SET `baseattacktime`=2000 WHERE `entry` IN (35600,35601,35602,35603,35611,35612);
UPDATE `creature_template` SET `npcflag`=1, `unit_flags`=8040, `flags_extra`=0 WHERE `subname`= 'Wintergrasp Battle-Mage';
UPDATE `creature_template` SET `unit_flags`=8340 WHERE `entry` IN (35597,35596,32170,32169);
UPDATE `creature_template` SET `npcflag`=1, `unit_flags`=33600, `flags_extra`=0 WHERE `subname`= 'Wintergrasp Battle-Mage';
DELETE FROM `creature_equip_template` WHERE `entry`=35603 AND `id`=2;
DELETE FROM `creature_equip_template` WHERE `entry`=35601;
INSERT INTO `creature_equip_template` (`entry`,`id`,`itemEntry1`,`itemEntry2`,`itemEntry3`) VALUES (35601,1,30423,0,0);
sql/updates/world/2013_12_20_00_world_sai.sql
+28237
View File
File diff suppressed because it is too large Load Diff
sql/updates/world/2013_12_20_01_world_conditions.sql
+9
View File
@@ -0,0 +1,9 @@
-- Add Conditions
DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=5675;
INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
-- Both of these must be true
(15,5675,0,0,0,14,0,7785,0,0,0,0,0, '', 'Gossip Option - Show Option if Quest 7785 is not taken'),
(15,5675,0,0,1,2,0,19016,1,0,1,0,0, '', 'Gossip Option - Show Option if player does not have Vessel of Rebirth'),
-- One of these must be true
(15,5675,0,0,2,2,0,18563,1,0,1,0,0, '', 'Gossip Option - Show Option if player has Bindings of the Windseeker'),
(15,5675,0,0,2,2,0,18564,1,0,1,0,0, '', 'Gossip Option - Show Option if player has Bindings of the Windseeker');