diff --git a/sql/updates/world/custom/custom_2018_08_30_00_world.sql b/sql/updates/world/custom/custom_2018_08_30_00_world.sql new file mode 100644 index 0000000000..1b813e39f0 --- /dev/null +++ b/sql/updates/world/custom/custom_2018_08_30_00_world.sql @@ -0,0 +1,9 @@ +DELETE FROM `spell_script_names` WHERE `ScriptName` IN +('spell_dru_furor'); + +INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES +(-17056, 'spell_dru_furor'); + +DELETE FROM `spell_proc` WHERE `SpellId`= -17056; +INSERT INTO `spell_proc` (`SpellId`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `ProcFlags`, `SpellTypeMask`, `SpellPhaseMask`, `HitMask`, `AttributesMask`, `Cooldown`, `Charges`, `Chance`) VALUES +(-17056, 7, 0x40000000 | 0x80000000, 0, 0, 0x00000800, 0, 0, 0, 0, 0, 0, 100); diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index f650ef2bf4..0d5f134461 100644 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -1835,22 +1835,8 @@ void AuraEffect::HandleAuraModShapeshift(AuraApplication const* aurApp, uint8 mo if (target->getPowerType() != PowerType) target->setPowerType(PowerType); - if (form == FORM_CAT || form == FORM_BEAR) - { - // get furor proc chance - int32 FurorChance = 0; - if (AuraEffect const* dummy = target->GetDummyAuraEffect(SPELLFAMILY_DRUID, 238, 0)) - FurorChance = std::max(dummy->GetAmount(), 0); - - if (form == FORM_CAT) - { - int32 basePoints = std::min(oldPower, FurorChance); - target->SetPower(POWER_ENERGY, 0); - target->CastCustomSpell(target, 17099, &basePoints, nullptr, nullptr, true, nullptr, this); - } - else if (roll_chance_i(FurorChance)) - target->CastSpell(target, 17057, true); - } + if (form == FORM_CAT) + target->SetPower(POWER_ENERGY, 0); } // stop handling the effect if it was removed by linked event if (aurApp->GetRemoveMode()) diff --git a/src/server/scripts/Spells/spell_druid.cpp b/src/server/scripts/Spells/spell_druid.cpp index 076e351ac1..c7e0ce8323 100644 --- a/src/server/scripts/Spells/spell_druid.cpp +++ b/src/server/scripts/Spells/spell_druid.cpp @@ -57,6 +57,8 @@ enum DruidSpells SPELL_DRUID_FUNGAL_GROWTH_R2 = 78789, SPELL_DRUID_FUNGAL_GROWTH_SUMMON_R1 = 81291, SPELL_DRUID_FUNGAL_GROWTH_SUMMON_R2 = 81283, + SPELL_DRUID_FUROR_ENERGIZE_RAGE = 17057, + SPELL_DRUID_FUROR_ENERGIZE_ENERGY = 17099, SPELL_DRUID_FURY_OF_STORMRAGE = 81093, SPELL_DRUID_GLYPH_OF_INNERVATE = 54833, SPELL_DRUID_GLYPH_OF_STARFIRE = 54846, @@ -105,6 +107,7 @@ enum DruidSpellIconIds SPELL_ICON_ID_GLYPH_OF_INNERVATE = 62, SPELL_ICON_ID_EUPHORIA = 4431, SPELL_ICON_ID_SAVAGE_DEFENDER = 146, + SPELL_ICON_ID_FUROR = 238 }; enum MiscSpells @@ -1833,6 +1836,45 @@ class spell_dru_moonfire : public AuraScript } }; +class spell_dru_furor : public AuraScript +{ + PrepareAuraScript(spell_dru_furor); + + bool Validate(SpellInfo const* /*spellInfo*/) override + { + return ValidateSpellInfo( + { + SPELL_DRUID_FUROR_ENERGIZE_ENERGY, + SPELL_DRUID_FUROR_ENERGIZE_RAGE + }); + } + + bool CheckProc(ProcEventInfo& /*eventInfo*/) + { + return roll_chance_i(GetEffect(EFFECT_0)->GetAmount()); + } + + void HandleProc(AuraEffect const* aurEff, ProcEventInfo& /*eventInfo*/) + { + PreventDefaultAction(); + Unit* target = GetTarget(); + + if (target->GetShapeshiftForm() == FORM_BEAR) + target->CastSpell(target, SPELL_DRUID_FUROR_ENERGIZE_RAGE, true, nullptr, aurEff); + else if (target->GetShapeshiftForm() == FORM_CAT) + { + int32 amount = CalculatePct(100, aurEff->GetAmount()); + target->CastCustomSpell(SPELL_DRUID_FUROR_ENERGIZE_ENERGY, SPELLVALUE_BASE_POINT0, amount, target, true, nullptr, aurEff); + } + } + + void Register() override + { + DoCheckProc += AuraCheckProcFn(spell_dru_furor::CheckProc); + OnEffectProc += AuraEffectProcFn(spell_dru_furor::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + } +}; + void AddSC_druid_spell_scripts() { RegisterAuraScript(spell_dru_berserk); @@ -1844,6 +1886,7 @@ void AddSC_druid_spell_scripts() new spell_dru_effloresence_aoe(); new spell_dru_effloresence_heal(); new spell_dru_enrage(); + RegisterAuraScript(spell_dru_furor); new spell_dru_glyph_of_starfire(); new spell_dru_glyph_of_starfire_proc(); RegisterAuraScript(spell_dru_harmony);