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

Core/Spells: Drain Soul will now properly grant Soul Shards while channeling.

Browse Source 
* moved Soul Shard handling to aurascript
This commit is contained in:
Ovahlord
2018-03-17 13:15:22 +01:00
parent a46736ba4c
commit e294044787
3 changed files with 54 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/updates/world/4.3.4/custom_2018_03_17_01_world.sql Normal file
View File

@@ -0,0 +1,4 @@
DELETE FROM `spell_script_names` WHERE `ScriptName`= 'spell_warl_drain_soul';
INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
(1120, 'spell_warl_drain_soul');

7
src/server/game/Spells/Auras/SpellAuraEffects.cpp
View File

@@ -5559,12 +5559,7 @@ void AuraEffect::HandlePeriodicDamageAurasTick(Unit* target, Unit* caster) const
damage += (damage+1)/2; // +1 prevent 0.5 damage possible lost at 1..4 ticks
// 5..8 ticks have normal tick damage
}
// There is a Chance to make a Soul Shard when Drain soul does damage
if (GetSpellInfo()->SpellFamilyName == SPELLFAMILY_WARLOCK && (GetSpellInfo()->SpellFamilyFlags[0] & 0x00004000))
{
if (caster->GetTypeId() == TYPEID_PLAYER && caster->ToPlayer()->isHonorOrXPTarget(target))
caster->CastSpell(caster, 95810, true, 0, this);
}
if (GetSpellInfo()->SpellFamilyName == SPELLFAMILY_GENERIC)
{
switch (GetId())

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

@@ -72,6 +72,8 @@ enum WarlockSpells
SPELL_WARLOCK_SHADOW_TRANCE = 17941,
SPELL_WARLOCK_SIPHON_LIFE_HEAL = 63106,
SPELL_WARLOCK_SHADOW_WARD = 6229,
SPELL_WARLOCK_SOUL_SHARD = 87388,
SPELL_WARLOCK_SOUL_SHARD_ENERGIZE = 95810,
SPELL_WARLOCK_SOULSHATTER = 32835,
SPELL_WARLOCK_SOUL_SWAP_CD_MARKER = 94229,
SPELL_WARLOCK_SOUL_SWAP_OVERRIDE = 86211,
@@ -1574,6 +1576,52 @@ class spell_warl_drain_life_heal : public SpellScriptLoader
}
};
// 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*/)
{
return ValidateSpellInfo(
{
SPELL_WARLOCK_SOUL_SHARD,
SPELL_WARLOCK_SOUL_SHARD_ENERGIZE
});
}
void HandlePeriodic(AuraEffect const* aurEff)
{
if (Unit* caster = GetCaster())
GetCaster()->CastSpell(GetCaster(), SPELL_WARLOCK_SOUL_SHARD, true, 0, aurEff);
}
void OnAuraRemoveHandler(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/)
{
if (GetTargetApplication()->GetRemoveMode() == AURA_REMOVE_BY_DEATH)
if (Unit* caster = GetCaster())
if (GetOwner() && caster->ToPlayer() && caster->ToPlayer()->isHonorOrXPTarget(GetOwner()->ToUnit()))
caster->CastSpell(caster, SPELL_WARLOCK_SOUL_SHARD_ENERGIZE, true);
}
void Register()
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_warl_drain_soul_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE);
AfterEffectRemove += AuraEffectRemoveFn(spell_warl_drain_soul_AuraScript::OnAuraRemoveHandler, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL);
}
};
AuraScript* GetAuraScript() const
{
return new spell_warl_drain_soul_AuraScript();
}
};
void AddSC_warlock_spell_scripts()
{
new spell_warl_aftermath();
@@ -1587,6 +1635,7 @@ void AddSC_warlock_spell_scripts()
new spell_warl_demon_soul();
new spell_warl_drain_life();
new spell_warl_drain_life_heal();
new spell_warl_drain_soul();
new spell_warl_everlasting_affliction();
new spell_warl_fel_flame();
new spell_warl_fel_synergy();