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

[8172] Drop dead code for 33878/33876 and ranks.

Browse source 
Detected by spell_check: not have now dummy aura but have
SPELL_AURA_MOD_MECHANIC_DAMAGE_TAKEN_PERCEN for proper mechanic.
This commit is contained in:
VladimirMangos 2009-07-13 14:42:29 +04:00
parent d09615b2e5
commit 2ed6642539
4 changed files with 4 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sql/mangos_spell_check.sql
View file

@ -87,7 +87,7 @@ INSERT INTO spell_check (spellid,SpellFamilyName,SpellFamilyMaskA,SpellFamilyMas
( 0, 8,0x0000000000002000,0x00000000, -1, -1, -1, 2, -1,-1,'Instant Poison', 'Spell::EffectSchoolDMG'), ( 0, 8,0x0000000000002000,0x00000000, -1, -1, -1, 2, -1,-1,'Instant Poison', 'Spell::EffectSchoolDMG'),
( 0,10,0x0000000800000000,0x00000000,2292, -1, -1, 2, -1,-1,'Judgement of Vengeance', 'Spell::EffectSchoolDMG'), ( 0,10,0x0000000800000000,0x00000000,2292, -1, -1, 2, -1,-1,'Judgement of Vengeance', 'Spell::EffectSchoolDMG'),
( 0, 7,0x0000010000000000,0x00000000,2246, -1, -1, 2, -1,-1,'Lacerate', 'Spell::EffectSchoolDMG'), ( 0, 7,0x0000010000000000,0x00000000,2246, -1, -1, 2, -1,-1,'Lacerate', 'Spell::EffectSchoolDMG'),
( 0, 7,0x0000044000000000,0x00000000, -1, -1, -1, -1, 4,-1,'Mangle Bonus', 'Spell::EffectSchoolDMG'), ( 0, 7,0x0000044000000000,0x00000000, -1, -1, -1, -1, -1,-1,'Mangle (Cat) and Mangle (Bear)', 'Unit::HandleDummyAuraProc'),
( 0, 9,0x0000000000000002,0x00000000, -1, 342, -1, 2, -1,-1,'Mongoose Bite', 'Spell::EffectSchoolDMG'), ( 0, 9,0x0000000000000002,0x00000000, -1, 342, -1, 2, -1,-1,'Mongoose Bite', 'Spell::EffectSchoolDMG'),
( 0, 7,0x0000000000001000,0x00000000, 494, -1, -1, 2, -1,-1,'Rake', 'Spell::EffectSchoolDMG'), ( 0, 7,0x0000000000001000,0x00000000, 494, -1, -1, 2, -1,-1,'Rake', 'Spell::EffectSchoolDMG'),
( 0, 7,0x0000000000001000,0x00000000, -1, -1, -1, 2, -1,-1,'Rake', 'Spell::EffectSchoolDMG'), ( 0, 7,0x0000000000001000,0x00000000, -1, -1, -1, 2, -1,-1,'Rake', 'Spell::EffectSchoolDMG'),

12
src/game/SpellEffects.cpp
View file

@ -439,18 +439,6 @@ void Spell::EffectSchoolDMG(uint32 effect_idx)
{ {
damage += int32(m_caster->GetTotalAttackPowerValue(BASE_ATTACK)*0.08f); damage += int32(m_caster->GetTotalAttackPowerValue(BASE_ATTACK)*0.08f);
} }
//Mangle Bonus for the initial damage of Lacerate and Rake
if ((m_spellInfo->SpellFamilyFlags==UI64LIT(0x0000000000001000) && m_spellInfo->SpellIconID==494) ||
(m_spellInfo->SpellFamilyFlags==UI64LIT(0x0000010000000000) && m_spellInfo->SpellIconID==2246))
{
Unit::AuraList const& mDummyAuras = unitTarget->GetAurasByType(SPELL_AURA_DUMMY);
for(Unit::AuraList::const_iterator i = mDummyAuras.begin(); i != mDummyAuras.end(); ++i)
if(((*i)->GetSpellProto()->SpellFamilyFlags & UI64LIT(0x0000044000000000)) && (*i)->GetSpellProto()->SpellFamilyName==SPELLFAMILY_DRUID)
{
damage = int32(damage*(100.0f+(*i)->GetModifier()->m_amount)/100.0f);
break;
}
}
break; break;
} }
case SPELLFAMILY_ROGUE: case SPELLFAMILY_ROGUE:

5
src/game/Unit.cpp
View file

@ -5287,7 +5287,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAu
triggered_spell_id = 40446; triggered_spell_id = 40446;
chance = 25.0f; chance = 25.0f;
} }
// Mangle (cat/bear) // Mangle (Bear) and Mangle (Cat)
else if (procSpell->SpellFamilyFlags & UI64LIT(0x0000044000000000)) else if (procSpell->SpellFamilyFlags & UI64LIT(0x0000044000000000))
{ {
triggered_spell_id = 40452; triggered_spell_id = 40452;
@ -7916,8 +7916,7 @@ uint32 Unit::SpellDamageBonus(Unit *pVictim, SpellEntry const *spellProto, uint3
TakenTotalMod *= ((*i)->GetModifier()->m_amount+100.0f)/100.0f; TakenTotalMod *= ((*i)->GetModifier()->m_amount+100.0f)/100.0f;
// Mod damage from spell mechanic // Mod damage from spell mechanic
uint32 mechanicMask = GetAllSpellMechanicMask(spellProto); if (uint32 mechanicMask = GetAllSpellMechanicMask(spellProto))
if (mechanicMask)
{ {
AuraList const& mDamageDoneMechanic = pVictim->GetAurasByType(SPELL_AURA_MOD_MECHANIC_DAMAGE_TAKEN_PERCENT); AuraList const& mDamageDoneMechanic = pVictim->GetAurasByType(SPELL_AURA_MOD_MECHANIC_DAMAGE_TAKEN_PERCENT);
for(AuraList::const_iterator i = mDamageDoneMechanic.begin();i != mDamageDoneMechanic.end(); ++i) for(AuraList::const_iterator i = mDamageDoneMechanic.begin();i != mDamageDoneMechanic.end(); ++i)

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 "8171" #define REVISION_NR "8172"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__