Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-12 21:19:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Spells:

Browse Source 
- 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:
Ovahlord
2021-12-27 20:15:36 +01:00
parent 81813c1c0b
commit 4f9c640161
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/updates/world/4.3.4/2021_12_27_02_world.sql Normal file
View File

@@ -0,0 +1,3 @@
DELETE FROM `spell_proc` WHERE `SpellId`= 56824;
INSERT INTO `spell_proc` (`SpellId`,`SpellFamilyName`, `SpellFamilyMask0`, `SpellTypeMask`, `SpellPhaseMask`, `HitMask`) VALUES
(56824, 9, 0x20000, 1, 2, 2);

15
src/server/scripts/Spells/spell_hunter.cpp
View File

@@ -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));
}