diff --git a/sql/mangos.sql b/sql/mangos.sql index 5b2e5f2c8..1ee8c0d07 100644 --- a/sql/mangos.sql +++ b/sql/mangos.sql @@ -22,7 +22,7 @@ DROP TABLE IF EXISTS `db_version`; CREATE TABLE `db_version` ( `version` varchar(120) default NULL, - `required_7175_01_mangos_spell_proc_event` bit(1) default NULL + `required_7196_02_mangos_spell_bonus_data` bit(1) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes'; -- diff --git a/sql/updates/01_mangos_spell_chain.sql b/sql/updates/7196_01_mangos_spell_chain.sql similarity index 75% rename from sql/updates/01_mangos_spell_chain.sql rename to sql/updates/7196_01_mangos_spell_chain.sql index bee954cd2..c7ab05692 100644 --- a/sql/updates/01_mangos_spell_chain.sql +++ b/sql/updates/7196_01_mangos_spell_chain.sql @@ -1,3 +1,5 @@ +ALTER TABLE db_version CHANGE COLUMN required_7193_01_mangos_mangos_string required_7196_01_mangos_spell_chain bit; + INSERT INTO spell_chain VALUES /*Tranquility*/ (44203, 0,44203,1,0), diff --git a/sql/updates/02_mangos_spell_bonus_data.sql b/sql/updates/7196_02_mangos_spell_bonus_data.sql similarity index 99% rename from sql/updates/02_mangos_spell_bonus_data.sql rename to sql/updates/7196_02_mangos_spell_bonus_data.sql index d9c46c727..7d62722bd 100644 --- a/sql/updates/02_mangos_spell_bonus_data.sql +++ b/sql/updates/7196_02_mangos_spell_bonus_data.sql @@ -1,3 +1,5 @@ +ALTER TABLE db_version CHANGE COLUMN required_7196_01_mangos_spell_chain required_7196_02_mangos_spell_bonus_data bit; + -- ---------------------------- -- Table structure for spell_bonus_data -- ---------------------------- diff --git a/sql/updates/Makefile.am b/sql/updates/Makefile.am index 8b81f825a..5f80456ac 100644 --- a/sql/updates/Makefile.am +++ b/sql/updates/Makefile.am @@ -152,6 +152,9 @@ pkgdata_DATA = \ 7156_01_mangos_spell_proc_event.sql \ 7168_01_mangos_command.sql \ 7175_01_mangos_spell_proc_event.sql \ + 7193_01_mangos_mangos_string.sql \ + 7196_01_mangos_spell_chain.sql \ + 7196_02_mangos_spell_bonus_data.sql \ README ## Additional files to include when running 'make dist' @@ -284,4 +287,7 @@ EXTRA_DIST = \ 7156_01_mangos_spell_proc_event.sql \ 7168_01_mangos_command.sql \ 7175_01_mangos_spell_proc_event.sql \ + 7193_01_mangos_mangos_string.sql \ + 7196_01_mangos_spell_chain.sql \ + 7196_02_mangos_spell_bonus_data.sql \ README diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 39709c695..0a4ef4d13 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -4476,7 +4476,6 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAu if(!target) return false; - basepoints0 = int32(damage * 2.5f); // manaregen triggered_spell_id = 34650; break; } diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 3784904eb..d23b65f58 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 "7195" + #define REVISION_NR "7196" #endif // __REVISION_NR_H__