From a59de3394195cc49e303e3b99bc115506fd6e643 Mon Sep 17 00:00:00 2001 From: Tanatos Date: Sat, 23 May 2009 12:20:31 +0200 Subject: [PATCH] [7879] Fixed proc for 31571 and ranks. Signed-off-by: ApoC --- sql/mangos.sql | 2 +- sql/updates/7879_01_mangos_spell_proc_event.sql | 7 +++++++ sql/updates/Makefile.am | 2 ++ src/game/Unit.cpp | 16 ++++++++++++++++ src/shared/revision_nr.h | 2 +- 5 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 sql/updates/7879_01_mangos_spell_proc_event.sql diff --git a/sql/mangos.sql b/sql/mangos.sql index e9874df24..77e6a369e 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_7855_01_mangos_pools` bit(1) default NULL + `required_7879_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/7879_01_mangos_spell_proc_event.sql b/sql/updates/7879_01_mangos_spell_proc_event.sql new file mode 100644 index 000000000..0675b1904 --- /dev/null +++ b/sql/updates/7879_01_mangos_spell_proc_event.sql @@ -0,0 +1,7 @@ +ALTER TABLE db_version CHANGE COLUMN required_7855_01_mangos_pools required_7879_01_mangos_spell_proc_event bit; + + +DELETE FROM spell_proc_event WHERE entry IN (31571, 31572); +INSERT INTO spell_proc_event VALUES +(31571, 0x00, 3, 0x00000000, 0x00000022, 0x00000000, 0x00004000, 0x00000000, 0.000000, 0.000000, 0), +(31572, 0x00, 3, 0x00000000, 0x00000022, 0x00000000, 0x00004000, 0x00000000, 0.000000, 0.000000, 0); \ No newline at end of file diff --git a/sql/updates/Makefile.am b/sql/updates/Makefile.am index d3aab66e3..008f51965 100644 --- a/sql/updates/Makefile.am +++ b/sql/updates/Makefile.am @@ -191,6 +191,7 @@ pkgdata_DATA = \ 7850_01_mangos_command.sql \ 7855_01_mangos_pools.sql \ 7867_01_realmd_account.sql \ + 7879_01_mangos_spell_proc_event.sql \ README ## Additional files to include when running 'make dist' @@ -362,4 +363,5 @@ EXTRA_DIST = \ 7850_01_mangos_command.sql \ 7855_01_mangos_pools.sql \ 7867_01_realmd_account.sql \ + 7879_01_mangos_spell_proc_event.sql \ README diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 685ca2e8d..11412dd0f 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -4893,6 +4893,22 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAu triggered_spell_id = 29077; break; } + + //Arcane Potency + if (dummySpell->SpellIconID == 2120) + { + if(!procSpell) + return false; + + target = this; + switch (dummySpell->Id) + { + case 31571: triggered_spell_id = 57529; break; + case 31572: triggered_spell_id = 57531; break; + } + break; + } + // Hot Streak if (dummySpell->SpellIconID == 2999) { diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index b682f8f4f..824b75206 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 "7878" + #define REVISION_NR "7879" #endif // __REVISION_NR_H__