Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Scripts/Spells: Fixed Holy Shock visuals

Browse Source
This commit is contained in:
Shauren
2022-01-30 12:46:33 +01:00
parent 0d9b1072b5
commit 78283e3ef2
2 changed files with 57 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/updates/world/master/2022_01_30_00_world.sql Normal file
View File

@@ -0,0 +1,5 @@
DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_pal_holy_shock_damage_visual';
DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_pal_holy_shock_heal_visual';
INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
(25912,'spell_pal_holy_shock_damage_visual'),
(25914,'spell_pal_holy_shock_heal_visual');

57
src/server/scripts/Spells/spell_paladin.cpp
View File

@@ -104,7 +104,10 @@ enum PaladinSpellVisualKit
enum PaladinSpellVisual
{
PALADIN_VISUAL_SPELL_HOLY_SHOCK = 83732
PALADIN_VISUAL_SPELL_HOLY_SHOCK_DAMAGE = 83731,
PALADIN_VISUAL_SPELL_HOLY_SHOCK_DAMAGE_CRIT = 83881,
PALADIN_VISUAL_SPELL_HOLY_SHOCK_HEAL = 83732,
PALADIN_VISUAL_SPELL_HOLY_SHOCK_HEAL_CRIT = 83880,
};
/*
@@ -884,11 +887,9 @@ class spell_pal_holy_shock : public SpellScript
if (Unit* unitTarget = GetHitUnit())
{
if (caster->IsFriendlyTo(unitTarget))
caster->CastSpell(unitTarget, SPELL_PALADIN_HOLY_SHOCK_HEALING, true);
caster->CastSpell(unitTarget, SPELL_PALADIN_HOLY_SHOCK_HEALING, GetSpell());
else
caster->CastSpell(unitTarget, SPELL_PALADIN_HOLY_SHOCK_DAMAGE, true);
caster->SendPlaySpellVisual(unitTarget, PALADIN_VISUAL_SPELL_HOLY_SHOCK, 0, 0, 0, false);
caster->CastSpell(unitTarget, SPELL_PALADIN_HOLY_SHOCK_DAMAGE, GetSpell());
}
}
@@ -899,6 +900,50 @@ class spell_pal_holy_shock : public SpellScript
}
};
// 25912 - Holy Shock
class spell_pal_holy_shock_damage_visual : public SpellScript
{
PrepareSpellScript(spell_pal_holy_shock_damage_visual);
bool Validate(SpellInfo const*) override
{
return sSpellVisualStore.HasRecord(PALADIN_VISUAL_SPELL_HOLY_SHOCK_DAMAGE)
&& sSpellVisualStore.HasRecord(PALADIN_VISUAL_SPELL_HOLY_SHOCK_DAMAGE_CRIT);
}
void PlayVisual()
{
GetCaster()->SendPlaySpellVisual(GetHitUnit(), IsHitCrit() ? PALADIN_VISUAL_SPELL_HOLY_SHOCK_DAMAGE_CRIT : PALADIN_VISUAL_SPELL_HOLY_SHOCK_DAMAGE, 0, 0, 0.0f, false);
}
void Register() override
{
AfterHit += SpellHitFn(spell_pal_holy_shock_damage_visual::PlayVisual);
}
};
// 25914 - Holy Shock
class spell_pal_holy_shock_heal_visual : public SpellScript
{
PrepareSpellScript(spell_pal_holy_shock_heal_visual);
bool Validate(SpellInfo const*) override
{
return sSpellVisualStore.HasRecord(PALADIN_VISUAL_SPELL_HOLY_SHOCK_HEAL)
&& sSpellVisualStore.HasRecord(PALADIN_VISUAL_SPELL_HOLY_SHOCK_HEAL_CRIT);
}
void PlayVisual()
{
GetCaster()->SendPlaySpellVisual(GetHitUnit(), IsHitCrit() ? PALADIN_VISUAL_SPELL_HOLY_SHOCK_HEAL_CRIT : PALADIN_VISUAL_SPELL_HOLY_SHOCK_HEAL, 0, 0, 0.0f, false);
}
void Register() override
{
AfterHit += SpellHitFn(spell_pal_holy_shock_heal_visual::PlayVisual);
}
};
// 37705 - Healing Discount
class spell_pal_item_healing_discount : public AuraScript
{
@@ -1336,6 +1381,8 @@ void AddSC_paladin_spell_scripts()
RegisterSpellScript(spell_pal_holy_prism);
RegisterSpellScript(spell_pal_holy_prism_selector);
RegisterSpellScript(spell_pal_holy_shock);
RegisterSpellScript(spell_pal_holy_shock_damage_visual);
RegisterSpellScript(spell_pal_holy_shock_heal_visual);
RegisterAuraScript(spell_pal_item_healing_discount);
RegisterAuraScript(spell_pal_item_t6_trinket);
RegisterSpellScript(spell_pal_lay_on_hands);