diff options
| -rw-r--r-- | sql/updates/world/2016_01_03_00_world.sql | 4 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_druid.cpp | 87 |
2 files changed, 5 insertions, 86 deletions
diff --git a/sql/updates/world/2016_01_03_00_world.sql b/sql/updates/world/2016_01_03_00_world.sql new file mode 100644 index 00000000000..3a3cfc7f96b --- /dev/null +++ b/sql/updates/world/2016_01_03_00_world.sql @@ -0,0 +1,4 @@ +DELETE FROM `spell_script_names` WHERE `ScriptName` IN ( +'spell_dru_enrage', +'spell_dru_tiger_s_fury' +); diff --git a/src/server/scripts/Spells/spell_druid.cpp b/src/server/scripts/Spells/spell_druid.cpp index d344305aa2d..f49f0d6cba6 100644 --- a/src/server/scripts/Spells/spell_druid.cpp +++ b/src/server/scripts/Spells/spell_druid.cpp @@ -39,8 +39,6 @@ enum DruidSpells SPELL_DRUID_SOLAR_ECLIPSE_MARKER = 67483, // Will make the yellow arrow on eclipse bar point to the yellow side (solar) SPELL_DRUID_SOLAR_ECLIPSE = 48517, SPELL_DRUID_LUNAR_ECLIPSE = 48518, - SPELL_DRUID_ENRAGE_MOD_DAMAGE = 51185, - SPELL_DRUID_ENRAGED_DEFENSE = 70725, SPELL_DRUID_FERAL_CHARGE_BEAR = 16979, SPELL_DRUID_FERAL_CHARGE_CAT = 49376, SPELL_DRUID_GLYPH_OF_INNERVATE = 54833, @@ -50,8 +48,6 @@ enum DruidSpells SPELL_DRUID_IDOL_OF_WORSHIP = 60774, SPELL_DRUID_INCREASED_MOONFIRE_DURATION = 38414, SPELL_DRUID_ITEM_T8_BALANCE_RELIC = 64950, - SPELL_DRUID_ITEM_T10_FERAL_4P_BONUS = 70726, - SPELL_DRUID_KING_OF_THE_JUNGLE = 48492, SPELL_DRUID_LIFEBLOOM_ENERGIZE = 64372, SPELL_DRUID_LIFEBLOOM_FINAL_HEAL = 33778, SPELL_DRUID_LIVING_SEED_HEAL = 48503, @@ -62,8 +58,7 @@ enum DruidSpells SPELL_DRUID_SAVAGE_ROAR = 62071, SPELL_DRUID_STAMPEDE_BAER_RANK_1 = 81016, SPELL_DRUID_STAMPEDE_CAT_RANK_1 = 81021, - SPELL_DRUID_STAMPEDE_CAT_STATE = 109881, - SPELL_DRUID_TIGER_S_FURY_ENERGIZE = 51178 + SPELL_DRUID_STAMPEDE_CAT_STATE = 109881 }; // 1850 - Dash @@ -247,56 +242,6 @@ class spell_dru_eclipse_energize : public SpellScriptLoader } }; -// 5229 - Enrage -class spell_dru_enrage : public SpellScriptLoader -{ - public: - spell_dru_enrage() : SpellScriptLoader("spell_dru_enrage") { } - - class spell_dru_enrage_AuraScript : public AuraScript - { - PrepareAuraScript(spell_dru_enrage_AuraScript); - - bool Validate(SpellInfo const* /*spellInfo*/) override - { - if (!sSpellMgr->GetSpellInfo(SPELL_DRUID_KING_OF_THE_JUNGLE) - || !sSpellMgr->GetSpellInfo(SPELL_DRUID_ENRAGE_MOD_DAMAGE) - || !sSpellMgr->GetSpellInfo(SPELL_DRUID_ENRAGED_DEFENSE) - || !sSpellMgr->GetSpellInfo(SPELL_DRUID_ITEM_T10_FERAL_4P_BONUS)) - return false; - return true; - } - - void HandleApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) - { - Unit* target = GetTarget(); - if (AuraEffect const* aurEff = target->GetAuraEffectOfRankedSpell(SPELL_DRUID_KING_OF_THE_JUNGLE, EFFECT_0)) - target->CastCustomSpell(SPELL_DRUID_ENRAGE_MOD_DAMAGE, SPELLVALUE_BASE_POINT0, aurEff->GetAmount(), target, true); - - // Item - Druid T10 Feral 4P Bonus - if (target->HasAura(SPELL_DRUID_ITEM_T10_FERAL_4P_BONUS)) - target->CastSpell(target, SPELL_DRUID_ENRAGED_DEFENSE, true); - } - - void HandleRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) - { - GetTarget()->RemoveAurasDueToSpell(SPELL_DRUID_ENRAGE_MOD_DAMAGE); - GetTarget()->RemoveAurasDueToSpell(SPELL_DRUID_ENRAGED_DEFENSE); - } - - void Register() override - { - AfterEffectApply += AuraEffectApplyFn(spell_dru_enrage_AuraScript::HandleApply, EFFECT_0, SPELL_AURA_PERIODIC_ENERGIZE, AURA_EFFECT_HANDLE_REAL); - AfterEffectRemove += AuraEffectRemoveFn(spell_dru_enrage_AuraScript::HandleRemove, EFFECT_0, SPELL_AURA_PERIODIC_ENERGIZE, AURA_EFFECT_HANDLE_REAL); - } - }; - - AuraScript* GetAuraScript() const override - { - return new spell_dru_enrage_AuraScript(); - } -}; - // 54832 - Glyph of Innervate class spell_dru_glyph_of_innervate : public SpellScriptLoader { @@ -1073,34 +1018,6 @@ class spell_dru_swift_flight_passive : public SpellScriptLoader } }; -// 5217 - Tiger's Fury -class spell_dru_tiger_s_fury : public SpellScriptLoader -{ - public: - spell_dru_tiger_s_fury() : SpellScriptLoader("spell_dru_tiger_s_fury") { } - - class spell_dru_tiger_s_fury_SpellScript : public SpellScript - { - PrepareSpellScript(spell_dru_tiger_s_fury_SpellScript); - - void OnHit() - { - if (AuraEffect const* aurEff = GetHitUnit()->GetAuraEffectOfRankedSpell(SPELL_DRUID_KING_OF_THE_JUNGLE, EFFECT_1)) - GetHitUnit()->CastCustomSpell(SPELL_DRUID_TIGER_S_FURY_ENERGIZE, SPELLVALUE_BASE_POINT0, aurEff->GetAmount(), GetHitUnit(), true); - } - - void Register() override - { - AfterHit += SpellHitFn(spell_dru_tiger_s_fury_SpellScript::OnHit); - } - }; - - SpellScript* GetSpellScript() const override - { - return new spell_dru_tiger_s_fury_SpellScript(); - } -}; - // 61391 - Typhoon class spell_dru_typhoon : public SpellScriptLoader { @@ -1261,7 +1178,6 @@ void AddSC_druid_spell_scripts() new spell_dru_eclipse("spell_dru_eclipse_lunar"); new spell_dru_eclipse("spell_dru_eclipse_solar"); new spell_dru_eclipse_energize(); - new spell_dru_enrage(); new spell_dru_glyph_of_innervate(); new spell_dru_glyph_of_starfire(); new spell_dru_glyph_of_starfire_proc(); @@ -1279,7 +1195,6 @@ void AddSC_druid_spell_scripts() new spell_dru_stampede(); new spell_dru_survival_instincts(); new spell_dru_swift_flight_passive(); - new spell_dru_tiger_s_fury(); new spell_dru_typhoon(); new spell_dru_t10_restoration_4p_bonus(); new spell_dru_wild_growth(); |