diff options
| author | megamage <none@none> | 2009-01-02 15:51:23 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-01-02 15:51:23 -0600 |
| commit | 36b62f421a55042818de4b5b8937e6679d17d77d (patch) | |
| tree | 43bd6379317c05c34311ab86dd3ce33750129232 | |
| parent | 21915dcd3b75c32cc178c8727cd8d562c742aa88 (diff) | |
| parent | 5c8901796ef097da22b2b730ea38ab1d366822d8 (diff) | |
*Merge.
--HG--
branch : trunk
| -rw-r--r-- | sql/updates/645_world_scripts.sql | 3 | ||||
| -rw-r--r-- | sql/updates/686_world_scripts.sql | 1 | ||||
| -rw-r--r-- | sql/updates/748_world_scripts.sql | 1 | ||||
| -rw-r--r-- | src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp | 2 | ||||
| -rw-r--r-- | src/game/SpellMgr.cpp | 3 |
5 files changed, 5 insertions, 5 deletions
diff --git a/sql/updates/645_world_scripts.sql b/sql/updates/645_world_scripts.sql index bb4916be082..f480a97e204 100644 --- a/sql/updates/645_world_scripts.sql +++ b/sql/updates/645_world_scripts.sql @@ -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;
\ No newline at end of file +(10675, 72, 7, 9531, 0, 0, 0, 0, 0, 0);
\ No newline at end of file diff --git a/sql/updates/686_world_scripts.sql b/sql/updates/686_world_scripts.sql index b09691841b8..80d0468c361 100644 --- a/sql/updates/686_world_scripts.sql +++ b/sql/updates/686_world_scripts.sql @@ -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; diff --git a/sql/updates/748_world_scripts.sql b/sql/updates/748_world_scripts.sql index 8e59c9bb812..eb5b7c94992 100644 --- a/sql/updates/748_world_scripts.sql +++ b/sql/updates/748_world_scripts.sql @@ -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;
\ No newline at end of file diff --git a/src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp b/src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp index 5274cdc7ec4..f26209d4340 100644 --- a/src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp +++ b/src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp @@ -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; diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp index 0ec0de4903d..4894d520a9e 100644 --- a/src/game/SpellMgr.cpp +++ b/src/game/SpellMgr.cpp @@ -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 |