Core/Spells: Implemented Druid T10 4P restoration bonus

7 files changed, 208 insertions, 142 deletions

diff --git a/sql/base/world_database.sql b/sql/base/world_database.sql
index 6c1fe2b0e7a..a9c11f9f9ab 100644
--- a/sql/base/world_database.sql
+++ b/sql/base/world_database.sql
@@ -16902,6 +16902,7 @@ INSERT INTO `spell_bonus_data` (`entry`,`direct_bonus`,`dot_bonus`,`ap_bonus`,`a
 (61391, 0.193, -1, -1, -1, 'Druid - Typhoon'),
 (48438, -1, 0.11505, -1, -1, 'Druid - Wild Growth'),
 (5176, 0.5714, -1, -1, -1, 'Druid - Wrath'),
+(70691,0,0,0,0, 'Druid - Rejuvenation T10 4P proc'),
 (3044, -1, -1, 0.15, -1, 'Hunter - Arcane Shot'),
 (3674, -1, -1, -1, 0.02, 'Hunter - Black Arrow($RAP*0.1 / number of ticks)'),
 (19306, -1, -1, 0.2, -1, 'Hunter - Counterattack'),
@@ -19356,6 +19357,7 @@ INSERT INTO `spell_proc_event` (`entry`,`SchoolMask`,`SpellFamilyName`,`SpellFam
 ( 67702, 0x01,   0, 0x00000000, 0x00000000, 0x00000000, 0x00851154, 0x00000003,   0,  35,  45), -- Item - Coliseum Melee Trinket 25men
 ( 70652, 0x00,  15, 0x00000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000,   0,   0,   0), -- Item - Death Knight T10 Tank 4P Bonus
 ( 70656, 0x00,  15, 0x00000000, 0x00000000, 0x00000000, 0x00014000, 0x00000000,   0,   0,   0), -- Item - Death Knight T10 Melee 4P Bonus
+( 70664, 0x00,   7, 0x00000010, 0x00000000, 0x00000000, 0x00000000, 0x00000000,   0,   0,   0), -- Item - Druid T10 Restoration 4P Bonus (Rejuvenation)
 ( 70727, 0x00,   9, 0x00000000, 0x00000000, 0x00000000, 0x00000040, 0x00000000,   0,   0,   0), -- Item - Hunter T10 2P Bonus
 ( 70730, 0x00,   9, 0x00004000, 0x00001000, 0x00000000, 0x00040000, 0x00000000,   0,   0,   0), -- Item - Hunter T10 4P Bonus
 ( 70748, 0x00,   3, 0x00000000, 0x00200000, 0x00000000, 0x00000400, 0x00000000,   0,   0,   0), -- Item - Mage T10 4P Bonus
diff --git a/sql/scripts/world_scripts_full.sql b/sql/scripts/world_scripts_full.sql
index c6532376690..eec503383e0 100644
--- a/sql/scripts/world_scripts_full.sql
+++ b/sql/scripts/world_scripts_full.sql
@@ -2100,6 +2100,7 @@ INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
 ( 69366, 'spell_dru_moonkin_form_passive'),
 (-33851, 'spell_dru_primal_tenacity'),
 ( 62606, 'spell_dru_savage_defense'),
+( 70691, 'spell_dru_t10_restoration_4p_bonus'),
 -- example
 ( 66244, 'spell_ex_66244'), 
 ( 5581,  'spell_ex_5581'),
diff --git a/sql/updates/2011_01_31_0_spell_bonus_data.sql b/sql/updates/2011_01_31_0_spell_bonus_data.sql
new file mode 100644
index 00000000000..a908e227a1d
--- /dev/null
+++ b/sql/updates/2011_01_31_0_spell_bonus_data.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_bonus_data` WHERE `entry`=70691;
+INSERT INTO `spell_bonus_data` (`entry`,`direct_bonus`,`dot_bonus`,`ap_bonus`,`ap_dot_bonus`,`comments`) VALUES
+(70691,0,0,0,0, 'Druid - Rejuvenation T10 4P proc');
diff --git a/sql/updates/2011_01_31_0_world_spell_script_names.sql b/sql/updates/2011_01_31_0_world_spell_script_names.sql
new file mode 100644
index 00000000000..1055a1b7b38
--- /dev/null
+++ b/sql/updates/2011_01_31_0_world_spell_script_names.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_script_names` WHERE `spell_id`=70691 AND `ScriptName`='spell_dru_t10_restoration_4p_bonus';
+INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
+(70691,'spell_dru_t10_restoration_4p_bonus');
diff --git a/sql/updates/2011_01_31_1_world_spell_proc_event.sql b/sql/updates/2011_01_31_1_world_spell_proc_event.sql
new file mode 100644
index 00000000000..b920e1de508
--- /dev/null
+++ b/sql/updates/2011_01_31_1_world_spell_proc_event.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_proc_event` WHERE `entry`=70664;
+INSERT INTO `spell_proc_event` (`entry`,`SchoolMask`,`SpellFamilyName`,`SpellFamilyMask0`,`SpellFamilyMask1`,`SpellFamilyMask2`,`procFlags`,`procEx`,`ppmRate`,`CustomChance`,`Cooldown`) VALUES
+(70664,0x00,7,0x00000010,0x00000000,0x00000000,0x00000000,0x00000000,0,0,0); -- Item - Druid T10 Restoration 4P Bonus (Rejuvenation)
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 967285e0310..921bd835ad3 100755
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -4659,7 +4659,7 @@ void Unit::ProcDamageAndSpell(Unit *pVictim, uint32 procAttacker, uint32 procVic
 {
      // Not much to do if no flags are set.
     if (procAttacker)
-        ProcDamageAndSpellFor(false, pVictim,procAttacker, procExtra,attType, procSpell, amount, procAura);
+        ProcDamageAndSpellFor(false, pVictim, procAttacker, procExtra,attType, procSpell, amount, procAura);
     // Now go on with a victim's events'n'auras
     // Not much to do if no flags are set or there is no victim
     if (pVictim && pVictim->isAlive() && procVictim)
@@ -6208,6 +6208,22 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                     }
                     break;
                 }
+                // Item - Druid T10 Restoration 4P Bonus (Rejuvenation)
+                case 70664:
+                {
+                    // Proc only from normal Rejuvenation
+                    if (procSpell->SpellVisual[0] != 32)
+                        return false;
+
+                    Player* caster = ToPlayer();
+                    if (!caster)
+                        return false;
+                    if (!caster->GetGroup() && pVictim == this)
+                        return false;
+
+                    CastCustomSpell(70691, SPELLVALUE_BASE_POINT0, damage, pVictim, true);
+                    return true;
+                }
             }
             // Eclipse
             if (dummySpell->SpellIconID == 2856 && GetTypeId() == TYPEID_PLAYER)
diff --git a/src/server/scripts/Spells/spell_druid.cpp b/src/server/scripts/Spells/spell_druid.cpp
index 1ec6f9276e3..1fcc83ccd2e 100644
--- a/src/server/scripts/Spells/spell_druid.cpp
+++ b/src/server/scripts/Spells/spell_druid.cpp
@@ -33,185 +33,222 @@ enum DruidSpells
 // 54846 Glyph of Starfire
 class spell_dru_glyph_of_starfire : public SpellScriptLoader
 {
-public:
-    spell_dru_glyph_of_starfire() : SpellScriptLoader("spell_dru_glyph_of_starfire") { }
+    public:
+        spell_dru_glyph_of_starfire() : SpellScriptLoader("spell_dru_glyph_of_starfire") { }
 
-    class spell_dru_glyph_of_starfire_SpellScript : public SpellScript
-    {
-        PrepareSpellScript(spell_dru_glyph_of_starfire_SpellScript)
-        bool Validate(SpellEntry const * /*spellEntry*/)
+        class spell_dru_glyph_of_starfire_SpellScript : public SpellScript
         {
-            if (!sSpellStore.LookupEntry(DRUID_INCREASED_MOONFIRE_DURATION))
-                return false;
-            if (!sSpellStore.LookupEntry(DRUID_NATURES_SPLENDOR))
-                return false;
-            return true;
-        }
-
-        void HandleScriptEffect(SpellEffIndex /*effIndex*/)
-        {
-            Unit* caster = GetCaster();
-            if (Unit* unitTarget = GetHitUnit())
-                if (AuraEffect const * aurEff = unitTarget->GetAuraEffect(SPELL_AURA_PERIODIC_DAMAGE,SPELLFAMILY_DRUID, 0x00000002, 0, 0, caster->GetGUID()))
-                {
-                    Aura* aura = aurEff->GetBase();
-
-                    uint32 countMin = aura->GetMaxDuration();
-                    uint32 countMax = 18000;
-                    if (caster->HasAura(DRUID_INCREASED_MOONFIRE_DURATION))
-                        countMax += 3000;
-                    if (caster->HasAura(DRUID_NATURES_SPLENDOR))
-                        countMax += 3000;
-
-                    if (countMin < countMax)
+            PrepareSpellScript(spell_dru_glyph_of_starfire_SpellScript);
+
+            bool Validate(SpellEntry const * /*spellEntry*/)
+            {
+                if (!sSpellStore.LookupEntry(DRUID_INCREASED_MOONFIRE_DURATION))
+                    return false;
+                if (!sSpellStore.LookupEntry(DRUID_NATURES_SPLENDOR))
+                    return false;
+                return true;
+            }
+
+            void HandleScriptEffect(SpellEffIndex /*effIndex*/)
+            {
+                Unit* caster = GetCaster();
+                if (Unit* unitTarget = GetHitUnit())
+                    if (AuraEffect const * aurEff = unitTarget->GetAuraEffect(SPELL_AURA_PERIODIC_DAMAGE,SPELLFAMILY_DRUID, 0x00000002, 0, 0, caster->GetGUID()))
                     {
-                        aura->SetDuration(uint32(aura->GetDuration() + 3000));
-                        aura->SetMaxDuration(countMin + 3000);
+                        Aura* aura = aurEff->GetBase();
+
+                        uint32 countMin = aura->GetMaxDuration();
+                        uint32 countMax = 18000;
+                        if (caster->HasAura(DRUID_INCREASED_MOONFIRE_DURATION))
+                            countMax += 3000;
+                        if (caster->HasAura(DRUID_NATURES_SPLENDOR))
+                            countMax += 3000;
+
+                        if (countMin < countMax)
+                        {
+                            aura->SetDuration(uint32(aura->GetDuration() + 3000));
+                            aura->SetMaxDuration(countMin + 3000);
+                        }
                     }
-                }
-        }
+            }
+
+            void Register()
+            {
+                OnEffect += SpellEffectFn(spell_dru_glyph_of_starfire_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
+            }
+        };
 
-        void Register()
+        SpellScript* GetSpellScript() const
         {
-            OnEffect += SpellEffectFn(spell_dru_glyph_of_starfire_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
+            return new spell_dru_glyph_of_starfire_SpellScript();
         }
-    };
-
-    SpellScript* GetSpellScript() const
-    {
-        return new spell_dru_glyph_of_starfire_SpellScript();
-    }
 };
 
 // 69366 - Moonkin Form passive
 class spell_dru_moonkin_form_passive : public SpellScriptLoader
 {
-public:
-    spell_dru_moonkin_form_passive() : SpellScriptLoader("spell_dru_moonkin_form_passive") { }
-
-    class spell_dru_moonkin_form_passive_AuraScript : public AuraScript
-    {
-        PrepareAuraScript(spell_dru_moonkin_form_passive_AuraScript);
-
-        uint32 absorbPct;
+    public:
+        spell_dru_moonkin_form_passive() : SpellScriptLoader("spell_dru_moonkin_form_passive") { }
 
-        bool Load()
+        class spell_dru_moonkin_form_passive_AuraScript : public AuraScript
         {
-            absorbPct = SpellMgr::CalculateSpellEffectAmount(GetSpellProto(), EFFECT_0, GetCaster());
-            return true;
-        }
-
-        void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/)
+            PrepareAuraScript(spell_dru_moonkin_form_passive_AuraScript);
+
+            uint32 absorbPct;
+
+            bool Load()
+            {
+                absorbPct = SpellMgr::CalculateSpellEffectAmount(GetSpellProto(), EFFECT_0, GetCaster());
+                return true;
+            }
+
+            void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/)
+            {
+                // Set absorbtion amount to unlimited
+                amount = -1;
+            }
+
+            void Absorb(AuraEffect * /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount)
+            {
+                // reduces all damage taken while Stunned in Cat Form
+                if (GetTarget()->GetUInt32Value(UNIT_FIELD_FLAGS) & (UNIT_FLAG_STUNNED))
+                    absorbAmount = CalculatePctN(dmgInfo.GetDamage(), absorbPct);
+            }
+
+            void Register()
+            {
+                 DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dru_moonkin_form_passive_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB);
+                 OnEffectAbsorb += AuraEffectAbsorbFn(spell_dru_moonkin_form_passive_AuraScript::Absorb, EFFECT_0);
+            }
+        };
+
+        AuraScript *GetAuraScript() const
         {
-            // Set absorbtion amount to unlimited
-            amount = -1;
+            return new spell_dru_moonkin_form_passive_AuraScript();
         }
-
-        void Absorb(AuraEffect * /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount)
-        {
-            // reduces all damage taken while Stunned in Cat Form
-            if (GetTarget()->GetUInt32Value(UNIT_FIELD_FLAGS) & (UNIT_FLAG_STUNNED))
-                absorbAmount = CalculatePctN(dmgInfo.GetDamage(), absorbPct);
-        }
-
-        void Register()
-        {
-             DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dru_moonkin_form_passive_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB);
-             OnEffectAbsorb += AuraEffectAbsorbFn(spell_dru_moonkin_form_passive_AuraScript::Absorb, EFFECT_0);
-        }
-    };
-
-    AuraScript *GetAuraScript() const
-    {
-        return new spell_dru_moonkin_form_passive_AuraScript();
-    }
 };
 
 // 33851 - Primal Tenacity
 class spell_dru_primal_tenacity : public SpellScriptLoader
 {
-public:
-    spell_dru_primal_tenacity() : SpellScriptLoader("spell_dru_primal_tenacity") { }
-
-    class spell_dru_primal_tenacity_AuraScript : public AuraScript
-    {
-        PrepareAuraScript(spell_dru_primal_tenacity_AuraScript);
-
-        uint32 absorbPct;
+    public:
+        spell_dru_primal_tenacity() : SpellScriptLoader("spell_dru_primal_tenacity") { }
 
-        bool Load()
+        class spell_dru_primal_tenacity_AuraScript : public AuraScript
         {
-            absorbPct = SpellMgr::CalculateSpellEffectAmount(GetSpellProto(), EFFECT_1, GetCaster());
-            return true;
-        }
-
-        void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/)
-        {
-            // Set absorbtion amount to unlimited
-            amount = -1;
-        }
-
-        void Absorb(AuraEffect * /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount)
+            PrepareAuraScript(spell_dru_primal_tenacity_AuraScript);
+
+            uint32 absorbPct;
+
+            bool Load()
+            {
+                absorbPct = SpellMgr::CalculateSpellEffectAmount(GetSpellProto(), EFFECT_1, GetCaster());
+                return true;
+            }
+
+            void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/)
+            {
+                // Set absorbtion amount to unlimited
+                amount = -1;
+            }
+
+            void Absorb(AuraEffect * /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount)
+            {
+                // reduces all damage taken while Stunned in Cat Form
+                if ((GetTarget()->GetShapeshiftForm() == FORM_CAT) && (GetTarget()->GetUInt32Value(UNIT_FIELD_FLAGS) & (UNIT_FLAG_STUNNED)))
+                    absorbAmount = CalculatePctN(dmgInfo.GetDamage(), absorbPct);
+            }
+
+            void Register()
+            {
+                 DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dru_primal_tenacity_AuraScript::CalculateAmount, EFFECT_1, SPELL_AURA_SCHOOL_ABSORB);
+                 OnEffectAbsorb += AuraEffectAbsorbFn(spell_dru_primal_tenacity_AuraScript::Absorb, EFFECT_1);
+            }
+        };
+
+        AuraScript *GetAuraScript() const
         {
-            // reduces all damage taken while Stunned in Cat Form
-            if ((GetTarget()->GetShapeshiftForm() == FORM_CAT) && (GetTarget()->GetUInt32Value(UNIT_FIELD_FLAGS) & (UNIT_FLAG_STUNNED)))
-                absorbAmount = CalculatePctN(dmgInfo.GetDamage(), absorbPct);
+            return new spell_dru_primal_tenacity_AuraScript();
         }
-
-        void Register()
-        {
-             DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dru_primal_tenacity_AuraScript::CalculateAmount, EFFECT_1, SPELL_AURA_SCHOOL_ABSORB);
-             OnEffectAbsorb += AuraEffectAbsorbFn(spell_dru_primal_tenacity_AuraScript::Absorb, EFFECT_1);
-        }
-    };
-
-    AuraScript *GetAuraScript() const
-    {
-        return new spell_dru_primal_tenacity_AuraScript();
-    }
 };
 
 // 62606 - Savage Defense
 class spell_dru_savage_defense : public SpellScriptLoader
 {
-public:
-    spell_dru_savage_defense() : SpellScriptLoader("spell_dru_savage_defense") { }
-
-    class spell_dru_savage_defense_AuraScript : public AuraScript
-    {
-        PrepareAuraScript(spell_dru_savage_defense_AuraScript);
+    public:
+        spell_dru_savage_defense() : SpellScriptLoader("spell_dru_savage_defense") { }
 
-        uint32 absorbPct;
-
-        bool Load()
+        class spell_dru_savage_defense_AuraScript : public AuraScript
         {
-            absorbPct = SpellMgr::CalculateSpellEffectAmount(GetSpellProto(), EFFECT_0, GetCaster());
-            return true;
-        }
-
-        void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/)
+            PrepareAuraScript(spell_dru_savage_defense_AuraScript);
+
+            uint32 absorbPct;
+
+            bool Load()
+            {
+                absorbPct = SpellMgr::CalculateSpellEffectAmount(GetSpellProto(), EFFECT_0, GetCaster());
+                return true;
+            }
+
+            void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/)
+            {
+                // Set absorbtion amount to unlimited
+                amount = -1;
+            }
+
+            void Absorb(AuraEffect * aurEff, DamageInfo & /*dmgInfo*/, uint32 & absorbAmount)
+            {
+                absorbAmount = uint32(CalculatePctN(GetTarget()->GetTotalAttackPowerValue(BASE_ATTACK), absorbPct));
+                aurEff->SetAmount(0);
+            }
+
+            void Register()
+            {
+                 DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dru_savage_defense_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB);
+                 OnEffectAbsorb += AuraEffectAbsorbFn(spell_dru_savage_defense_AuraScript::Absorb, EFFECT_0);
+            }
+        };
+
+        AuraScript *GetAuraScript() const
         {
-            // Set absorbtion amount to unlimited
-            amount = -1;
+            return new spell_dru_savage_defense_AuraScript();
         }
+};
 
-        void Absorb(AuraEffect * aurEff, DamageInfo & /*dmgInfo*/, uint32 & absorbAmount)
-        {
-            absorbAmount = uint32(CalculatePctN(GetTarget()->GetTotalAttackPowerValue(BASE_ATTACK), absorbPct));
-            aurEff->SetAmount(0);
-        }
+class spell_dru_t10_restoration_4p_bonus : public SpellScriptLoader
+{
+    public:
+        spell_dru_t10_restoration_4p_bonus() : SpellScriptLoader("spell_dru_t10_restoration_4p_bonus") { }
 
-        void Register()
+        class spell_dru_t10_restoration_4p_bonus_SpellScript : public SpellScript
         {
-             DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dru_savage_defense_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB);
-             OnEffectAbsorb += AuraEffectAbsorbFn(spell_dru_savage_defense_AuraScript::Absorb, EFFECT_0);
+            PrepareSpellScript(spell_dru_t10_restoration_4p_bonus_SpellScript);
+
+            void FilterTargets(std::list<Unit*>& unitList)
+            {
+                unitList.remove(GetTargetUnit());
+                std::list<Unit*> tempTargets;
+                std::list<Unit*>::iterator end = unitList.end(), itr = unitList.begin();
+                for (; itr != end; ++itr)
+                    if (GetCaster()->IsInRaidWith(*itr))
+                        tempTargets.push_back(*itr);
+
+                itr = tempTargets.begin();
+                std::advance(itr, urand(0, tempTargets.size()-1));
+                unitList.clear();
+                unitList.push_back(*itr);
+            }
+
+            void Register()
+            {
+                OnUnitTargetSelect += SpellUnitTargetFn(spell_dru_t10_restoration_4p_bonus_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_AREA_ALLY_DST);
+            }
+        };
+
+        SpellScript* GetSpellScript() const
+        {
+            return new spell_dru_t10_restoration_4p_bonus_SpellScript();
         }
-    };
-
-    AuraScript *GetAuraScript() const
-    {
-        return new spell_dru_savage_defense_AuraScript();
-    }
 };
 
 void AddSC_druid_spell_scripts()
@@ -220,4 +257,5 @@ void AddSC_druid_spell_scripts()
     new spell_dru_moonkin_form_passive();
     new spell_dru_primal_tenacity();
     new spell_dru_savage_defense();
+    new spell_dru_t10_restoration_4p_bonus();
 }