7 files changed, 80 insertions, 14 deletions
diff --git a/sql/updates/world/2013_07_25_07_world_spell_misc_434.sql b/sql/updates/world/2013_07_25_07_world_spell_misc_434.sql
new file mode 100644
index 00000000000..6a2d96b5f45
--- /dev/null
+++ b/sql/updates/world/2013_07_25_07_world_spell_misc_434.sql
@@ -0,0 +1,66 @@
+DELETE FROM `spell_script_names` WHERE `ScriptName` IN (
+'spell_gen_lifeblood',
+'spell_dk_scourge_strike',
+'spell_dru_starfall_dummy',
+'spell_dk_death_strike',
+'spell_pri_mind_sear',
+'spell_dk_blood_boil',
+'spell_pri_guardian_spirit',
+'spell_dk_death_coil',
+'spell_pri_penance',
+'spell_mage_living_bomb',
+'spell_dru_lifebloom',
+'spell_pri_shadow_word_death',
+'spell_pal_ardent_defender',
+'spell_pal_holy_shock',
+'spell_warr_deep_wounds',
+'spell_pri_mana_burn',
+'spell_dru_insect_swarm',
+'spell_dru_enrage',
+'spell_dru_tiger_s_fury',
+'spell_rog_deadly_poison',
+'spell_sha_earth_shield',
+'spell_mage_frost_warding_trigger'
+);
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(-81708, 'spell_gen_lifeblood'),
+(55090, 'spell_dk_scourge_strike'),
+(50286, 'spell_dru_starfall_dummy'),
+(49998, 'spell_dk_death_strike'),
+(49821, 'spell_pri_mind_sear'),
+(48721, 'spell_dk_blood_boil'),
+(47788, 'spell_pri_guardian_spirit'),
+(47541, 'spell_dk_death_coil'),
+(47540, 'spell_pri_penance'),
+(44457, 'spell_mage_living_bomb'),
+(33763, 'spell_dru_lifebloom'),
+(32379, 'spell_pri_shadow_word_death'),
+(31850, 'spell_pal_ardent_defender'),
+(20473, 'spell_pal_holy_shock'),
+(12162, 'spell_warr_deep_wounds'),
+(8129, 'spell_pri_mana_burn'),
+(5570, 'spell_dru_insect_swarm'),
+(5229, 'spell_dru_enrage'),
+(5217, 'spell_dru_tiger_s_fury'),
+(2818, 'spell_rog_deadly_poison'),
+(974, 'spell_sha_earth_shield'),
+(543, 'spell_mage_frost_warding_trigger'),
+(52375, 'spell_dk_death_coil'),
+(59134, 'spell_dk_death_coil');
+
+DELETE FROM `spell_ranks` WHERE  `first_spell_id` IN (51685,31130,7235);
+INSERT INTO `spell_ranks` (`first_spell_id`, `spell_id`, `rank`) VALUES
+(51685, 51685, 1),
+(51685, 51686, 2),
+(51685, 51687, 3),
+(51685, 51688, 4),
+(51685, 51689, 5),
+
+(31130, 31130, 1),
+(31130, 31131, 2),
+
+(7235, 7235, 1),
+(7235, 7241, 2),
+(7235, 7242, 3),
+(7235, 7243, 4),
+(7235, 7244, 5);
diff --git a/src/server/scripts/Spells/spell_dk.cpp b/src/server/scripts/Spells/spell_dk.cpp
index 61da5853f88..3094d0b236e 100644
--- a/src/server/scripts/Spells/spell_dk.cpp
+++ b/src/server/scripts/Spells/spell_dk.cpp
@@ -338,7 +338,7 @@ class spell_dk_butchery : public SpellScriptLoader
         }
 };
 
-// -47541, 52375, 59134, -62900 - Death Coil
+// 47541, 52375, 59134, -62900 - Death Coil
 class spell_dk_death_coil : public SpellScriptLoader
 {
     public:
@@ -536,7 +536,7 @@ class spell_dk_death_pact : public SpellScriptLoader
         }
 };
 
-// -49998 - Death Strike
+// 49998 - Death Strike
 class spell_dk_death_strike : public SpellScriptLoader
 {
     public:
diff --git a/src/server/scripts/Spells/spell_druid.cpp b/src/server/scripts/Spells/spell_druid.cpp
index 0c59a48d5ac..b6606f40267 100644
--- a/src/server/scripts/Spells/spell_druid.cpp
+++ b/src/server/scripts/Spells/spell_druid.cpp
@@ -195,7 +195,7 @@ class spell_dru_dash : public SpellScriptLoader
         }
 };
 
-// -5229 - Enrage
+// 5229 - Enrage
 class spell_dru_enrage : public SpellScriptLoader
 {
     public:
@@ -413,7 +413,7 @@ class spell_dru_innervate : public SpellScriptLoader
         }
 };
 
-// -5570 - Insect Swarm
+// 5570 - Insect Swarm
 class spell_dru_insect_swarm : public SpellScriptLoader
 {
     public:
@@ -442,7 +442,7 @@ class spell_dru_insect_swarm : public SpellScriptLoader
         }
 };
 
-// -33763 - Lifebloom
+// 33763 - Lifebloom
 class spell_dru_lifebloom : public SpellScriptLoader
 {
     public:
@@ -953,7 +953,7 @@ class spell_dru_swift_flight_passive : public SpellScriptLoader
         }
 };
 
-// -5217 - Tiger's Fury
+// 5217 - Tiger's Fury
 class spell_dru_tiger_s_fury : public SpellScriptLoader
 {
     public:
diff --git a/src/server/scripts/Spells/spell_mage.cpp b/src/server/scripts/Spells/spell_mage.cpp
index 8e8af13a05e..5b2e8250843 100644
--- a/src/server/scripts/Spells/spell_mage.cpp
+++ b/src/server/scripts/Spells/spell_mage.cpp
@@ -466,9 +466,8 @@ class spell_mage_fire_frost_ward : public SpellScriptLoader
 
             bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE
             {
-                if (!sSpellMgr->GetSpellInfo(SPELL_MAGE_FROST_WARDING_TRIGGERED))
-                    return false;
-                if (!sSpellMgr->GetSpellInfo(SPELL_MAGE_FROST_WARDING_R1))
+                if (!sSpellMgr->GetSpellInfo(SPELL_MAGE_FROST_WARDING_TRIGGERED) ||
+                    !sSpellMgr->GetSpellInfo(SPELL_MAGE_FROST_WARDING_R1))
                     return false;
                 return true;
             }
@@ -718,7 +717,7 @@ class spell_mage_glyph_of_polymorph : public SpellScriptLoader
         }
 };
 
-// -44457 - Living Bomb
+// 44457 - Living Bomb
 class spell_mage_living_bomb : public SpellScriptLoader
 {
     public:
diff --git a/src/server/scripts/Spells/spell_paladin.cpp b/src/server/scripts/Spells/spell_paladin.cpp
index bd223b2d706..f793b8a387a 100644
--- a/src/server/scripts/Spells/spell_paladin.cpp
+++ b/src/server/scripts/Spells/spell_paladin.cpp
@@ -59,7 +59,7 @@ enum MiscSpells
 };
 
 // 31850 - Ardent Defender
-/*class spell_pal_ardent_defender : public SpellScriptLoader
+class spell_pal_ardent_defender : public SpellScriptLoader
 {
     public:
         spell_pal_ardent_defender() : SpellScriptLoader("spell_pal_ardent_defender") { }
@@ -132,7 +132,7 @@ enum MiscSpells
         {
             return new spell_pal_ardent_defender_AuraScript();
         }
-};*/
+};
 
 // 37877 - Blessing of Faith
 class spell_pal_blessing_of_faith : public SpellScriptLoader
@@ -519,7 +519,7 @@ class spell_pal_item_healing_discount : public SpellScriptLoader
         }
 };
 
-// -20473 - Holy Shock
+// 20473 - Holy Shock
 class spell_pal_holy_shock : public SpellScriptLoader
 {
     public:
diff --git a/src/server/scripts/Spells/spell_shaman.cpp b/src/server/scripts/Spells/spell_shaman.cpp
index af652192d59..3bf305d73c9 100644
--- a/src/server/scripts/Spells/spell_shaman.cpp
+++ b/src/server/scripts/Spells/spell_shaman.cpp
@@ -246,7 +246,7 @@ class spell_sha_chain_heal : public SpellScriptLoader
         }
 };
 
-// -974 - Earth Shield
+// 974 - Earth Shield
 class spell_sha_earth_shield : public SpellScriptLoader
 {
     public:
diff --git a/src/server/scripts/Spells/spell_warrior.cpp b/src/server/scripts/Spells/spell_warrior.cpp
index 12b68acc49d..bbbacfc67a2 100644
--- a/src/server/scripts/Spells/spell_warrior.cpp
+++ b/src/server/scripts/Spells/spell_warrior.cpp
@@ -212,6 +212,7 @@ class spell_warr_concussion_blow : public SpellScriptLoader
 };
 
 /// Updated 4.3.4
+// 12162 - Deep Wounds
 class spell_warr_deep_wounds : public SpellScriptLoader
 {
     public: