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

Fix Divine Storm

Browse Source 
Fix healing part of Divine Storm, will now work as intented healing up to 3 party or raid members for a total of 25% (or 40% with Glyph) of the damage caused.

Closes #285
This commit is contained in:
Havenard
2011-10-11 22:32:36 -03:00
parent 11bb9bfdb3
commit 0e274bdcb7
3 changed files with 47 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/updates/world/2011_10_11_01_world_spell_script_names.sql Normal file
View File

@@ -0,0 +1,2 @@
DELETE FROM `spell_script_names` WHERE `spell_id` = 53385;
INSERT INTO `spell_script_names` VALUES (53385, 'spell_pal_divine_storm');

18
src/server/game/Spells/SpellEffects.cpp
View File

@@ -1125,9 +1125,13 @@ void Spell::EffectDummy(SpellEffIndex effIndex)
return;
m_caster->CastCustomSpell(unitTarget, 52752, &damage, NULL, NULL, true);
return;
case 54171: //Divine Storm
case 54171: // Divine Storm
{
m_caster->CastCustomSpell(unitTarget, 54172, &damage, 0, 0, true);
if (m_UniqueTargetInfo.size())
{
int32 heal = damage / m_UniqueTargetInfo.size();
m_caster->CastCustomSpell(unitTarget, 54172, &heal, NULL, NULL, true);
}
return;
}
case 58418: // Portal to Orgrimmar
@@ -1354,16 +1358,6 @@ void Spell::EffectDummy(SpellEffIndex effIndex)
}
break;
case SPELLFAMILY_PALADIN:
// Divine Storm
if (m_spellInfo->SpellFamilyFlags[1] & SPELLFAMILYFLAG1_PALADIN_DIVINESTORM && effIndex == 1)
{
int32 dmg = CalculatePctN(m_damage, damage);
if (!unitTarget)
unitTarget = m_caster;
m_caster->CastCustomSpell(unitTarget, 54171, &dmg, 0, 0, true);
return;
}
switch (m_spellInfo->Id)
{
case 31789: // Righteous Defense (step 1)

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

@@ -37,6 +37,10 @@ enum PaladinSpells
SPELL_BLESSING_OF_LOWER_CITY_PALADIN = 37879,
SPELL_BLESSING_OF_LOWER_CITY_PRIEST = 37880,
SPELL_BLESSING_OF_LOWER_CITY_SHAMAN = 37881,
SPELL_DIVINE_STORM = 53385,
SPELL_DIVINE_STORM_DUMMY = 54171,
SPELL_DIVINE_STORM_HEAL = 54172,
};
// 31850 - Ardent Defender
@@ -327,6 +331,40 @@ public:
}
};
class spell_pal_divine_storm : public SpellScriptLoader
{
public:
spell_pal_divine_storm() : SpellScriptLoader("spell_pal_divine_storm") { }
class spell_pal_divine_storm_SpellScript : public SpellScript
{
PrepareSpellScript(spell_pal_divine_storm_SpellScript);
uint32 healPct;
bool Load()
{
healPct = GetSpellInfo()->Effects[EFFECT_1].CalcValue(GetCaster());
return true;
}
void TriggerHeal()
{
GetCaster()->CastCustomSpell(SPELL_DIVINE_STORM_DUMMY, SPELLVALUE_BASE_POINT0, (GetHitDamage() * healPct) / 100, GetCaster(), true);
}
void Register()
{
AfterHit += SpellHitFn(spell_pal_divine_storm_SpellScript::TriggerHeal);
}
};
SpellScript* GetSpellScript() const
{
return new spell_pal_divine_storm_SpellScript();
}
};
void AddSC_paladin_spell_scripts()
{
new spell_pal_ardent_defender();
@@ -335,4 +373,5 @@ void AddSC_paladin_spell_scripts()
new spell_pal_guarded_by_the_light();
new spell_pal_holy_shock();
new spell_pal_judgement_of_command();
new spell_pal_divine_storm();
}