Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts: src/server/game/Miscellaneous/SharedDefines.h src/server/game/Spells/SpellEffects.cpp src/server/game/Spells/SpellInfo.cpp
This commit is contained in:
Vincent_Michael
@@ -0,0 +1,14 @@
|
||||
UPDATE `gameobject` SET `position_x`=-113.4616,`position_y`=2165.083,`position_z`=156.7546,`orientation`=1.195702,`rotation0`=0.6946974,`rotation1`=-0.1318922,`rotation2`=0.6946964,`rotation3`=0.1318972,`spawntimesecs`=7200,`animprogress`=255 WHERE `guid`=32480;
|
||||
|
||||
DELETE FROM `gameobject_scripts` WHERE `id` IN (32260,32378,32480,32625,32442,32443,32444,34006);
|
||||
UPDATE `gameobject_template` SET `AIName`='SmartGameObjectAI' WHERE `entry` IN (18900,18901,18899,90567,101811,101812,101855,185501);
|
||||
DELETE FROM `smart_scripts` WHERE `entryorguid` IN (18900,18901,18899,90567,101811,101812,101855,185501) AND `source_type`=1;
|
||||
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
|
||||
( 18900,1,0,0,70,0,100,0,2,0,0,0,9,0,0,0,0,0,0,14,32445,18934,0,0,0,0,0, 'Lever - On activate - Activate Cell Door'),
|
||||
( 18901,1,0,0,70,0,100,0,2,0,0,0,9,0,0,0,0,0,0,14,33219,18936,0,0,0,0,0, 'Lever - On activate - Activate Cell Door'),
|
||||
( 18899,1,0,0,70,0,100,0,2,0,0,0,9,0,0,0,0,0,0,14,33241,18971,0,0,0,0,0, 'Lever - On activate - Activate Arugals Lair'),
|
||||
( 90567,1,0,0,70,0,100,0,2,0,0,0,9,0,0,0,0,0,0,14,32373,90566,0,0,0,0,0, 'Lever - On activate - Activate Workshop Door'),
|
||||
(101811,1,0,0,70,0,100,0,2,0,0,0,9,0,0,0,0,0,0,14,32446,18935,0,0,0,0,0, 'Lever - On activate - Activate Cell Door'),
|
||||
(101812,1,0,0,70,0,100,0,2,0,0,0,9,0,0,0,0,0,0,14,20835,18895,0,0,0,0,0, 'Lever - On activate - Activate Courtyard Door'),
|
||||
(101855,1,0,0,70,0,100,0,2,0,0,0,9,0,0,0,0,0,0,14,32250,101854,0,0,0,0,0, 'Lever - On activate - Activate Herods Door'),
|
||||
(185501,1,0,0,70,0,100,0,2,0,0,0,9,0,0,0,0,0,0,14,25064,184212,0,0,0,0,0, 'Waterfall Control Console - On activate - Activate Waterfall');
|
||||
@@ -0,0 +1,8 @@
|
||||
DELETE FROM `gameobject_scripts` WHERE `id`=15351;
|
||||
UPDATE `gameobject_template` SET `AIName`='SmartGameObjectAI' WHERE `entry`=161460;
|
||||
DELETE FROM `smart_scripts` WHERE `entryorguid`=161460 AND `source_type`=1;
|
||||
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
|
||||
(161460,1,0,1,70,0,100,0,2,0,0,0,9,0,0,0,0,0,0,14,15639,161461,0,0,0,0,0, 'Shadowforge Lock - On Activate - Open the Giant Door Mechanism'),
|
||||
(161460,1,1,2,61,0,100,0,0,0,0,0,9,0,0,0,0,0,0,14,15576,157923,0,0,0,0,0, 'Shadowforge Lock - On Activate - Close the Giant Doors'),
|
||||
(161460,1,2,3,61,0,100,0,0,0,0,0,9,0,0,0,0,0,0,14,15640,161462,0,0,0,0,0, 'Shadowforge Lock - On Activate - Remove the great invisible wall'),
|
||||
(161460,1,3,0,61,0,100,0,0,0,0,0,9,0,0,0,0,0,0,14,15352,161516,0,0,0,0,0, 'Shadowforge Lock - On Activate - Remove the invisible wall on top');
|
||||
@@ -0,0 +1,11 @@
|
||||
DELETE FROM `gameobject_scripts` WHERE `id` IN (24397,24398,25980,26188,26192);
|
||||
UPDATE `gameobject_template` SET `AIName`='SmartGameObjectAI' WHERE `entry` IN (101831,101832,101833,101834,183517,183518,185123);
|
||||
DELETE FROM `smart_scripts` WHERE `entryorguid` IN (101831,101832,101833,101834,183517,183518,185123) AND `source_type`=1;
|
||||
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
|
||||
(101831,1,0,0,70,0,100,0,2,0,0,0,9,0,0,0,0,0,0,14,30533,13965,0,0,0,0,0, 'Door Lever - On activate - Activate Factory Door'),
|
||||
(101832,1,0,0,70,0,100,0,2,0,0,0,9,0,0,0,0,0,0,14,26185,17153,0,0,0,0,0, 'Door Lever - On activate - Activate Heavy Door'),
|
||||
(101833,1,0,0,70,0,100,0,2,0,0,0,9,0,0,0,0,0,0,14,30534,16397,0,0,0,0,0, 'Door Lever - On activate - Activate Iron Clad Door'),
|
||||
(101834,1,0,0,70,0,100,0,2,0,0,0,9,0,0,0,0,0,0,14,26182,17153,0,0,0,0,0, 'Door Lever - On activate - Activate Heavy Door'),
|
||||
(183517,1,0,0,70,0,100,0,2,0,0,0,9,0,0,0,0,0,0,14,25826,184912,0,0,0,0,0, 'Lever - On activate - Activate The Shattered Halls'),
|
||||
(183518,1,0,0,70,0,100,0,2,0,0,0,9,0,0,0,0,0,0,14,24141,183294,0,0,0,0,0, 'Lever - On activate - Activate The Shadow Labyrinth'),
|
||||
(185123,1,0,0,70,0,100,0,2,0,0,0,9,0,0,0,0,0,0,14,25083,184246,0,0,0,0,0, 'Lever - On activate - Activate Heavy Iron Portcullis');
|
||||
@@ -0,0 +1,6 @@
|
||||
DELETE FROM `gameobject_scripts` WHERE `id` IN (12609,26185,30534);
|
||||
DELETE FROM `smart_scripts` WHERE `entryorguid`=177673 AND `source_type`=1;
|
||||
DELETE FROM `smart_scripts` WHERE `entryorguid`=17767300 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
|
||||
(177673,1,0,0,70,0,100,0,2,0,0,0,80,17767300,2,0,0,0,0,1,0,0,0,0,0,0,0, 'Serpent Statue - On activate - Start Script'),
|
||||
(17767300,9,0,0,1,0,100,0,2000,2000,0,0,12,12369,1,300000,0,1,0,8,0,0,0,251.381,2962.47,2.76527,0.860446, 'Serpent Statue - After 2s - Summon Lord Kragaru');
|
||||
@@ -0,0 +1,2 @@
|
||||
-- remove the leverscript not non-existing doorscripts!
|
||||
DELETE FROM `gameobject_scripts` WHERE `id` IN (26206,26197);
|
||||
@@ -0,0 +1,81 @@
|
||||
-- Servant of the Throne [SAI]
|
||||
SET @ENTRY := 36724;
|
||||
SET @SOURCETYPE := 0;
|
||||
DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=@SOURCETYPE;
|
||||
UPDATE creature_template SET AIName='SmartAI' WHERE entry=@ENTRY LIMIT 1;
|
||||
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
|
||||
(@ENTRY,@SOURCETYPE,3,0,0,0,100,30,5000,7000,5000,9000,11,70980,0,0,0,0,0,4,0,0,0,0,0,0,0, 'Cast Web Wrap'),
|
||||
(@ENTRY,@SOURCETYPE,1,0,0,0,100,0,3000,6000,6000,12000,11,71029,0,0,0,0,0,2,0,0,0,0.0,0.0,0.0,0.0,'Cast Glacial Blast');
|
||||
-- Ancient Skeletal Soldier
|
||||
SET @ENTRY := 37012;
|
||||
SET @SOURCETYPE := 0;
|
||||
DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=@SOURCETYPE;
|
||||
UPDATE creature_template SET AIName='SmartAI' WHERE entry=@ENTRY LIMIT 1;
|
||||
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
|
||||
(@ENTRY,0,3,0,0,0,100,30,5000,7000,5000,9000,11,70980,0,0,0,0,0,4,0,0,0,0,0,0,0, 'Cast Web Wrap'),
|
||||
(@ENTRY,@SOURCETYPE,0,0,0,0,100,0,3000,6000,6000,8000,11,70964,2,0,0,0,0,2,0,0,0,0.0,0.0,0.0,0.0,'Cast Shield Bash(70964)');
|
||||
-- Nerub'ar Broodkeeper
|
||||
SET @ENTRY := 36725;
|
||||
SET @SOURCETYPE :=0;
|
||||
UPDATE creature_template SET AIName='SmartAI', ScriptName='' WHERE entry=@ENTRY;
|
||||
DELETE FROM creature_ai_scripts WHERE creature_id=@ENTRY;
|
||||
DELETE FROM smart_scripts WHERE source_type=0 AND entryorguid=@ENTRY;
|
||||
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
|
||||
(@ENTRY,@SOURCETYPE,1,0,10,0,100,30,1,60,1000,1000,38,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Nerub''ar Broodkeeper - On LOS - Zone Combat Pulse'),
|
||||
(@ENTRY,@SOURCETYPE,2,0,0,0,100,30,5000,7000,5000,9000,11,70965,0,0,0,0,0,4,0,0,0,0,0,0,0, 'Nerub''ar Broodkeeper - In Combat - Cast Crypt Scarabs'),
|
||||
(@ENTRY,@SOURCETYPE,3,0,0,0,100,30,5000,7000,5000,9000,11,70980,0,0,0,0,0,4,0,0,0,0,0,0,0, 'Nerub''ar Broodkeeper - In Combat - Cast Web Wrap'),
|
||||
(@ENTRY,@SOURCETYPE,4,0,14,0,100,30,5000,30,8000,13000,11,36725,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Nerub''ar Broodkeeper - In Combat - Cast Dark Mending on Friendlies');
|
||||
-- Deathbound Ward
|
||||
SET @ENTRY := 37007;
|
||||
SET @SOURCETYPE := 0;
|
||||
DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=@SOURCETYPE;
|
||||
UPDATE creature_template SET AIName='SmartAI' WHERE entry=@ENTRY LIMIT 1;
|
||||
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
|
||||
(@ENTRY,@SOURCETYPE,0,0,0,0,100,0,3000,6000,6000,8000,11,71021,2,0,0,0,0,2,0,0,0,0.0,0.0,0.0,0.0,'Saber Lash'),
|
||||
(@ENTRY,@SOURCETYPE,1,0,0,0,100,0,6000,8000,6000,12000,11,71022,2,0,0,0,0,2,0,0,0,0.0,0.0,0.0,0.0,'Disrupting Shout');
|
||||
-- Entrance Mobs End
|
||||
-- ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
||||
-- ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
||||
-- Starting Mobs infront Lady Deathwhisper
|
||||
-- Deathspeaker Zealot
|
||||
SET @ENTRY := 36808;
|
||||
SET @SOURCETYPE := 0;
|
||||
DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=@SOURCETYPE;
|
||||
UPDATE creature_template SET AIName='SmartAI' WHERE entry=@ENTRY LIMIT 1;
|
||||
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
|
||||
(@ENTRY,@SOURCETYPE,0,0,0,0,100,0,3000,6000,6000,8000,11,69492,2,0,0,0,0,2,0,0,0,0.0,0.0,0.0,0.0,'Shadow Cleave');
|
||||
-- Deathspeaker Servant
|
||||
SET @ENTRY := 36805;
|
||||
SET @SOURCETYPE := 0;
|
||||
DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=@SOURCETYPE;
|
||||
UPDATE creature_template SET AIName='SmartAI' WHERE entry=@ENTRY LIMIT 1;
|
||||
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
|
||||
(@ENTRY,@SOURCETYPE,0,0,0,0,100,0,3000,6000,6000,8000,11,69576,0,0,0,0,0,2,0,0,0,0.0,0.0,0.0,0.0,'Chaos Bolt'),
|
||||
(@ENTRY,@SOURCETYPE,1,0,0,0,100,0,3000,6000,6000,8000,11,69405,0,0,0,0,0,2,0,0,0,0.0,0.0,0.0,0.0,'Consuming Shadows'),
|
||||
(@ENTRY,@SOURCETYPE,2,0,0,0,100,0,3000,6000,6000,8000,11,69404,0,0,0,0,0,2,0,0,0,0.0,0.0,0.0,0.0,'Curse of Agony');
|
||||
-- Deathspeaker Attendant
|
||||
SET @ENTRY := 36811;
|
||||
SET @SOURCETYPE := 0;
|
||||
DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=@SOURCETYPE;
|
||||
UPDATE creature_template SET AIName='SmartAI' WHERE entry=@ENTRY LIMIT 1;
|
||||
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
|
||||
(@ENTRY,@SOURCETYPE,0,0,0,0,100,0,3000,6000,6000,8000,11,69387,0,0,0,0,0,2,0,0,0,0.0,0.0,0.0,0.0,'Cast Shadow Bolt'),
|
||||
(@ENTRY,@SOURCETYPE,1,0,0,0,100,0,3000,6000,6000,8000,11,69355,0,0,0,0,0,18,15,0,0,0.0,0.0,0.0,0.0,'Cast Shadow Nova on 15 yard distance');
|
||||
-- Deathspeaker Disciple
|
||||
DELETE FROM smart_scripts WHERE entryorguid = 36807 AND source_type = 0;
|
||||
SET @ENTRY := 36807;
|
||||
SET @SOURCETYPE := 0;
|
||||
DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=@SOURCETYPE;
|
||||
UPDATE creature_template SET AIName='SmartAI' WHERE entry=@ENTRY LIMIT 1;
|
||||
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
|
||||
(@ENTRY, @SOURCETYPE, 0, 0, 0, 0, 100, 30, 0, 3000, 4000, 6000, 11, 69387, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Deathspeaker Disciple - Cast Shadow Bolt'),
|
||||
(@ENTRY, @SOURCETYPE, 1, 0, 16, 0, 100, 30, 69391, 40, 15000, 20000, 11, 69391, 1, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Deathspeaker Disciple - Cast Dark Blessing'),
|
||||
(@ENTRY, @SOURCETYPE, 2, 0, 14, 0, 100, 30, 90000, 40, 15000, 20000, 11, 69389, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Deathspeaker Disciple - Cast Shadow Mend');
|
||||
-- Deathspeaker High Priest [SAI]
|
||||
SET @ENTRY := 36829;
|
||||
SET @SOURCETYPE := 0;
|
||||
DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=@SOURCETYPE;
|
||||
UPDATE creature_template SET AIName='SmartAI' WHERE entry=@ENTRY LIMIT 1;
|
||||
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
|
||||
(@ENTRY,@SOURCETYPE,0,0,0,0,100,0,3000,6000,10000,15000,11,69483,2,0,0,0,0,2,0,0,0,0.0,0.0,0.0,0.0,'Cast Dark Reckoning'),
|
||||
(@ENTRY,@SOURCETYPE,1,0,32,0,100,1,0,10000,0,0,11,69491,2,0,0,0,0,1,0,0,0,0.0,0.0,0.0,0.0,'Cast Aura of Darkness On Self'); -- when combat starts
|
||||
@@ -0,0 +1,4 @@
|
||||
-- Issue 8693 Invincible Grave Plaque
|
||||
DELETE FROM `gameobject` WHERE `guid`=364;
|
||||
INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES
|
||||
(364,192835,0,1,1,2044.38,-520.9688,46.01406,-3.097385,0,0,0,1,120,255,1);
|
||||
@@ -0,0 +1,2 @@
|
||||
-- make sure timers are real-time via flagsCustom
|
||||
UPDATE `item_template` SET `flagsCustom`=`flagsCustom`|1 WHERE `entry` IN(39878,44623,44625,44626,44632,44717);
|
||||
@@ -1845,7 +1845,8 @@ void AchievementMgr<T>::RemoveTimedAchievement(AchievementCriteriaTimedTypes typ
|
||||
template<>
|
||||
void AchievementMgr<Player>::CompletedAchievement(AchievementEntry const* achievement, Player* referencePlayer)
|
||||
{
|
||||
sLog->outInfo(LOG_FILTER_ACHIEVEMENTSYS, "AchievementMgr::CompletedAchievement(%u)", achievement->ID);
|
||||
sLog->outInfo(LOG_FILTER_ACHIEVEMENTSYS, "AchievementMgr::CompletedAchievement(%u). Player: %s (%u)",
|
||||
achievement->ID, m_player->GetName().c_str(), m_player->GetGUIDLow());
|
||||
|
||||
// disable for gamemasters with GM-mode enabled
|
||||
if (GetOwner()->isGameMaster())
|
||||
|
||||
@@ -911,7 +911,7 @@ enum SpellEffects
|
||||
SPELL_EFFECT_APPLY_AREA_AURA_FRIEND = 128,
|
||||
SPELL_EFFECT_APPLY_AREA_AURA_ENEMY = 129,
|
||||
SPELL_EFFECT_REDIRECT_THREAT = 130,
|
||||
SPELL_EFFECT_PLAYER_NOTIFICATION = 131,
|
||||
SPELL_EFFECT_PLAY_SOUND = 131,
|
||||
SPELL_EFFECT_PLAY_MUSIC = 132,
|
||||
SPELL_EFFECT_UNLEARN_SPECIALIZATION = 133,
|
||||
SPELL_EFFECT_KILL_CREDIT2 = 134,
|
||||
|
||||
@@ -333,7 +333,7 @@ class Spell
|
||||
void EffectPlayMusic(SpellEffIndex effIndex);
|
||||
void EffectSpecCount(SpellEffIndex effIndex);
|
||||
void EffectActivateSpec(SpellEffIndex effIndex);
|
||||
void EffectPlayerNotification(SpellEffIndex effIndex);
|
||||
void EffectPlaySound(SpellEffIndex effIndex);
|
||||
void EffectRemoveAura(SpellEffIndex effIndex);
|
||||
void EffectDamageFromMaxHealthPCT(SpellEffIndex effIndex);
|
||||
void EffectCastButtons(SpellEffIndex effIndex);
|
||||
|
||||
@@ -200,7 +200,7 @@ pEffect SpellEffects[TOTAL_SPELL_EFFECTS]=
|
||||
&Spell::EffectApplyAreaAura, //128 SPELL_EFFECT_APPLY_AREA_AURA_FRIEND
|
||||
&Spell::EffectApplyAreaAura, //129 SPELL_EFFECT_APPLY_AREA_AURA_ENEMY
|
||||
&Spell::EffectRedirectThreat, //130 SPELL_EFFECT_REDIRECT_THREAT
|
||||
&Spell::EffectPlayerNotification, //131 SPELL_EFFECT_PLAYER_NOTIFICATION sound id in misc value (SoundEntries.dbc)
|
||||
&Spell::EffectPlaySound, //131 SPELL_EFFECT_PLAY_SOUND sound id in misc value (SoundEntries.dbc)
|
||||
&Spell::EffectPlayMusic, //132 SPELL_EFFECT_PLAY_MUSIC sound id in misc value (SoundEntries.dbc)
|
||||
&Spell::EffectUnlearnSpecialization, //133 SPELL_EFFECT_UNLEARN_SPECIALIZATION unlearn profession specialization
|
||||
&Spell::EffectKillCredit, //134 SPELL_EFFECT_KILL_CREDIT misc value is creature entry
|
||||
@@ -5855,7 +5855,7 @@ void Spell::EffectActivateSpec(SpellEffIndex /*effIndex*/)
|
||||
unitTarget->ToPlayer()->ActivateSpec(damage-1); // damage is 1 or 2, spec is 0 or 1
|
||||
}
|
||||
|
||||
void Spell::EffectPlayerNotification(SpellEffIndex effIndex)
|
||||
void Spell::EffectPlaySound(SpellEffIndex effIndex)
|
||||
{
|
||||
if (effectHandleMode != SPELL_EFFECT_HANDLE_HIT_TARGET)
|
||||
return;
|
||||
@@ -5876,7 +5876,7 @@ void Spell::EffectPlayerNotification(SpellEffIndex effIndex)
|
||||
|
||||
if (!sSoundEntriesStore.LookupEntry(soundId))
|
||||
{
|
||||
sLog->outError(LOG_FILTER_SPELLS_AURAS, "EffectPlayerNotification: Sound (Id: %u) not exist in spell %u.", soundId, m_spellInfo->Id);
|
||||
sLog->outError(LOG_FILTER_SPELLS_AURAS, "EffectPlaySound: Sound (Id: %u) not exist in spell %u.", soundId, m_spellInfo->Id);
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -755,7 +755,7 @@ SpellEffectInfo::StaticData SpellEffectInfo::_data[TOTAL_SPELL_EFFECTS] =
|
||||
{EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_UNIT}, // 128 SPELL_EFFECT_APPLY_AREA_AURA_FRIEND
|
||||
{EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_UNIT}, // 129 SPELL_EFFECT_APPLY_AREA_AURA_ENEMY
|
||||
{EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_UNIT}, // 130 SPELL_EFFECT_REDIRECT_THREAT
|
||||
{EFFECT_IMPLICIT_TARGET_NONE, TARGET_OBJECT_TYPE_UNIT}, // 131 SPELL_EFFECT_PLAYER_NOTIFICATION
|
||||
{EFFECT_IMPLICIT_TARGET_NONE, TARGET_OBJECT_TYPE_UNIT}, // 131 SPELL_EFFECT_PLAY_SOUND
|
||||
{EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_UNIT}, // 132 SPELL_EFFECT_PLAY_MUSIC
|
||||
{EFFECT_IMPLICIT_TARGET_EXPLICIT, TARGET_OBJECT_TYPE_UNIT}, // 133 SPELL_EFFECT_UNLEARN_SPECIALIZATION
|
||||
{EFFECT_IMPLICIT_TARGET_NONE, TARGET_OBJECT_TYPE_UNIT}, // 134 SPELL_EFFECT_KILL_CREDIT2
|
||||
|
||||
Reference in New Issue
Block a user