diff options
| -rw-r--r-- | sql/mangos_spell_check.sql | 2 | ||||
| -rw-r--r-- | src/game/SpellEffects.cpp | 13 |
2 files changed, 7 insertions, 8 deletions
diff --git a/sql/mangos_spell_check.sql b/sql/mangos_spell_check.sql index f4fb98d6d14..62f83579d97 100644 --- a/sql/mangos_spell_check.sql +++ b/sql/mangos_spell_check.sql @@ -78,7 +78,7 @@ INSERT INTO spell_check (spellid,SpellFamilyName,SpellFamilyMaskA,SpellFamilyMas ( 0, 8,0x0000000000020000,0x00000000, -1, -1, -1, 2, -1,-1,'Eviscerate', 'Spell::EffectSchoolDMG'), ( 0, 9,0x0000000000000004,0x00000000, -1, -1, -1, 2, -1,-1,'Explosive Trap Effect', 'Spell::EffectSchoolDMG'), ( 0, 7,0x0000000000800000,0x00000000, -1,6587, -1, 2, -1,-1,'Ferocious Bite', 'Spell::EffectSchoolDMG'), -( 0, 0, -1, -1,2269, -1, -1, 2, -1,-1,'Gore', 'Spell::EffectSchoolDMG'), +( 0, 9, -1, -1,1578, -1, -1, 2, -1,-1,'Gore', 'Spell::EffectSchoolDMG'), ( 0, 8,0x0000000000000008,0x00000000, -1, -1, -1, 2, -1,-1,'Gouge', 'Spell::EffectSchoolDMG'), ( 0,10,0x0000008000000000,0x00000000, -1, -1, -1, 2, -1,-1,'Hammer of Wrath', 'Spell::EffectSchoolDMG'), ( 0,10,0x0004000000000000,0x00000000, -1, -1, -1, 2, -1,-1,'Hammer of the Righteous', 'Spell::EffectSchoolDMG'), diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index 0e7668dc94b..965627e58eb 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -323,12 +323,6 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx) { case SPELLFAMILY_GENERIC: { - //Gore - if(m_spellInfo->SpellIconID == 2269 ) - { - damage += (rand()%2 ? damage : 0); - } - // Meteor like spells (divided damage to targets) if(m_customAttr & SPELL_ATTR_CU_SHARE_DAMAGE) { @@ -618,8 +612,13 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx) } case SPELLFAMILY_HUNTER: { + //Gore + if (m_spellInfo->SpellIconID == 1578) + { + damage+= rand()%2 ? damage : 0; + } // Mongoose Bite - if((m_spellInfo->SpellFamilyFlags[0] & 0x2) && m_spellInfo->SpellVisual[0]==342) + else if((m_spellInfo->SpellFamilyFlags[0] & 0x2) && m_spellInfo->SpellVisual[0]==342) { damage += int32(m_caster->GetTotalAttackPowerValue(BASE_ATTACK)*0.2f); } |