nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-16 02:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Core/Spells): Improved Drain Soul triggering from every target … (#8144)

Browse Source 
...that dies and not just the one affected by Drain Soul and move the Drain Soul code to spell scripts

- TC Ports: d9743c984f (diff-ea612aafadff90005e88b243eb000369be9e5cb6f8dc85a008d31e42b156e0ec) and  2b1b36f561 (diff-ea612aafadff90005e88b243eb000369be9e5cb6f8dc85a008d31e42b156e0ec)
This commit is contained in:
Skjalf
2021-10-07 13:58:46 -03:00
committed by GitHub
parent d0ff62a1ab
commit 99cc428511
4 changed files with 100 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
src/server/scripts/Spells/spell_warlock.cpp
View File

@@ -30,6 +30,8 @@
enum WarlockSpells
{
SPELL_WARLOCK_DRAIN_SOUL_R1 = 1120,
SPELL_WARLOCK_CREATE_SOULSHARD = 43836,
SPELL_WARLOCK_CURSE_OF_DOOM_EFFECT = 18662,
SPELL_WARLOCK_DEMONIC_CIRCLE_SUMMON = 48018,
SPELL_WARLOCK_DEMONIC_CIRCLE_TELEPORT = 48020,
@@ -40,6 +42,8 @@ enum WarlockSpells
SPELL_WARLOCK_DEMONIC_EMPOWERMENT_FELHUNTER = 54509,
SPELL_WARLOCK_DEMONIC_EMPOWERMENT_IMP = 54444,
SPELL_WARLOCK_FEL_SYNERGY_HEAL = 54181,
SPELL_WARLOCK_GLYPH_OF_DRAIN_SOUL_AURA = 58070,
SPELL_WARLOCK_GLYPH_OF_DRAIN_SOUL_PROC = 58068,
SPELL_WARLOCK_GLYPH_OF_SHADOWFLAME = 63311,
SPELL_WARLOCK_GLYPH_OF_SIPHON_LIFE = 56216,
SPELL_WARLOCK_HAUNT = 48181,
@@ -54,7 +58,9 @@ enum WarlockSpells
SPELL_WARLOCK_LIFE_TAP_ENERGIZE_2 = 32553,
SPELL_WARLOCK_SOULSHATTER = 32835,
SPELL_WARLOCK_SIPHON_LIFE_HEAL = 63106,
SPELL_WARLOCK_UNSTABLE_AFFLICTION_DISPEL = 31117
SPELL_WARLOCK_UNSTABLE_AFFLICTION_DISPEL = 31117,
SPELL_WARLOCK_IMPROVED_DRAIN_SOUL_R1 = 18213,
SPELL_WARLOCK_IMPROVED_DRAIN_SOUL_PROC = 18371
};
enum WarlockSpellIcons
@@ -1367,6 +1373,92 @@ public:
}
};
// -1120 - Drain Soul
class spell_warl_drain_soul : public SpellScriptLoader
{
public:
spell_warl_drain_soul() : SpellScriptLoader("spell_warl_drain_soul") { }
class spell_warl_drain_soul_AuraScript : public AuraScript
{
PrepareAuraScript(spell_warl_drain_soul_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
{
SPELL_WARLOCK_IMPROVED_DRAIN_SOUL_R1,
SPELL_WARLOCK_IMPROVED_DRAIN_SOUL_PROC,
SPELL_WARLOCK_CREATE_SOULSHARD,
SPELL_WARLOCK_GLYPH_OF_DRAIN_SOUL_AURA,
SPELL_WARLOCK_GLYPH_OF_DRAIN_SOUL_PROC
});
}
bool CheckProc(ProcEventInfo& eventInfo)
{
// Drain Soul's proc tries to happen each time the warlock lands a killing blow on a unit while channeling.
// Make sure that the dying unit is afflicted by the caster's Drain Soul debuff in order to avoid a false positive.
Unit* caster = GetCaster();
Unit* victim = eventInfo.GetProcTarget();
if (caster && victim)
{
return victim->GetAuraApplicationOfRankedSpell(SPELL_WARLOCK_DRAIN_SOUL_R1, caster->GetGUID()) != 0;
}
return false;
}
void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo)
{
PreventDefaultAction();
Unit* caster = eventInfo.GetActor();
// Improved Drain Soul.
if (Aura const* impDrainSoul = caster->GetAuraOfRankedSpell(SPELL_WARLOCK_IMPROVED_DRAIN_SOUL_R1, caster->GetGUID()))
{
int32 amount = CalculatePct(caster->GetMaxPower(POWER_MANA), impDrainSoul->GetSpellInfo()->Effects[EFFECT_2].CalcValue());
caster->CastCustomSpell(SPELL_WARLOCK_IMPROVED_DRAIN_SOUL_PROC, SPELLVALUE_BASE_POINT0, amount, caster, true, nullptr, aurEff, caster->GetGUID());
}
}
void HandleTick(AuraEffect const* aurEff)
{
Unit* caster = GetCaster();
Unit* target = GetTarget();
if (caster && caster->GetTypeId() == TYPEID_PLAYER && caster->ToPlayer()->isHonorOrXPTarget(target))
{
if (roll_chance_i(20))
{
caster->CastSpell(caster, SPELL_WARLOCK_CREATE_SOULSHARD, aurEff);
// Glyph of Drain Soul - chance to create an additional Soul Shard.
if (AuraEffect* aur = caster->GetAuraEffect(SPELL_WARLOCK_GLYPH_OF_DRAIN_SOUL_AURA, EFFECT_0))
{
if (roll_chance_i(aur->GetMiscValue()))
{
caster->CastSpell(caster, SPELL_WARLOCK_CREATE_SOULSHARD, aur);
}
}
}
}
}
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_warl_drain_soul_AuraScript::CheckProc);
OnEffectPeriodic += AuraEffectPeriodicFn(spell_warl_drain_soul_AuraScript::HandleTick, EFFECT_1, SPELL_AURA_PERIODIC_DAMAGE);
OnEffectProc += AuraEffectProcFn(spell_warl_drain_soul_AuraScript::HandleProc, EFFECT_2, SPELL_AURA_PROC_TRIGGER_SPELL);
}
};
AuraScript* GetAuraScript() const override
{
return new spell_warl_drain_soul_AuraScript();
}
};
void AddSC_warlock_spell_scripts()
{
// Ours
@@ -1399,4 +1491,5 @@ void AddSC_warlock_spell_scripts()
new spell_warl_siphon_life();
new spell_warl_soulshatter();
new spell_warl_unstable_affliction();
new spell_warl_drain_soul();
}