From e70fdad6b7fb8483168d63e43b48e091b7d6f77a Mon Sep 17 00:00:00 2001 From: Corfen Date: Tue, 5 May 2009 22:02:33 +0200 Subject: [PATCH] [7777] Fixed talent 30299 and ranks procing also from holy dmg. Signed-off-by: ApoC --- sql/mangos.sql | 2 +- sql/updates/7777_01_mangos_spell_proc_event.sql | 6 ++++++ sql/updates/Makefile.am | 2 ++ src/game/Unit.cpp | 2 +- src/shared/revision_nr.h | 2 +- 5 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 sql/updates/7777_01_mangos_spell_proc_event.sql diff --git a/sql/mangos.sql b/sql/mangos.sql index 68e8d115f..2986b63db 100644 --- a/sql/mangos.sql +++ b/sql/mangos.sql @@ -23,7 +23,7 @@ DROP TABLE IF EXISTS `db_version`; CREATE TABLE `db_version` ( `version` varchar(120) default NULL, `creature_ai_version` varchar(120) default NULL, - `required_7776_01_mangos_npc_spellclick_spells` bit(1) default NULL + `required_7777_01_mangos_spell_proc_event` bit(1) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes'; -- diff --git a/sql/updates/7777_01_mangos_spell_proc_event.sql b/sql/updates/7777_01_mangos_spell_proc_event.sql new file mode 100644 index 000000000..e54db2854 --- /dev/null +++ b/sql/updates/7777_01_mangos_spell_proc_event.sql @@ -0,0 +1,6 @@ +ALTER TABLE db_version CHANGE COLUMN required_7776_01_mangos_npc_spellclick_spells required_7777_01_mangos_spell_proc_event bit; + +DELETE FROM spell_proc_event WHERE entry IN (30299,30301,30302); +INSERT INTO spell_proc_event VALUES (30299, 0x0000007E, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0); +INSERT INTO spell_proc_event VALUES (30301, 0x0000007E, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0); +INSERT INTO spell_proc_event VALUES (30302, 0x0000007E, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0); diff --git a/sql/updates/Makefile.am b/sql/updates/Makefile.am index c157aa6c0..2ec65ade2 100644 --- a/sql/updates/Makefile.am +++ b/sql/updates/Makefile.am @@ -178,6 +178,7 @@ pkgdata_DATA = \ 7714_01_mangos_command.sql \ 7720_01_mangos_mangos_string.sql \ 7776_01_mangos_npc_spellclick_spells.sql \ + 7777_01_mangos_spell_proc_event.sql \ README ## Additional files to include when running 'make dist' @@ -336,4 +337,5 @@ EXTRA_DIST = \ 7714_01_mangos_command.sql \ 7720_01_mangos_mangos_string.sql \ 7776_01_mangos_npc_spellclick_spells.sql \ + 7777_01_mangos_spell_proc_event.sql \ README diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index b37866766..455cf8b48 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -6221,8 +6221,8 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, Aura* triggeredB switch(GetFirstSchoolInMask(GetSpellSchoolMask(procSpell))) { case SPELL_SCHOOL_NORMAL: - case SPELL_SCHOOL_HOLY: return false; // ignore + case SPELL_SCHOOL_HOLY: trigger_spell_id = 54370; break; case SPELL_SCHOOL_FIRE: trigger_spell_id = 54371; break; case SPELL_SCHOOL_NATURE: trigger_spell_id = 54375; break; case SPELL_SCHOOL_FROST: trigger_spell_id = 54372; break; diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 712467f13..2eee45080 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 "7776" + #define REVISION_NR "7777" #endif // __REVISION_NR_H__