Core/Spells:
- Glyph of Aimed Shot will now only proc on critical hits with Aimed Shot - fixed Glyph of the Dazzled Prey
This commit is contained in:
1 parent
81813c1c0b
commit
4f9c640161
2 files changed
+17
-1
No files matched your search
@@ -89,7 +89,8 @@ enum HunterIcons
|
||||
{
|
||||
HUNTER_ICON_ID_INVIGORATION = 3487,
|
||||
HUNTER_ICON_ID_IMPROVED_SERPPENT_STING = 536,
|
||||
HUNTER_ICON_ID_TERMINATION = 2008
|
||||
HUNTER_ICON_ID_TERMINATION = 2008,
|
||||
HUNTER_ICON_ID_GLYPH_OF_DAZZLED_PREY = 2109
|
||||
};
|
||||
|
||||
enum MiscSpells
|
||||
@@ -194,10 +195,16 @@ class spell_hun_cobra_shot : public SpellScript
|
||||
int32 focusAmount = sSpellMgr->AssertSpellInfo(SPELL_HUNTER_GENERIC_ENERGIZE_FOCUS)->Effects[EFFECT_0].CalcValue();
|
||||
|
||||
if (Unit* target = GetExplTargetUnit())
|
||||
{
|
||||
if (AuraEffect const* termination = caster->GetDummyAuraEffect(SPELLFAMILY_HUNTER, HUNTER_ICON_ID_TERMINATION, EFFECT_0))
|
||||
if (target->GetHealthPct() < termination->GetSpellInfo()->Effects[EFFECT_1].CalcValue())
|
||||
focusAmount += termination->GetAmount();
|
||||
|
||||
if (AuraEffect const* dazzledPrey = caster->GetDummyAuraEffect(SPELLFAMILY_HUNTER, HUNTER_ICON_ID_GLYPH_OF_DAZZLED_PREY, EFFECT_0))
|
||||
if (target->HasAuraWithMechanic(1 << MECHANIC_DAZE))
|
||||
focusAmount += dazzledPrey->GetAmount();
|
||||
}
|
||||
|
||||
caster->CastSpell(caster, SPELL_HUNTER_GENERIC_ENERGIZE_FOCUS, CastSpellExtraArgs(true).AddSpellBP0(focusAmount));
|
||||
}
|
||||
|
||||
@@ -681,10 +688,16 @@ class spell_hun_steady_shot : public SpellScript
|
||||
int32 focusAmount = sSpellMgr->AssertSpellInfo(SPELL_HUNTER_STEADY_SHOT_FOCUS)->Effects[EFFECT_0].CalcValue();
|
||||
|
||||
if (Unit* target = GetExplTargetUnit())
|
||||
{
|
||||
if (AuraEffect const* termination = caster->GetDummyAuraEffect(SPELLFAMILY_HUNTER, HUNTER_ICON_ID_TERMINATION, EFFECT_0))
|
||||
if (target->GetHealthPct() < termination->GetSpellInfo()->Effects[EFFECT_1].CalcValue())
|
||||
focusAmount += termination->GetAmount();
|
||||
|
||||
if (AuraEffect const* dazzledPrey = caster->GetDummyAuraEffect(SPELLFAMILY_HUNTER, HUNTER_ICON_ID_GLYPH_OF_DAZZLED_PREY, EFFECT_0))
|
||||
if (target->HasAuraWithMechanic(1 << MECHANIC_DAZE))
|
||||
focusAmount += dazzledPrey->GetAmount();
|
||||
}
|
||||
|
||||
caster->CastSpell(caster, SPELL_HUNTER_STEADY_SHOT_FOCUS, CastSpellExtraArgs(true).AddSpellBP0(focusAmount));
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user