From d09615b2e588a8f79e858d8718c6dc063c76ebd6 Mon Sep 17 00:00:00 2001 From: VladimirMangos Date: Mon, 13 Jul 2009 04:30:14 +0400 Subject: [PATCH] [8171] Restore work double damage chance for spell 35290 and ranks. It has been broken at client switch and detected by spell_check data. --- sql/mangos_spell_check.sql | 2 +- src/game/SpellEffects.cpp | 13 ++++++------- src/shared/revision_nr.h | 2 +- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/sql/mangos_spell_check.sql b/sql/mangos_spell_check.sql index f4fb98d6d..62f83579d 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 7164e1515..d571c8ee5 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -310,12 +310,6 @@ void Spell::EffectSchoolDMG(uint32 effect_idx) { case SPELLFAMILY_GENERIC: { - //Gore - if (m_spellInfo->SpellIconID == 2269 ) - { - damage+= rand()%2 ? damage : 0; - } - switch(m_spellInfo->Id) // better way to check unknown { // Meteor like spells (divided damage to targets) @@ -527,8 +521,13 @@ void Spell::EffectSchoolDMG(uint32 effect_idx) } case SPELLFAMILY_HUNTER: { + //Gore + if (m_spellInfo->SpellIconID == 1578) + { + damage+= rand()%2 ? damage : 0; + } // Mongoose Bite - if ((m_spellInfo->SpellFamilyFlags & UI64LIT(0x000000002)) && m_spellInfo->SpellVisual[0]==342) + else if ((m_spellInfo->SpellFamilyFlags & UI64LIT(0x000000002)) && m_spellInfo->SpellVisual[0]==342) { damage += int32(m_caster->GetTotalAttackPowerValue(BASE_ATTACK)*0.2f); } diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 542e87176..e703ffb6e 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "8170" + #define REVISION_NR "8171" #endif // __REVISION_NR_H__