*Merge.
--HG-- branch : trunk
This commit is contained in:
@@ -2,5 +2,4 @@ delete from creature where id=17318;
|
||||
update creature_template set scriptname='npc_geezle' where entry=17318;
|
||||
delete from event_scripts where id=10675;
|
||||
insert into event_scripts () VALUES (10675, 0, 10, 17318, 120000, 0, -5134.3, -11250.3, 5.29568, 6.23554),
|
||||
(10675, 72, 7, 9531, 0, 0, 0, 0, 0, 0);
|
||||
update quest_template set specialflags=2, reqcreatureorgoid1=0, reqcreatureorgocount1=0 where entry=9531;
|
||||
(10675, 72, 7, 9531, 0, 0, 0, 0, 0, 0);
|
||||
@@ -1,4 +1,3 @@
|
||||
UPDATE `quest_template` SET `SpecialFlags` = 2 WHERE `entry` = 1144;
|
||||
UPDATE `creature_template` SET `Scriptname`='npc_willix' WHERE entry=4508;
|
||||
|
||||
DELETE FROM script_texts WHERE entry BETWEEN -1047000 and -1047010;
|
||||
|
||||
@@ -1,3 +1,2 @@
|
||||
update creature_template set scriptname='npc_infused_crystal', flags_extra=0 where entry=16364;
|
||||
update quest_template set specialflags=2, reqcreatureorgoid1=0, reqcreatureorgocount1=0 where entry=8490;
|
||||
delete from creature where id=17086;
|
||||
@@ -1879,7 +1879,7 @@ void boss_illidan_stormrageAI::JustSummoned(Creature* summon)
|
||||
Unit *target = SelectUnit(SELECT_TARGET_TOPAGGRO, 0, 999, true);
|
||||
if(!target || target->HasAura(SPELL_PARASITIC_SHADOWFIEND, 0)
|
||||
|| target->HasAura(SPELL_PARASITIC_SHADOWFIEND2, 0))
|
||||
target = SelectUnit(SELECT_TARGET_TOPAGGRO, 0, 999, true);
|
||||
target = SelectUnit(SELECT_TARGET_RANDOM, 0, 999, true);
|
||||
if(target)
|
||||
summon->AI()->AttackStart(target);
|
||||
}break;
|
||||
|
||||
@@ -2101,6 +2101,8 @@ void SpellMgr::LoadSpellCustomAttr()
|
||||
case 29576: //Multi-Shot
|
||||
case 40816: //Saber Lash
|
||||
case 37790: //Spread Shot
|
||||
case 46771: //Flame Sear
|
||||
case 45248: //Shadow Blades
|
||||
spellInfo->MaxAffectedTargets = 3;
|
||||
break;
|
||||
case 38310: //Multi-Shot
|
||||
@@ -2109,6 +2111,7 @@ void SpellMgr::LoadSpellCustomAttr()
|
||||
case 42005: // Bloodboil
|
||||
case 38296: //Spitfire Totem
|
||||
case 37676: //Insidious Whisper
|
||||
case 46009: //Negative Energy
|
||||
spellInfo->MaxAffectedTargets = 5;
|
||||
break;
|
||||
case 40827: //Sinful Beam
|
||||
|
||||
Reference in New Issue
Block a user