diff --git a/sql/mangos.sql b/sql/mangos.sql index 186ae65cd..5b6ced131 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_10998_01_mangos_spell_proc_event` bit(1) default NULL + `required_11002_01_mangos_spell_proc_event` bit(1) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes'; -- @@ -16994,6 +16994,7 @@ INSERT INTO `spell_proc_event` VALUES (23572, 0x00, 11, 0x000000C0, 0x000000C0, 0x000000C0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0), (23578, 0x7F, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 2.000000, 0.000000, 0), (23581, 0x7F, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 2.000000, 0.000000, 0), +(23582, 0x00, 8, 0x00000800, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00004000, 0x00000000, 0.000000, 0.000000, 0), (23602, 0x7F, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000040, 0.000000, 0.000000, 0), (23686, 0x7F, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 2.000000, 0.000000, 0), (23688, 0x7F, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0.000000, 0.000000, 0), diff --git a/sql/updates/11002_01_mangos_spell_proc_event.sql b/sql/updates/11002_01_mangos_spell_proc_event.sql new file mode 100644 index 000000000..855791a59 --- /dev/null +++ b/sql/updates/11002_01_mangos_spell_proc_event.sql @@ -0,0 +1,5 @@ +ALTER TABLE db_version CHANGE COLUMN required_10998_01_mangos_spell_proc_event required_11002_01_mangos_spell_proc_event bit; + +DELETE FROM spell_proc_event WHERE entry IN (23582); +INSERT INTO spell_proc_event VALUES +(23582, 0x00, 8, 0x00000800, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00004000, 0x00000000, 0.000000, 0.000000, 0); diff --git a/sql/updates/Makefile.am b/sql/updates/Makefile.am index 98fc1ca9e..02e23f76d 100644 --- a/sql/updates/Makefile.am +++ b/sql/updates/Makefile.am @@ -151,6 +151,7 @@ pkgdata_DATA = \ 10989_01_mangos_loot_template.sql \ 10993_01_mangos_loot_template.sql \ 10998_01_mangos_spell_proc_event.sql \ + 11002_01_mangos_spell_proc_event.sql \ README ## Additional files to include when running 'make dist' @@ -282,4 +283,5 @@ EXTRA_DIST = \ 10989_01_mangos_loot_template.sql \ 10993_01_mangos_loot_template.sql \ 10998_01_mangos_spell_proc_event.sql \ + 11002_01_mangos_spell_proc_event.sql \ README diff --git a/src/game/UnitAuraProcHandler.cpp b/src/game/UnitAuraProcHandler.cpp index 62b8d0d7a..0e1894ce6 100644 --- a/src/game/UnitAuraProcHandler.cpp +++ b/src/game/UnitAuraProcHandler.cpp @@ -1639,6 +1639,13 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura { switch(dummySpell->Id) { + // Clean Escape + case 23582: + // triggered spell have same masks and etc with main Vanish spell + if (!procSpell || procSpell->Effect[EFFECT_INDEX_0] == SPELL_EFFECT_NONE) + return SPELL_AURA_PROC_FAILED; + triggered_spell_id = 23583; + break; // Deadly Throw Interrupt case 32748: { diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 5de011df3..64ed5c832 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 "11001" + #define REVISION_NR "11002" #endif // __REVISION_NR_H__ diff --git a/src/shared/revision_sql.h b/src/shared/revision_sql.h index a9f8bb3f7..7b2c172f7 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_10973_01_characters_game_event_status" - #define REVISION_DB_MANGOS "required_10998_01_mangos_spell_proc_event" + #define REVISION_DB_MANGOS "required_11002_01_mangos_spell_proc_event" #define REVISION_DB_REALMD "required_10008_01_realmd_realmd_db_version" #endif // __REVISION_SQL_H__