diff options
| author | Blaymoira <none@none> | 2008-12-26 09:01:39 +0100 |
|---|---|---|
| committer | Blaymoira <none@none> | 2008-12-26 09:01:39 +0100 |
| commit | 855d81e950db9e9e0fefaf9b159a2409f35d418e (patch) | |
| tree | 7a9a7faaf7a270187140802deeb4d708cb70e5e2 /src/bindings/scripts | |
| parent | 8837453f24b1f4871fdafbe83548a8853331ede2 (diff) | |
| parent | 4a6c246e3b2e789f0eb3038a41a5b32027f23f91 (diff) | |
*Merge heads
--HG--
branch : trunk
Diffstat (limited to 'src/bindings/scripts')
| -rw-r--r-- | src/bindings/scripts/scripts/zone/zulaman/boss_nalorakk.cpp | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/src/bindings/scripts/scripts/zone/zulaman/boss_nalorakk.cpp b/src/bindings/scripts/scripts/zone/zulaman/boss_nalorakk.cpp index 44e68f0dfbf..844e4a6c0ce 100644 --- a/src/bindings/scripts/scripts/zone/zulaman/boss_nalorakk.cpp +++ b/src/bindings/scripts/scripts/zone/zulaman/boss_nalorakk.cpp @@ -467,25 +467,13 @@ struct TRINITY_DLL_DECL boss_nalorakkAI : public ScriptedAI else { if(LaceratingSlash_Timer < diff) { - if(!m_creature->getVictim()->HasAura(SPELL_MANGLEEFFECT, 0)) - DoCast(m_creature->getVictim(), SPELL_LACERATINGSLASH); - else - { - int32 bp0 = 3470; - m_creature->CastCustomSpell(m_creature->getVictim(), SPELL_LACERATINGSLASH, &bp0, NULL, NULL, false); - } + DoCast(m_creature->getVictim(), SPELL_LACERATINGSLASH); LaceratingSlash_Timer = 18000 + rand()%5000; }else LaceratingSlash_Timer -= diff; if(RendFlesh_Timer < diff) { - if(!m_creature->getVictim()->HasAura(SPELL_MANGLEEFFECT, 0)) - DoCast(m_creature->getVictim(), SPELL_RENDFLESH); - else - { - int32 bp1 = 4670; - m_creature->CastCustomSpell(m_creature->getVictim(), SPELL_RENDFLESH, NULL, &bp1, NULL, false); - } + DoCast(m_creature->getVictim(), SPELL_RENDFLESH); RendFlesh_Timer = 5000 + rand()%5000; }else RendFlesh_Timer -= diff; |
