From 40b87aca8f81ce9511478c31c0fe7fb31f56ea3c Mon Sep 17 00:00:00 2001 From: Vincent-Michael Date: Sun, 21 Jul 2013 00:57:15 +0200 Subject: Core/Spells: Small cleanup in b3e9ca7a6a4ea97e1b06fda70ef759f822bd4fde --- src/server/scripts/Spells/spell_generic.cpp | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) (limited to 'src') diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index a9c28159345..3dabd772ed3 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -197,25 +197,17 @@ class spell_gen_alchemist_stone : public SpellScriptLoader PreventDefaultAction(); uint32 spellId = 0; - int32 basepoints0 = 0; - TC_LOG_ERROR(LOG_FILTER_GENERAL, "procSpell: %u", eventInfo.GetDamageInfo()->GetSpellInfo()->Id); - for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i) - { - if (eventInfo.GetDamageInfo()->GetSpellInfo()->Effects[i].Effect == SPELL_EFFECT_HEAL) - spellId = ALECHEMIST_STONE_HEAL; - else if (eventInfo.GetDamageInfo()->GetSpellInfo()->Effects[i].Effect == SPELL_EFFECT_ENERGIZE) - spellId = ALECHEMIST_STONE_MANA; - else - continue; - - basepoints0 = int32(GetTarget()->CalculateSpellDamage(GetTarget(), eventInfo.GetDamageInfo()->GetSpellInfo(), i) * 0.4f); - } + int32 bp = int32(eventInfo.GetDamageInfo()->GetDamage() * 0.4f); + if (eventInfo.GetDamageInfo()->GetSpellInfo()->HasEffect(SPELL_EFFECT_HEAL)) + spellId = ALECHEMIST_STONE_HEAL; + else if (eventInfo.GetDamageInfo()->GetSpellInfo()->HasEffect(SPELL_EFFECT_ENERGIZE)) + spellId = ALECHEMIST_STONE_MANA; + TC_LOG_ERROR(LOG_FILTER_GENERAL, "spellId: %u, procSpell: %u", spellId, eventInfo.GetDamageInfo()->GetSpellInfo()->Id); if (!spellId) return; - - GetTarget()->CastCustomSpell(GetTarget(), spellId, &basepoints0, NULL, NULL, true, NULL, aurEff); + GetTarget()->CastCustomSpell(spellId, SPELLVALUE_BASE_POINT0, bp, GetTarget(), true, NULL, aurEff); } -- cgit v1.2.3