[9458] Add exception for spell 51912 and then trigger 45668 as expected

Also remove commented code for spell 45668

Signed-off-by: NoFantasy <nofantasy@nf.no>
This commit is contained in:
NoFantasy 2010-02-26 19:53:40 +01:00
parent 530be51dc5
commit 09b4acc53e
3 changed files with 11 additions and 5 deletions

View file

@ -4579,6 +4579,14 @@ void Aura::HandlePeriodicTriggerSpell(bool apply, bool /*Real*/)
if (m_removeMode == AURA_REMOVE_BY_DEFAULT && GetEffIndex() + 1 < MAX_EFFECT_INDEX)
m_target->CastSpell(m_target, m_spellProto->CalculateSimpleValue(SpellEffectIndex(GetEffIndex()+1)), true);
return;
case 51912: // Ultra-Advanced Proto-Typical Shortening Blaster
if (m_removeMode == AURA_REMOVE_BY_DEFAULT && m_duration <= 0)
{
if (Unit* pCaster = GetCaster())
pCaster->CastSpell(m_target, m_spellProto->EffectTriggerSpell[GetEffIndex()], true, NULL, this);
}
return;
default:
break;
}

View file

@ -5378,14 +5378,12 @@ void Spell::EffectScriptEffect(SpellEffectIndex eff_idx)
unitTarget->CastSpell(unitTarget, 44870, true);
break;
}
/* Spell 51912 that trigger this need correction before this can work.
Some additional research also seem to be needed + adjustment, this is mostly place holder for spells used.
case 45668: // Ultra-Advanced Proto-Typical Shortening Blaster
{
if (!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT)
return;
if (roll_chance_i(50)) // chance unknown, using 50
if (roll_chance_i(25)) // chance unknown, using 25
return;
static uint32 const spellPlayer[5] =
@ -5410,7 +5408,7 @@ void Spell::EffectScriptEffect(SpellEffectIndex eff_idx)
unitTarget->CastSpell(unitTarget, spellTarget[urand(0,4)], true);
return;
}*/
}
case 46203: // Goblin Weather Machine
{
if (!unitTarget)

View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__
#define __REVISION_NR_H__
#define REVISION_NR "9457"
#define REVISION_NR "9458"
#endif // __REVISION_NR_H__