Core/Spells: Fix some db startup error and add new

9 files changed, 103 insertions, 87 deletions

diff --git a/sql/updates/world/2013_07_22_08_worldl_spell_script_names_434.sql b/sql/updates/world/2013_07_22_08_world_spell_script_names_434.sql
index 20583473b26..20583473b26 100644
--- a/sql/updates/world/2013_07_22_08_worldl_spell_script_names_434.sql
+++ b/sql/updates/world/2013_07_22_08_world_spell_script_names_434.sql
diff --git a/sql/updates/world/2013_07_23_06_world_spell_script_names_434.sql b/sql/updates/world/2013_07_23_06_world_spell_script_names_434.sql
index 6fc936c1a71..355037c8dc0 100644
--- a/sql/updates/world/2013_07_23_06_world_spell_script_names_434.sql
+++ b/sql/updates/world/2013_07_23_06_world_spell_script_names_434.sql
@@ -1,4 +1,4 @@
-DELETE FROM `spell_script_names` WHERE `spell_id`IN (82925,82926);
+DELETE FROM `spell_script_names` WHERE `spell_id`IN (687,28176);
 INSERT INTO `spell_script_names`(`spell_id`, `ScriptName`) VALUES
 (687,'spell_warl_nether_ward_overrride'),
 (28176,'spell_warl_nether_ward_overrride');
diff --git a/sql/updates/world/2013_07_25_04_world_spell_script_names_434.sql b/sql/updates/world/2013_07_25_04_world_spell_script_names_434.sql
new file mode 100644
index 00000000000..0ede39cd552
--- /dev/null
+++ b/sql/updates/world/2013_07_25_04_world_spell_script_names_434.sql
@@ -0,0 +1,90 @@
+DELETE FROM `spell_script_names` WHERE `ScriptName` IN (
+'spell_dk_icebound_fortitude',
+'spell_dk_rune_tap_party',
+'spell_dk_vampiric_blood',
+'spell_dru_dash',
+'spell_dru_idol_lifebloom',
+'spell_dru_innervate',
+'spell_dru_owlkin_frenzy',
+'spell_dru_rip',
+'spell_dru_typhoon',
+'spell_gen_create_lance',
+'spell_gen_gift_of_naaru',
+'spell_gen_netherbloom',
+'spell_mage_fire_frost_ward',
+'spell_mage_ring_of_frost',
+'spell_mage_ring_of_frost_freeze',
+'spell_pal_hand_of_salvation',
+'spell_pri_lightwell_renew',
+'spell_pri_reflective_shield_trigger',
+'spell_rog_rupture',
+'spell_sha_mana_tide_totem',
+'spell_sha_thunderstorm',
+'spell_sha_tidal_waves',
+'spell_warl_ritual_of_doom_effect',
+'spell_warl_shadow_ward',
+'spell_warr_improved_spell_reflection',
+'spell_warr_intimidating_shout',
+'spell_warr_overpower',
+'spell_warr_rend',
+'spell_warr_shattering_throw',
+'spell_warr_vigilance',
+'spell_warr_vigilance_trigger',
+'spell_item_arcane_shroud',
+'spell_item_goblin_jumper_cables',
+'spell_item_goblin_jumper_cables_xl',
+'spell_item_gnomish_army_knife',
+'spell_item_piccolo_of_the_flaming_fire',
+'spell_item_scroll_of_recall',
+'spell_item_the_eye_of_diminution',
+'spell_winter_veil_px_238_winter_wondervolt');
+
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(61391, 'spell_dru_typhoon'),
+(51490, 'spell_sha_thunderstorm'),
+(-7235, 'spell_warl_shadow_ward'),
+(7001, 'spell_pri_lightwell_renew'),
+(1943, 'spell_rog_rupture'),
+(1850, 'spell_dru_dash'),
+(1079, 'spell_dru_rip'),
+(772, 'spell_warr_rend'),
+(543, 'spell_mage_fire_frost_ward'),
+(1038, 'spell_pal_hand_of_salvation'),
+(5246, 'spell_warr_intimidating_shout'),
+(7384, 'spell_warr_overpower'),
+(8342, 'spell_item_goblin_jumper_cables'),
+(17512, 'spell_item_piccolo_of_the_flaming_fire'),
+(18541, 'spell_warl_ritual_of_doom_effect'),
+(22999, 'spell_item_goblin_jumper_cables_xl'),
+(26275, 'spell_winter_veil_px_238_winter_wondervolt'),
+(26400, 'spell_item_arcane_shroud'),
+(28702, 'spell_gen_netherbloom'),
+(28862, 'spell_item_the_eye_of_diminution'),
+(28880, 'spell_gen_gift_of_naaru'),
+(29166, 'spell_dru_innervate'),
+(34246, 'spell_dru_idol_lifebloom'),
+(39610, 'spell_sha_mana_tide_totem'),
+(48129, 'spell_item_scroll_of_recall'),
+(48391, 'spell_dru_owlkin_frenzy'),
+(48792, 'spell_dk_icebound_fortitude'),
+(50720, 'spell_warr_vigilance'),
+(50725, 'spell_warr_vigilance_trigger'),
+(54732, 'spell_item_gnomish_army_knife'),
+(55233, 'spell_dk_vampiric_blood'),
+(59542, 'spell_gen_gift_of_naaru'),
+(59543, 'spell_gen_gift_of_naaru'),
+(59544, 'spell_gen_gift_of_naaru'),
+(59545, 'spell_gen_gift_of_naaru'),
+(59547, 'spell_gen_gift_of_naaru'),
+(59548, 'spell_gen_gift_of_naaru'),
+(59725, 'spell_warr_improved_spell_reflection'),
+(59754, 'spell_dk_rune_tap_party'),
+(60320, 'spell_item_scroll_of_recall'),
+(60321, 'spell_item_scroll_of_recall'),
+(60779, 'spell_dru_idol_lifebloom'),
+(63845, 'spell_gen_create_lance'),
+(64380, 'spell_warr_shattering_throw'),
+(65941, 'spell_warr_shattering_throw'),
+(82676, 'spell_mage_ring_of_frost'),
+(82691, 'spell_mage_ring_of_frost_freeze'),
+(51562,'spell_sha_tidal_waves');
diff --git a/src/server/scripts/Spells/spell_druid.cpp b/src/server/scripts/Spells/spell_druid.cpp
index e977fcfba97..53662950bd7 100644
--- a/src/server/scripts/Spells/spell_druid.cpp
+++ b/src/server/scripts/Spells/spell_druid.cpp
@@ -166,7 +166,7 @@ class spell_dru_eclipse_energize : public SpellScriptLoader
         }
 };
 
-// -1850 - Dash
+// 1850 - Dash
 class spell_dru_dash : public SpellScriptLoader
 {
     public:
@@ -739,7 +739,7 @@ class spell_dru_primal_tenacity : public SpellScriptLoader
         }
 };
 
-// -1079 - Rip
+// 1079 - Rip
 class spell_dru_rip : public SpellScriptLoader
 {
     public:
@@ -1096,7 +1096,7 @@ class spell_dru_tiger_s_fury : public SpellScriptLoader
         }
 };
 
-// -61391 - Typhoon
+// 61391 - Typhoon
 class spell_dru_typhoon : public SpellScriptLoader
 {
     public:
diff --git a/src/server/scripts/Spells/spell_mage.cpp b/src/server/scripts/Spells/spell_mage.cpp
index d0d3dd7a512..8e8af13a05e 100644
--- a/src/server/scripts/Spells/spell_mage.cpp
+++ b/src/server/scripts/Spells/spell_mage.cpp
@@ -454,8 +454,7 @@ class spell_mage_conjure_refreshment : public SpellScriptLoader
         }
 };
 
-// -543  - Fire Ward
-// -6143 - Frost Ward
+// 543  - Fire War
 class spell_mage_fire_frost_ward : public SpellScriptLoader
 {
     public:
diff --git a/src/server/scripts/Spells/spell_priest.cpp b/src/server/scripts/Spells/spell_priest.cpp
index 2d3b214a389..67439cf7e51 100644
--- a/src/server/scripts/Spells/spell_priest.cpp
+++ b/src/server/scripts/Spells/spell_priest.cpp
@@ -60,14 +60,14 @@ enum PriestSpells
     SPELL_PRIEST_TWIN_DISCIPLINES_RANK_1            = 47586,
     SPELL_PRIEST_T9_HEALING_2P                      = 67201,
     SPELL_PRIEST_VAMPIRIC_EMBRACE_HEAL              = 15290,
-    SPELL_PRIEST_VAMPIRIC_TOUCH_DISPEL              = 64085,
+    SPELL_PRIEST_VAMPIRIC_TOUCH_DISPEL              = 64085
 };
 
 enum PriestSpellIcons
 {
     PRIEST_ICON_ID_BORROWED_TIME                    = 2899,
     PRIEST_ICON_ID_DIVINE_TOUCH_TALENT              = 3021,
-    PRIEST_ICON_ID_PAIN_AND_SUFFERING               = 2874,
+    PRIEST_ICON_ID_PAIN_AND_SUFFERING               = 2874
 };
 
 enum MiscSpells
@@ -440,7 +440,7 @@ class spell_pri_leap_of_faith_effect_trigger : public SpellScriptLoader
         }
 };
 
-// -7001 - Lightwell Renew
+// 7001 - Lightwell Renew
 class spell_pri_lightwell_renew : public SpellScriptLoader
 {
     public:
@@ -756,7 +756,7 @@ class spell_pri_power_word_shield : public SpellScriptLoader
                     amount += int32(bonus);
 
                     // Twin Disciplines
-                    if (AuraEffect* twinDisciplines = caster->GetAuraEffectOfRankedSpell(SPELL_PRIEST_TWIN_DISCIPLINES_RANK_1, EFFECT_1))
+                    if (AuraEffect const* twinDisciplines = caster->GetAuraEffectOfRankedSpell(SPELL_PRIEST_TWIN_DISCIPLINES_RANK_1, EFFECT_1))
                         AddPct(amount, twinDisciplines->GetAmount());
 
                     // Focused Power
@@ -770,7 +770,7 @@ class spell_pri_power_word_shield : public SpellScriptLoader
                 if (dmgInfo.GetAttacker() == target)
                     return;
 
-                if (AuraEffect* talentAurEff = target->GetAuraEffectOfRankedSpell(SPELL_PRIEST_REFLECTIVE_SHIELD_R1, EFFECT_0))
+                if (AuraEffect const* talentAurEff = target->GetAuraEffectOfRankedSpell(SPELL_PRIEST_REFLECTIVE_SHIELD_R1, EFFECT_0))
                 {
                     int32 bp = CalculatePct(absorbAmount, talentAurEff->GetAmount());
                     target->CastCustomSpell(dmgInfo.GetAttacker(), SPELL_PRIEST_REFLECTIVE_SHIELD_TRIGGERED, &bp, NULL, NULL, true, NULL, aurEff);
@@ -825,49 +825,6 @@ class spell_pri_prayer_of_mending_heal : public SpellScriptLoader
         }
 };
 
-// 17 - Reflective Shield
-class spell_pri_reflective_shield_trigger : public SpellScriptLoader
-{
-    public:
-        spell_pri_reflective_shield_trigger() : SpellScriptLoader("spell_pri_reflective_shield_trigger") { }
-
-        class spell_pri_reflective_shield_trigger_AuraScript : public AuraScript
-        {
-            PrepareAuraScript(spell_pri_reflective_shield_trigger_AuraScript);
-
-            bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE
-            {
-                if (!sSpellMgr->GetSpellInfo(SPELL_PRIEST_REFLECTIVE_SHIELD_TRIGGERED) || !sSpellMgr->GetSpellInfo(SPELL_PRIEST_REFLECTIVE_SHIELD_R1))
-                    return false;
-                return true;
-            }
-
-            void Trigger(AuraEffect* aurEff, DamageInfo & dmgInfo, uint32 & absorbAmount)
-            {
-                Unit* target = GetTarget();
-                if (dmgInfo.GetAttacker() == target)
-                    return;
-
-                if (GetCaster())
-                    if (AuraEffect* talentAurEff = target->GetAuraEffectOfRankedSpell(SPELL_PRIEST_REFLECTIVE_SHIELD_R1, EFFECT_0))
-                    {
-                        int32 bp = CalculatePct(absorbAmount, talentAurEff->GetAmount());
-                        target->CastCustomSpell(dmgInfo.GetAttacker(), SPELL_PRIEST_REFLECTIVE_SHIELD_TRIGGERED, &bp, NULL, NULL, true, NULL, aurEff);
-                    }
-            }
-
-            void Register() OVERRIDE
-            {
-                 AfterEffectAbsorb += AuraEffectAbsorbFn(spell_pri_reflective_shield_trigger_AuraScript::Trigger, EFFECT_0);
-            }
-        };
-
-        AuraScript* GetAuraScript() const OVERRIDE
-        {
-            return new spell_pri_reflective_shield_trigger_AuraScript();
-        }
-};
-
 // 139 - Renew
 class spell_pri_renew : public SpellScriptLoader
 {
@@ -1136,7 +1093,6 @@ void AddSC_priest_spell_scripts()
     new spell_pri_phantasm();
     new spell_pri_power_word_shield();
     new spell_pri_prayer_of_mending_heal();
-    new spell_pri_reflective_shield_trigger();
     new spell_pri_renew();
     new spell_pri_shadow_word_death();
     new spell_pri_shadowform();
diff --git a/src/server/scripts/Spells/spell_rogue.cpp b/src/server/scripts/Spells/spell_rogue.cpp
index de95c70b83b..fd29ab8b1e3 100644
--- a/src/server/scripts/Spells/spell_rogue.cpp
+++ b/src/server/scripts/Spells/spell_rogue.cpp
@@ -496,7 +496,7 @@ class spell_rog_recuperate : public SpellScriptLoader
         }
 };
 
-// -1943 - Rupture
+// 1943 - Rupture
 class spell_rog_rupture : public SpellScriptLoader
 {
     public:
diff --git a/src/server/scripts/Spells/spell_warlock.cpp b/src/server/scripts/Spells/spell_warlock.cpp
index c459ce07630..354db0ae864 100644
--- a/src/server/scripts/Spells/spell_warlock.cpp
+++ b/src/server/scripts/Spells/spell_warlock.cpp
@@ -968,34 +968,6 @@ class spell_warl_nether_ward_overrride : public SpellScriptLoader
         }
 };
 
-// 18541 - Ritual of Doom Effect
-class spell_warl_ritual_of_doom_effect : public SpellScriptLoader
-{
-    public:
-        spell_warl_ritual_of_doom_effect() : SpellScriptLoader("spell_warl_ritual_of_doom_effect") { }
-
-        class spell_warl_ritual_of_doom_effect_SpellScript : public SpellScript
-        {
-            PrepareSpellScript(spell_warl_ritual_of_doom_effect_SpellScript);
-
-            void HandleDummy(SpellEffIndex /*effIndex*/)
-            {
-                Unit* caster = GetCaster();
-                caster->CastSpell(caster, GetEffectValue(), true);
-            }
-
-            void Register() OVERRIDE
-            {
-                OnEffectHit += SpellEffectFn(spell_warl_ritual_of_doom_effect_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
-            }
-        };
-
-        SpellScript* GetSpellScript() const OVERRIDE
-        {
-            return new spell_warl_ritual_of_doom_effect_SpellScript();
-        }
-};
-
 // 6358 - Seduction (Special Ability)
 class spell_warl_seduction : public SpellScriptLoader
 {
@@ -1479,7 +1451,6 @@ void AddSC_warlock_spell_scripts()
     new spell_warl_improved_soul_fire();
     new spell_warl_life_tap();
     new spell_warl_nether_ward_overrride();
-    new spell_warl_ritual_of_doom_effect();
     new spell_warl_seduction();
     new spell_warl_seed_of_corruption();
     new spell_warl_shadow_trance_proc();
diff --git a/src/server/scripts/Spells/spell_warrior.cpp b/src/server/scripts/Spells/spell_warrior.cpp
index edc43772d41..12b68acc49d 100644
--- a/src/server/scripts/Spells/spell_warrior.cpp
+++ b/src/server/scripts/Spells/spell_warrior.cpp
@@ -459,7 +459,7 @@ class spell_warr_last_stand : public SpellScriptLoader
         }
 };
 
-// 7384, 7887, 11584, 11585 - Overpower
+// 7384 - Overpower
 class spell_warr_overpower : public SpellScriptLoader
 {
     public:
@@ -538,7 +538,7 @@ class spell_warr_rallying_cry : public SpellScriptLoader
         }
 };
 
-// -772 - Rend
+// 772 - Rend
 class spell_warr_rend : public SpellScriptLoader
 {
     public: