From 07172bc5ae7ad17a948d7553b509b017aa39e7af Mon Sep 17 00:00:00 2001 From: Den Date: Fri, 17 Dec 2010 16:11:04 +0300 Subject: [PATCH] [10883] Implement item 49982, 50641 equip effect Signed-off-by: VladimirMangos --- sql/mangos.sql | 4 ++- .../10883_01_mangos_spell_proc_event.sql | 6 ++++ sql/updates/Makefile.am | 2 ++ src/game/UnitAuraProcHandler.cpp | 32 +++++++++++++++++++ src/shared/revision_nr.h | 2 +- src/shared/revision_sql.h | 2 +- 6 files changed, 45 insertions(+), 3 deletions(-) create mode 100644 sql/updates/10883_01_mangos_spell_proc_event.sql diff --git a/sql/mangos.sql b/sql/mangos.sql index c67caf1ad..7f69f94ad 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_10867_02_mangos_creature_template` bit(1) default NULL + `required_10883_01_mangos_spell_proc_event` bit(1) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes'; -- @@ -17470,6 +17470,8 @@ INSERT INTO `spell_proc_event` VALUES (71642, 0x7F, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 45), (71645, 0x7F, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 45), (71761, 0x00, 3, 0x00000000, 0x00000000, 0x00000000, 0x00100000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000100, 0.000000, 0.000000, 0), +(71880, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 1.000000, 0.000000, 0), +(71892, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 1.000000, 0.000000, 0), (74396, 0x00, 3, 0x28E212F7, 0x28E212F7, 0x28E212F7, 0x00119048, 0x00119048, 0x00119048, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0.000000, 0.000000, 0), (75490, 0x7F, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0), (75495, 0x7F, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0); diff --git a/sql/updates/10883_01_mangos_spell_proc_event.sql b/sql/updates/10883_01_mangos_spell_proc_event.sql new file mode 100644 index 000000000..3c705e804 --- /dev/null +++ b/sql/updates/10883_01_mangos_spell_proc_event.sql @@ -0,0 +1,6 @@ +ALTER TABLE db_version CHANGE COLUMN required_10867_02_mangos_creature_template required_10883_01_mangos_spell_proc_event bit; + +DELETE FROM spell_proc_event WHERE entry IN (71880,71892); +INSERT INTO spell_proc_event VALUES +(71880, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 1.000000, 0.000000, 0), +(71892, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 1.000000, 0.000000, 0); diff --git a/sql/updates/Makefile.am b/sql/updates/Makefile.am index 06fe22724..61371f7d4 100644 --- a/sql/updates/Makefile.am +++ b/sql/updates/Makefile.am @@ -135,6 +135,7 @@ pkgdata_DATA = \ 10864_01_mangos_spell_proc_event.sql \ 10867_01_mangos_npc_trainer_template.sql \ 10867_02_mangos_creature_template.sql \ + 10883_01_mangos_spell_proc_event.sql \ README ## Additional files to include when running 'make dist' @@ -250,4 +251,5 @@ EXTRA_DIST = \ 10864_01_mangos_spell_proc_event.sql \ 10867_01_mangos_npc_trainer_template.sql \ 10867_02_mangos_creature_template.sql \ + 10883_01_mangos_spell_proc_event.sql \ README diff --git a/src/game/UnitAuraProcHandler.cpp b/src/game/UnitAuraProcHandler.cpp index 32f70224f..a40d0dc0c 100644 --- a/src/game/UnitAuraProcHandler.cpp +++ b/src/game/UnitAuraProcHandler.cpp @@ -2074,6 +2074,38 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura break; } + // Heartpierce, Item - Icecrown 25 Normal Dagger Proc + case 71880: + { + if(GetTypeId() != TYPEID_PLAYER) + return SPELL_AURA_PROC_FAILED; + + switch (this->getPowerType()) + { + case POWER_ENERGY: triggered_spell_id = 71882; break; + case POWER_RAGE: triggered_spell_id = 71883; break; + case POWER_MANA: triggered_spell_id = 71881; break; + default: + return SPELL_AURA_PROC_FAILED; + } + break; + } + // Heartpierce, Item - Icecrown 25 Heroic Dagger Proc + case 71892: + { + if(GetTypeId() != TYPEID_PLAYER) + return SPELL_AURA_PROC_FAILED; + + switch (this->getPowerType()) + { + case POWER_ENERGY: triggered_spell_id = 71887; break; + case POWER_RAGE: triggered_spell_id = 71886; break; + case POWER_MANA: triggered_spell_id = 71888; break; + default: + return SPELL_AURA_PROC_FAILED; + } + break; + } } break; } diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index b55b49d8a..b0b3628a7 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 "10882" + #define REVISION_NR "10883" #endif // __REVISION_NR_H__ diff --git a/src/shared/revision_sql.h b/src/shared/revision_sql.h index 0d248bce8..0a2e8e638 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_10862_01_characters_mail" - #define REVISION_DB_MANGOS "required_10867_02_mangos_creature_template" + #define REVISION_DB_MANGOS "required_10883_01_mangos_spell_proc_event" #define REVISION_DB_REALMD "required_10008_01_realmd_realmd_db_version" #endif // __REVISION_SQL_H__