From 32bed90aa98a54740f514ac796e44de71bc9a444 Mon Sep 17 00:00:00 2001 From: AbsoluteZero Date: Sun, 6 Jun 2010 18:37:53 +0400 Subject: [PATCH] [10036] Fixed health restore and triggering cooldown for talent 30881 and ranks. Signed-off-by: VladimirMangos --- sql/mangos.sql | 14 ++++++++------ sql/updates/10036_01_mangos_spell_chain.sql | 11 +++++++++++ sql/updates/10036_01_mangos_spell_proc_event.sql | 5 +++++ sql/updates/Makefile.am | 4 ++++ src/game/SpellAuras.cpp | 1 + src/shared/revision_nr.h | 2 +- src/shared/revision_sql.h | 2 +- 7 files changed, 31 insertions(+), 8 deletions(-) create mode 100644 sql/updates/10036_01_mangos_spell_chain.sql create mode 100644 sql/updates/10036_01_mangos_spell_proc_event.sql diff --git a/sql/mangos.sql b/sql/mangos.sql index 48efb3c3d..dff2f8e7b 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_10017_01_mangos_spell_proc_event` bit(1) default NULL + `required_10036_01_mangos_spell_proc_event` bit(1) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes'; -- @@ -16576,6 +16576,12 @@ INSERT INTO spell_chain VALUES (58771,25570,5675,6,0), (58773,58771,5675,7,0), (58774,58773,5675,8,0), +/*Nature's Guardian*/ +(30881,0,30881,1,0), +(30883,30881,30881,2,0), +(30884,30883,30881,3,0), +(30885,30884,30881,4,0), +(30886,30885,30881,5,0), /*Riptide*/ (61295,0,61295,1,0), (61299,61295,61295,2,0), @@ -18203,11 +18209,7 @@ INSERT INTO `spell_proc_event` VALUES (30701, 0x1C, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0), (30705, 0x1C, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0), (30823, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 10.500000, 0.000000, 0), -(30881, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 5), -(30883, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 5), -(30884, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 5), -(30885, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 5), -(30886, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 5), +(30881, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 30), (30937, 0x20, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0), (31124, 0x00, 8, 0x2000000E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0), (31126, 0x00, 8, 0x2000000E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0), diff --git a/sql/updates/10036_01_mangos_spell_chain.sql b/sql/updates/10036_01_mangos_spell_chain.sql new file mode 100644 index 000000000..7414f40f8 --- /dev/null +++ b/sql/updates/10036_01_mangos_spell_chain.sql @@ -0,0 +1,11 @@ +ALTER TABLE db_version CHANGE COLUMN required_10017_01_mangos_spell_proc_event required_10036_01_mangos_spell_chain bit; + +DELETE FROM `spell_chain` WHERE `spell_id` IN (30881,30883,30884,30885,30886); + +INSERT INTO `spell_chain` (`spell_id`, `prev_spell`, `first_spell`, `rank`, `req_spell`) VALUES +/*Nature's Guardian*/ +(30881,0,30881,1,0), +(30883,30881,30881,2,0), +(30884,30883,30881,3,0), +(30885,30884,30881,4,0), +(30886,30885,30881,5,0); diff --git a/sql/updates/10036_01_mangos_spell_proc_event.sql b/sql/updates/10036_01_mangos_spell_proc_event.sql new file mode 100644 index 000000000..626155c04 --- /dev/null +++ b/sql/updates/10036_01_mangos_spell_proc_event.sql @@ -0,0 +1,5 @@ +ALTER TABLE db_version CHANGE COLUMN required_10036_01_mangos_spell_chain required_10036_01_mangos_spell_proc_event bit; + +DELETE FROM `spell_proc_event` WHERE `entry` IN (30881,30883,30884,30885,30886); +INSERT INTO `spell_proc_event` VALUES +(30881, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 30); diff --git a/sql/updates/Makefile.am b/sql/updates/Makefile.am index a65e1a199..630c62c75 100644 --- a/sql/updates/Makefile.am +++ b/sql/updates/Makefile.am @@ -82,6 +82,8 @@ pkgdata_DATA = \ 10012_01_mangos_spell_proc_event.sql \ 10015_01_mangos_spell_proc_event.sql \ 10017_01_mangos_spell_proc_event.sql \ + 10036_01_mangos_spell_chain.sql \ + 10036_01_mangos_spell_proc_event.sql \ README ## Additional files to include when running 'make dist' @@ -144,4 +146,6 @@ EXTRA_DIST = \ 10012_01_mangos_spell_proc_event.sql \ 10015_01_mangos_spell_proc_event.sql \ 10017_01_mangos_spell_proc_event.sql \ + 10036_01_mangos_spell_chain.sql \ + 10036_01_mangos_spell_proc_event.sql \ README diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index c692c0461..970d1d221 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -5441,6 +5441,7 @@ void Aura::HandleAuraModIncreaseHealth(bool apply, bool Real) { case 12976: // Warrior Last Stand triggered spell case 28726: // Nightmare Seed ( Nightmare Seed ) + case 31616: // Nature's Guardian case 34511: // Valor (Bulwark of Kings, Bulwark of the Ancient Kings) case 44055: case 55915: case 55917: case 67596: // Tremendous Fortitude (Battlemaster's Alacrity) case 50322: // Survival Instincts diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 72ffa03f8..86ae0b099 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 "10035" + #define REVISION_NR "10036" #endif // __REVISION_NR_H__ diff --git a/src/shared/revision_sql.h b/src/shared/revision_sql.h index 2164cc3d0..82a31ac05 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_10007_01_characters_pet_aura" - #define REVISION_DB_MANGOS "required_10017_01_mangos_spell_proc_event" + #define REVISION_DB_MANGOS "required_10036_01_mangos_spell_proc_event" #define REVISION_DB_REALMD "required_10008_01_realmd_realmd_db_version" #endif // __REVISION_SQL_H__