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

This commit is contained in:
Vincent-Michael
2014-07-08 00:14:53 +02:00
11 changed files with 219 additions and 114 deletions

View File

@@ -0,0 +1,5 @@
--
DELETE FROM `creature_text` WHERE `entry` = 10262 AND id IN (6,7);
INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`,`BroadcastTextID`) VALUES
(10262,0,6, 'Bijou lost! SQUAWK! *cough',12,0,100,0,0,0, 'Opus - Random Say',5541),
(10262,0,7, 'Dragons controlling orcs!? SQUAWK!',12,0,100,0,0,0, 'Opus - Random Say',5546);

View File

@@ -0,0 +1,3 @@
DELETE FROM `spell_script_names` WHERE spell_id=7434;
INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
(7434,'spell_item_fate_rune_of_unsurpassed_vigor');

View File

@@ -0,0 +1,34 @@
--
SET @CGUID := 127340;
DELETE FROM `game_event_creature` WHERE `guid` BETWEEN @CGUID+00 AND @CGUID+29;
INSERT INTO `game_event_creature` (`eventEntry`, `guid`) VALUES
(1, @CGUID+00),
(1, @CGUID+01),
(1, @CGUID+02),
(1, @CGUID+03),
(1, @CGUID+04),
(1, @CGUID+05),
(1, @CGUID+06),
(1, @CGUID+07),
(1, @CGUID+08),
(1, @CGUID+09),
(1, @CGUID+10),
(1, @CGUID+11),
(1, @CGUID+12),
(1, @CGUID+13),
(1, @CGUID+14),
(1, @CGUID+15),
(1, @CGUID+16),
(1, @CGUID+17),
(1, @CGUID+18),
(1, @CGUID+19),
(1, @CGUID+20),
(1, @CGUID+21),
(1, @CGUID+22),
(1, @CGUID+23),
(1, @CGUID+24),
(1, @CGUID+25),
(1, @CGUID+26),
(1, @CGUID+27),
(1, @CGUID+28),
(1, @CGUID+29);

View File

@@ -0,0 +1,7 @@
DELETE FROM `spell_script_names` WHERE `spell_id`=70811;
INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
(70811,'spell_sha_item_t10_elemental_2p_bonus');
DELETE FROM `spell_proc_event` WHERE `entry`=70811;
INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES
(70811, 0, 11, 3, 0, 0, 0, 0, 0, 0, 0);