Skip to content

Commit 5436a6a

Browse files
authored
Spells/Spells: Fix demon hunter talent "Fiery Brand" (TrinityCore#30490)
1 parent 40472c6 commit 5436a6a

File tree

2 files changed

+30
-2
lines changed

2 files changed

+30
-2
lines changed
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_dh_fiery_brand';
2+
INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
3+
(204021, 'spell_dh_fiery_brand');

src/server/scripts/Spells/spell_dh.cpp

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,9 @@ enum DemonHunterSpells
111111
SPELL_DH_FELBLADE_COOLDOWN_RESET_PROC_VISUAL = 204497,
112112
SPELL_DH_FELBLADE_DAMAGE = 213243,
113113
SPELL_DH_FIERY_BRAND = 204021,
114-
SPELL_DH_FIERY_BRAND_DMG_REDUCTION_DEBUFF = 207744,
115-
SPELL_DH_FIERY_BRAND_DOT = 207771,
114+
SPELL_DH_FIERY_BRAND_RANK_2 = 320962,
115+
SPELL_DH_FIERY_BRAND_DEBUFF_RANK_1 = 207744,
116+
SPELL_DH_FIERY_BRAND_DEBUFF_RANK_2 = 207771,
116117
SPELL_DH_FIRST_BLOOD = 206416,
117118
SPELL_DH_FLAME_CRASH = 227322,
118119
SPELL_DH_FRAILTY = 224509,
@@ -733,6 +734,29 @@ class spell_dh_felblade_cooldown_reset_proc : public AuraScript
733734
}
734735
};
735736

737+
// 204021 - Fiery Brand
738+
class spell_dh_fiery_brand : public SpellScript
739+
{
740+
bool Validate(SpellInfo const* /*spellInfo*/) override
741+
{
742+
return ValidateSpellInfo({ SPELL_DH_FIERY_BRAND_DEBUFF_RANK_1, SPELL_DH_FIERY_BRAND_DEBUFF_RANK_2, SPELL_DH_FIERY_BRAND_RANK_2 });
743+
}
744+
745+
void HandleDamage(SpellEffIndex /*effIndex*/) const
746+
{
747+
GetCaster()->CastSpell(GetHitUnit(), GetCaster()->HasAura(SPELL_DH_FIERY_BRAND_RANK_2) ? SPELL_DH_FIERY_BRAND_DEBUFF_RANK_2 : SPELL_DH_FIERY_BRAND_DEBUFF_RANK_1,
748+
CastSpellExtraArgsInit{
749+
.TriggerFlags = TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR,
750+
.TriggeringSpell = GetSpell()
751+
});
752+
}
753+
754+
void Register() override
755+
{
756+
OnEffectHitTarget += SpellEffectFn(spell_dh_fiery_brand::HandleDamage, EFFECT_1, SPELL_EFFECT_SCHOOL_DAMAGE);
757+
}
758+
};
759+
736760
// 206416 - First Blood
737761
class spell_dh_first_blood : public AuraScript
738762
{
@@ -1211,6 +1235,7 @@ void AddSC_demon_hunter_spell_scripts()
12111235
RegisterSpellScript(spell_dh_felblade);
12121236
RegisterSpellScript(spell_dh_felblade_charge);
12131237
RegisterSpellScript(spell_dh_felblade_cooldown_reset_proc);
1238+
RegisterSpellScript(spell_dh_fiery_brand);
12141239
RegisterSpellScript(spell_dh_furious_gaze);
12151240
RegisterSpellScript(spell_dh_last_resort);
12161241
RegisterSpellScript(spell_dh_restless_hunter);

0 commit comments

Comments
 (0)