mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-14 07:37:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[9839] Fix shadow damage part of 55090 and ranks

Browse source
This commit is contained in:
Laise 2010-05-05 17:50:08 +03:00
parent 722135b326
commit 432b1b8b38
4 changed files with 29 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
sql/mangos_spell_check.sql
View file

@ -403,7 +403,11 @@ INSERT INTO spell_check (spellid,SpellFamilyName,SpellFamilyMaskA,SpellFamilyMas
(54861,-1, -1, -1, -1, -1, -1, -1, -1,-1,'Nitro Boosts', 'Spell::EffectDummy'), (54861,-1, -1, -1, -1, -1, -1, -1, -1,-1,'Nitro Boosts', 'Spell::EffectDummy'),
(55004, 0, -1, -1, -1, -1, -1, 3, -1,-1,'Nitro Boosts', 'Spell::EffectDummy'), (55004, 0, -1, -1, -1, -1, -1, 3, -1,-1,'Nitro Boosts', 'Spell::EffectDummy'),
(55078,-1, -1, -1, -1, -1, -1, -1, 3,-1,'Blood Plague', 'Spell::EffectScriptEffect'), (55078,-1, -1, -1, -1, -1, -1, -1, 3,-1,'Blood Plague', 'Spell::EffectScriptEffect'),
(55090, 15,0x0800000000000000, -1, -1, -1, -1, -1, -1,-1,'Scourge Strike', 'Spell::DoAllEffectOnTarget'),
(55095,-1, -1, -1, -1, -1, -1, -1, 3,-1,'Frost Fever', 'Spell::EffectScriptEffect'), (55095,-1, -1, -1, -1, -1, -1, -1, 3,-1,'Frost Fever', 'Spell::EffectScriptEffect'),
(55265, 15,0x0800000000000000, -1, -1, -1, -1, -1, -1,-1,'Scourge Strike', 'Spell::DoAllEffectOnTarget'),
(55270, 15,0x0800000000000000, -1, -1, -1, -1, -1, -1,-1,'Scourge Strike', 'Spell::DoAllEffectOnTarget'),
(55271, 15,0x0800000000000000, -1, -1, -1, -1, -1, -1,-1,'Scourge Strike', 'Spell::DoAllEffectOnTarget'),
(55363,-1, -1, -1, -1, -1, -1, -1, -1,-1,'Create Ghoul Drool Cover', 'Spell::EffectDummy'), (55363,-1, -1, -1, -1, -1, -1, -1, -1,-1,'Create Ghoul Drool Cover', 'Spell::EffectDummy'),
(55364, 0, -1, -1, -1, -1, -1, 3, -1,-1,'Create Ghoul Drool Cover', 'Spell::EffectDummy'), (55364, 0, -1, -1, -1, -1, -1, 3, -1,-1,'Create Ghoul Drool Cover', 'Spell::EffectDummy'),
(55441,11, -1, -1, -1, -1, -1, -1, 4,-1,'Glyph of Mana Tide', 'Spell::EffectDummy'), (55441,11, -1, -1, -1, -1, -1, -1, 4,-1,'Glyph of Mana Tide', 'Spell::EffectDummy'),
@ -530,6 +534,7 @@ INSERT INTO spell_check (spellid,SpellFamilyName,SpellFamilyMaskA,SpellFamilyMas
( 0,11, -1, -1, 338, -1, -1, -1, 4, 1,'Restorative Totems', 'Spell::EffectSchoolDMG'), /*part 1*/ ( 0,11, -1, -1, 338, -1, -1, -1, 4, 1,'Restorative Totems', 'Spell::EffectSchoolDMG'), /*part 1*/
( 0, 4,0x0000000000000400,0x00000000, -1, -1, -1, 2, -1,-1,'Revenge', 'Spell::EffectSchoolDMG'), ( 0, 4,0x0000000000000400,0x00000000, -1, -1, -1, 2, -1,-1,'Revenge', 'Spell::EffectSchoolDMG'),
( 0,11,0x0000000000400000,0x00000000, -1, -1, -1, 54, -1,-1,'Rockbiter Weapon', 'Spell::EffectEnchantItemTmp'), ( 0,11,0x0000000000400000,0x00000000, -1, -1, -1, 54, -1,-1,'Rockbiter Weapon', 'Spell::EffectEnchantItemTmp'),
( 0,15,0x0800000000000000,0x00000000, -1, -1, -1, -1, -1,-1,'Scourge Strike', 'Spell::DoAllEffectOnTarget'),
( 0, 5,0x0040000000000000,0x00000000, -1, -1, -1, 2, -1,-1,'Shadow Bite', 'Spell::EffectSchoolDMG'), ( 0, 5,0x0040000000000000,0x00000000, -1, -1, -1, 2, -1,-1,'Shadow Bite', 'Spell::EffectSchoolDMG'),
( 0, 6,0x0000000200000000,0x00000000, -1, -1, -1, 2, -1,-1,'Shadow Word: Death', 'Spell::EffectSchoolDMG'), ( 0, 6,0x0000000200000000,0x00000000, -1, -1, -1, 2, -1,-1,'Shadow Word: Death', 'Spell::EffectSchoolDMG'),
( 0, 5,0x0000000000000000,0x00000002, -1, -1, -1, -1, 3,-1,'Shadowflame', 'Spell::EffectSchoolDMG'), /* dot */ ( 0, 5,0x0000000000000000,0x00000002, -1, -1, -1, -1, 3,-1,'Shadowflame', 'Spell::EffectSchoolDMG'), /* dot */

21
src/game/Spell.cpp
View file

@ -1017,6 +1017,27 @@ void Spell::DoAllEffectOnTarget(TargetInfo *target)
dummy->GetModifier()->m_amount = damageInfo.damage; dummy->GetModifier()->m_amount = damageInfo.damage;
caster->DealSpellDamage(&damageInfo, true); caster->DealSpellDamage(&damageInfo, true);
// Scourge Strike, here because needs to use final damage in second part of the spell
if (m_spellInfo->SpellFamilyName == SPELLFAMILY_DEATHKNIGHT && m_spellInfo->SpellFamilyFlags & UI64LIT(0x0800000000000000))
{
uint32 count = 0;
Unit::AuraMap const& auras = unitTarget->GetAuras();
for(Unit::AuraMap::const_iterator itr = auras.begin(); itr!=auras.end(); ++itr)
{
if(itr->second->GetSpellProto()->Dispel == DISPEL_DISEASE &&
itr->second->GetCasterGUID() == caster->GetGUID() &&
IsSpellLastAuraEffect(itr->second->GetSpellProto(), itr->second->GetEffIndex()))
++count;
}
if (count)
{
int32 bp = count * CalculateDamage(EFFECT_INDEX_2, unitTarget) * damageInfo.damage / 100;
if (bp)
caster->CastCustomSpell(unitTarget, 70890, &bp, NULL, NULL, true);
}
}
} }
// Passive spell hits/misses or active spells only misses (only triggers) // Passive spell hits/misses or active spells only misses (only triggers)
else else

4
src/game/SpellEffects.cpp
View file

@ -5065,9 +5065,9 @@ void Spell::EffectWeaponDmg(SpellEffectIndex eff_idx)
case SPELLFAMILY_DEATHKNIGHT: case SPELLFAMILY_DEATHKNIGHT:
{ {
// Blood Strike, Heart Strike, Obliterate // Blood Strike, Heart Strike, Obliterate
// Blood-Caked Strike, Scourge Strike // Blood-Caked Strike
if (m_spellInfo->SpellFamilyFlags & UI64LIT(0x0002000001400000) || if (m_spellInfo->SpellFamilyFlags & UI64LIT(0x0002000001400000) ||
m_spellInfo->SpellIconID == 1736 || m_spellInfo->SpellIconID == 3143) m_spellInfo->SpellIconID == 1736)
{ {
uint32 count = 0; uint32 count = 0;
Unit::AuraMap const& auras = unitTarget->GetAuras(); Unit::AuraMap const& auras = unitTarget->GetAuras();

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "9838" #define REVISION_NR "9839"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__