From 545218fda3169ad09aef5b9b04b69c39a2dadf5b Mon Sep 17 00:00:00 2001 From: GalaxyMan Date: Sat, 10 Oct 2009 17:24:49 +0400 Subject: [PATCH] [8618] Implement glyph 42752 Signed-off-by: VladimirMangos Also fix typo in mangos.sql. --- sql/mangos.sql | 5 +++-- sql/updates/8618_01_mangos_spell_proc_event.sql | 6 ++++++ sql/updates/Makefile.am | 2 ++ src/game/Unit.cpp | 10 ++++++++++ src/shared/revision_nr.h | 2 +- src/shared/revision_sql.h | 2 +- 6 files changed, 23 insertions(+), 4 deletions(-) create mode 100644 sql/updates/8618_01_mangos_spell_proc_event.sql diff --git a/sql/mangos.sql b/sql/mangos.sql index 18824e931..81acb176b 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_8608_02_mangos_battleground_events` bit(1) default NULL + `required_8618_01_mangos_spell_proc_event` bit(1) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes'; -- @@ -255,7 +255,7 @@ INSERT INTO battleground_events (map, event1, event2, description) VALUES (572, 253, 0, 'buffs'), (572, 254, 0, 'doors'), (562, 253, 0, 'buffs'), -(562, 254, 0, 'doors'); +(562, 254, 0, 'doors'), -- alterac valley (30, 254, 0, 'Doors'), @@ -18252,6 +18252,7 @@ INSERT INTO `spell_proc_event` VALUES (56355, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000040, 0.000000, 0.000000, 0), (56364, 0x00000000, 3, 0x00000000, 0x01000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0), (56372, 0x00000000, 3, 0x00000000, 0x00000080, 0x00000000, 0x00004000, 0x00000000, 0.000000, 0.000000, 0), +(56375, 0x00000000, 3, 0x01000000, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0.000000, 0.000000, 0), (56451, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 3), (56611, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 0), (56612, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 0), diff --git a/sql/updates/8618_01_mangos_spell_proc_event.sql b/sql/updates/8618_01_mangos_spell_proc_event.sql new file mode 100644 index 000000000..f21585666 --- /dev/null +++ b/sql/updates/8618_01_mangos_spell_proc_event.sql @@ -0,0 +1,6 @@ +ALTER TABLE db_version CHANGE COLUMN required_8608_02_mangos_battleground_events required_8618_01_mangos_spell_proc_event bit; + +DELETE FROM `spell_proc_event` WHERE `entry` = 56375; + +INSERT INTO `spell_proc_event` VALUES +(56375, 0x00, 3, 0x01000000, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0.000000, 0.000000, 0); diff --git a/sql/updates/Makefile.am b/sql/updates/Makefile.am index ce06e24c8..af201b913 100644 --- a/sql/updates/Makefile.am +++ b/sql/updates/Makefile.am @@ -134,6 +134,7 @@ pkgdata_DATA = \ 8607_02_mangos_command.sql \ 8608_01_mangos_mangos_string.sql \ 8608_02_mangos_battleground_events.sql \ + 8618_01_mangos_spell_proc_event.sql \ README ## Additional files to include when running 'make dist' @@ -248,4 +249,5 @@ EXTRA_DIST = \ 8607_02_mangos_command.sql \ 8608_01_mangos_mangos_string.sql \ 8608_02_mangos_battleground_events.sql \ + 8618_01_mangos_spell_proc_event.sql \ README diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index e0d330cb8..e37f8b3df 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -5160,6 +5160,16 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAu ((Player*)this)->RemoveSpellCategoryCooldown(35, true); return true; } + // Glyph of Polymorph + case 56375: + { + if (!pVictim || !pVictim->isAlive()) + return false; + + pVictim->RemoveSpellsCausingAura(SPELL_AURA_PERIODIC_DAMAGE); + pVictim->RemoveSpellsCausingAura(SPELL_AURA_PERIODIC_DAMAGE_PERCENT); + return true; + } } break; } diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index eb7705dbc..309ef0abe 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 "8617" + #define REVISION_NR "8618" #endif // __REVISION_NR_H__ diff --git a/src/shared/revision_sql.h b/src/shared/revision_sql.h index 0210c0b6f..ddf639c65 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_8596_01_characters_bugreport" - #define REVISION_DB_MANGOS "required_8608_02_mangos_battleground_events" + #define REVISION_DB_MANGOS "required_8618_01_mangos_spell_proc_event" #define REVISION_DB_REALMD "required_8332_01_realmd_realmcharacters" #endif // __REVISION_SQL_H__