[9149] Drop code and DB data for removed 31892/53720 and related spells.

Signed-off-by: VladimirMangos <vladimir@getmangos.com>
AdharRuafo · Jan 11, 2010 · 7fc2cff · 7fc2cff
1 parent 3e184ac
commit 7fc2cff
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 23 deletions.
diff --git 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_9148_01_mangos_spell_bonus_data` bit(1) default NULL
+  `required_9149_01_mangos_spell_bonus_data` bit(1) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes';
 
 --
@@ -14131,23 +14131,15 @@ INSERT INTO `spell_bonus_data` VALUES
 (31803, 0,      0.0156,  0.03,  'Paladin - Holy Vengeance'),
 (2812,  0.07,   0,       0.07,  'Paladin - Holy Wrath'),
 (54158, 0.25,   0,       0,     'Paladin - Judgement'),
-(31898, 0.18,   0,       0.11,  'Paladin - Judgement of Blood Enemy'),
-(32220, 0.0594, 0,       0.0363,'Paladin - Judgement of Blood Self'),
 (20467, 0.25,   0,       0.16,  'Paladin - Judgement of Command'),
 (53733, 0,      0,       0,     'Paladin - Judgement of Corruption'),
 (20267, 0.1,    0,       0.1,   'Paladin - Judgement of Light Proc'),
 (20187, 0.32,   0,       0,     'Paladin - Judgement of Righteousness'),
-(53726, 0.18,   0,       0.11,  'Paladin - Judgement of the Martyr Enemy'),
-(53725, 0.0594, 0,       0.0363,'Paladin - Judgement of the Martyr Self'),
 (31804, 0,      0,       0,     'Paladin - Judgement of Vengeance'),
-(31893, 0,      0,       0,     'Paladin - Seal of Blood Proc Enemy'),
-(32221, 0,      0,       0,     'Paladin - Seal of Blood Proc Self'),
 (20424, 0,      0,       0,     'Paladin - Seal of Command Proc'),
 (53739, 0,      0.00156, 0.003, 'Paladin - Seal of Corruption (full stack proc)'),
 (20167, 0.15,   0,       0.15,  'Paladin - Seal of Light Proc'),
 (25742, 0.07,   0,       0.039, 'Paladin - Seal of Righteousness Dummy Proc'),
-(53719, 0,      0,       0,     'Paladin - Seal of the Martyr Proc Enemy'),
-(53718, 0,      0,       0,     'Paladin - Seal of the Martyr Proc Self'),
 (42463, 0,      0.00156, 0.003, 'Paladin - Seal of Vengeance (full stack proc)'),
 (53600, 0,      0,       0,     'Paladin - Shield of Righteousness'),
 /* Priest */

diff --git a/sql/updates/9149_01_mangos_spell_bonus_data.sql b/sql/updates/9149_01_mangos_spell_bonus_data.sql
@@ -0,0 +1,3 @@
+ALTER TABLE db_version CHANGE COLUMN required_9148_01_mangos_spell_bonus_data required_9149_01_mangos_spell_bonus_data bit;
+
+DELETE FROM spell_bonus_data WHERE entry IN (31893,31898,32220,32221,53718,53719,53725,53726);
diff --git a/sql/updates/Makefile.am b/sql/updates/Makefile.am
@@ -236,6 +236,7 @@ pkgdata_DATA = \
 	9136_06_mangos_spell_proc_event.sql \
 	9136_07_characters_characters.sql \
 	9148_01_mangos_spell_bonus_data.sql \
+	9149_01_mangos_spell_bonus_data.sql \
 	README
 
 ## Additional files to include when running 'make dist'
@@ -452,4 +453,5 @@ EXTRA_DIST = \
 	9136_06_mangos_spell_proc_event.sql \
 	9136_07_characters_characters.sql \
 	9148_01_mangos_spell_bonus_data.sql \
+	9149_01_mangos_spell_bonus_data.sql \
 	README
diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp
@@ -4779,18 +4779,6 @@ void Spell::EffectWeaponDmg(uint32 i)
         if(m_caster->GetTypeId()==TYPEID_PLAYER)
             ((Player*)m_caster)->AddComboPoints(unitTarget, 1);
     }
-    else if(m_spellInfo->SpellFamilyName==SPELLFAMILY_PALADIN)
-    {
-        // Judgement of Blood/of the Martyr backlash damage (33%)
-        if(m_spellInfo->SpellFamilyFlags & 0x0000000800000000LL && m_spellInfo->SpellIconID==153)
-        {
-            int32 damagePoint  = m_damage * 33 / 100;
-            if(m_spellInfo->Id == 31898)
-                m_caster->CastCustomSpell(m_caster, 32220, &damagePoint, NULL, NULL, true);
-            else
-                m_caster->CastCustomSpell(m_caster, 53725, &damagePoint, NULL, NULL, true);
-        }
-    }
 
     // take ammo
     if(m_attackType == RANGED_ATTACK && m_caster->GetTypeId() == TYPEID_PLAYER)

diff --git 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 "9148"
+ #define REVISION_NR "9149"
 #endif // __REVISION_NR_H__
diff --git 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_9136_07_characters_characters"
- #define REVISION_DB_MANGOS "required_9148_01_mangos_spell_bonus_data"
+ #define REVISION_DB_MANGOS "required_9149_01_mangos_spell_bonus_data"
  #define REVISION_DB_REALMD "required_9010_01_realmd_realmlist"
 #endif // __REVISION_SQL_H__