From b477d3dcb7149d05f224d2e63f2d99628b17557c Mon Sep 17 00:00:00 2001 From: VladimirMangos Date: Thu, 17 Dec 2009 22:08:45 +0300 Subject: [PATCH] [9015] Fixed spell 34914 ranks dispel damage and spell 29722 and ranks bonus damage. In both cases not expected additional spell damage bonus apply. --- sql/mangos.sql | 3 ++- sql/updates/9015_01_mangos_spell_bonus_data.sql | 5 +++++ sql/updates/Makefile.am | 2 ++ src/game/SpellEffects.cpp | 2 +- src/shared/revision_nr.h | 2 +- src/shared/revision_sql.h | 2 +- 6 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 sql/updates/9015_01_mangos_spell_bonus_data.sql diff --git a/sql/mangos.sql b/sql/mangos.sql index 8d37c3efe36..bfcacd22169 100644 --- a/sql/mangos.sql +++ b/sql/mangos.sql @@ -24,7 +24,7 @@ CREATE TABLE `db_version` ( `version` varchar(120) default NULL, `creature_ai_version` varchar(120) default NULL, `cache_id` int(10) default '0', - `required_9007_01_mangos_spell_proc_event` bit(1) default NULL + `required_9015_01_mangos_spell_bonus_data` bit(1) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes'; -- @@ -14129,6 +14129,7 @@ INSERT INTO `spell_bonus_data` VALUES (34433, 0.65, 0, 0, 'Priest - Shadowfiend'), (585, 0.714, 0, 0, 'Priest - Smite'), (34914, 0, 0.4, 0, 'Priest - Vampiric Touch'), +(64085, 0, 0, 0, 'Priest - Vampiric Touch Dispel'), /* Shaman */ (974, 0.4762, 0, 0, 'Shaman - Earth Shield'), (379, 0, 0, 0, 'Shaman - Earth Shield Triggered'), diff --git a/sql/updates/9015_01_mangos_spell_bonus_data.sql b/sql/updates/9015_01_mangos_spell_bonus_data.sql new file mode 100644 index 00000000000..4dd02f0f149 --- /dev/null +++ b/sql/updates/9015_01_mangos_spell_bonus_data.sql @@ -0,0 +1,5 @@ +ALTER TABLE db_version CHANGE COLUMN required_9007_01_mangos_spell_proc_event required_9015_01_mangos_spell_bonus_data bit; + +DELETE FROM spell_bonus_data WHERE entry = 64085; +INSERT INTO spell_bonus_data (entry, direct_bonus, dot_bonus, ap_bonus, comments) VALUES +(64085, 0, 0, 0, 'Priest - Vampiric Touch Dispel'); diff --git a/sql/updates/Makefile.am b/sql/updates/Makefile.am index 56d235f6d8e..a6ba8b72d76 100644 --- a/sql/updates/Makefile.am +++ b/sql/updates/Makefile.am @@ -212,6 +212,7 @@ pkgdata_DATA = \ 9005_01_mangos_spell_proc_event.sql \ 9007_01_mangos_spell_proc_event.sql \ 9010_01_realmd_realmlist.sql \ + 9015_01_mangos_spell_bonus_data.sql \ README ## Additional files to include when running 'make dist' @@ -404,4 +405,5 @@ EXTRA_DIST = \ 9005_01_mangos_spell_proc_event.sql \ 9007_01_mangos_spell_proc_event.sql \ 9010_01_realmd_realmlist.sql \ + 9015_01_mangos_spell_bonus_data.sql \ README diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index 5ea7e012feb..1bdd7b04e0a 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -475,7 +475,7 @@ void Spell::EffectSchoolDMG(uint32 effect_idx) // found Immolate or Shadowflame if (aura) { - int32 damagetick = m_caster->SpellDamageBonus(unitTarget, aura->GetSpellProto(), aura->GetModifier()->m_amount, DOT); + int32 damagetick = aura->GetModifier()->m_amount; damage += damagetick * 4; // Glyph of Conflagrate diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index cb22b489c23..f05350f6f79 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 "9014" + #define REVISION_NR "9015" #endif // __REVISION_NR_H__ diff --git a/src/shared/revision_sql.h b/src/shared/revision_sql.h index 4a288f87f02..168dbac0bdb 100644 --- a/src/shared/revision_sql.h +++ b/src/shared/revision_sql.h @@ -1,6 +1,6 @@ #ifndef __REVISION_SQL_H__ #define __REVISION_SQL_H__ #define REVISION_DB_CHARACTERS "required_8874_01_characters_character_skills" - #define REVISION_DB_MANGOS "required_9007_01_mangos_spell_proc_event" + #define REVISION_DB_MANGOS "required_9015_01_mangos_spell_bonus_data" #define REVISION_DB_REALMD "required_9010_01_realmd_realmlist" #endif // __REVISION_SQL_H__