[9220] Implement talent 53527 and ranks.

Signed-off-by: VladimirMangos <vladimir@getmangos.com>

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_9198_01_mangos_mangos_string` bit(1) default NULL
+  `required_9220_02_mangos_spell_chain` bit(1) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes';
 
 --
@@ -15911,6 +15911,15 @@ INSERT INTO spell_chain VALUES
 (32700,32699,31935,3,0),
 (48826,32700,31935,4,0),
 (48827,48826,31935,5,0),
+/*Divine Guardian*/
+(53527,0,53527,1,0),
+(53530,53527,53527,2, 0),
+/*Divinity*/
+(63646,0,63646,1,0),
+(63647,63646,63646,2,0),
+(63648,63647,63646,3,0),
+(63649,63648,63646,4,0),
+(63650,63649,63646,5,0),
 /*Devotion Aura*/
 (465,0,465,1,0),
 (10290,465,465,2,0),
@@ -15922,12 +15931,6 @@ INSERT INTO spell_chain VALUES
 (27149,10293,465,8,0),
 (48941,27149,465,9,0),
 (48942,48941,465,10,0),
-/*Divinity*/
-(63646,0,63646,1,0),
-(63647,63646,63646,2,0),
-(63648,63647,63646,3,0),
-(63649,63648,63646,4,0),
-(63650,63649,63646,5,0),
 /*Fire Resistance Aura*/
 (19891,0,19891,1,0),
 (19899,19891,19891,2,0),
@@ -18387,6 +18390,7 @@ INSERT INTO `spell_proc_event` VALUES
 (52127, 0x00000000,  0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  3),
 (52420, 0x00000000,  0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 30),
 (52423, 0x00000000,  0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000020, 0.000000, 0.000000,  0),
+(53527, 0x00000000, 10, 0x00000000, 0x00000000, 0x00000004, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
 (52795, 0x00000000,  6, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
 (52797, 0x00000000,  6, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),
 (52798, 0x00000000,  6, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0),

sql/updates/9220_01_mangos_spell_proc_event.sql

@@ -0,0 +1,5 @@
+ALTER TABLE db_version CHANGE COLUMN required_9198_01_mangos_mangos_string required_9220_01_mangos_spell_proc_event bit;
+
+DELETE FROM `spell_proc_event` WHERE `entry` IN (53527, 53530);
+INSERT INTO `spell_proc_event` VALUES
+(53527, 0x00000000, 10, 0x00000000, 0x00000000, 0x00000004, 0x00000000, 0x00000000, 0.000000, 0.000000,  0);

sql/updates/9220_02_mangos_spell_chain.sql

@@ -0,0 +1,7 @@
+ALTER TABLE db_version CHANGE COLUMN required_9220_01_mangos_spell_proc_event required_9220_02_mangos_spell_chain bit;
+
+/*Divine Guardian*/
+DELETE FROM spell_chain WHERE first_spell = 53527;
+INSERT INTO spell_chain VALUES
+(53527, 0, 53527, 1, 0),
+(53530, 53527, 53527, 2, 0);

sql/updates/Makefile.am

@@ -245,6 +245,8 @@ pkgdata_DATA = \
 	9160_01_mangos_spell_proc_event.sql \
 	9160_02_mangos_spell_chain.sql \
 	9198_01_mangos_mangos_string.sql \
+	9220_01_mangos_spell_proc_event.sql \
+	9220_02_mangos_spell_chain.sql \
 	README
 
 ## Additional files to include when running 'make dist'
@@ -470,4 +472,6 @@ EXTRA_DIST = \
 	9160_01_mangos_spell_proc_event.sql \
 	9160_02_mangos_spell_chain.sql \
 	9198_01_mangos_mangos_string.sql \
+	9220_01_mangos_spell_proc_event.sql \
+	9220_02_mangos_spell_chain.sql \
 	README

src/game/SpellMgr.cpp

@@ -1688,6 +1688,10 @@ bool SpellMgr::IsNoStackSpellDueToSpell(uint32 spellId_1, uint32 spellId_2) cons
                 // Seal of Corruption (caster/target parts stacking allow, other stacking checked by spell specs)
                 if (spellInfo_1->SpellIconID == 2292 && spellInfo_2->SpellIconID == 2292)
                     return false;
+
+                // Divine Sacrifice and Divine Guardian
+                if (spellInfo_1->SpellIconID == 3837 && spellInfo_2->SpellIconID == 3837)
+                    return false;
             }
 
             // Blessing of Sanctuary (multi-family check, some from 16 spell icon spells)

src/shared/revision_nr.h

@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "9219"
+ #define REVISION_NR "9220"
 #endif // __REVISION_NR_H__

src/shared/revision_sql.h

@@ -1,6 +1,6 @@
 #ifndef __REVISION_SQL_H__
 #define __REVISION_SQL_H__
  #define REVISION_DB_CHARACTERS "required_9136_07_characters_characters"
- #define REVISION_DB_MANGOS "required_9198_01_mangos_mangos_string"
+ #define REVISION_DB_MANGOS "required_9220_02_mangos_spell_chain"
  #define REVISION_DB_REALMD "required_9010_01_realmd_realmlist"
 #endif // __REVISION_SQL_H__