Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 10 Packages Projects Releases Wiki Activity

Core/Spells: reworked Stampede implementation and fixed its rank 2 Cat Form bonus effect

Browse Source
This commit is contained in:
Ovahlord committed 2023-01-26 20:22:12 +01:00
1 parent 4033227c99
commit cd119a55c4
2 files changed
+80 -46
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

sql/updates/world/4.3.4/2023_01_26_00_world.sql
+11
View File
@@ -0,0 +1,11 @@
DELETE FROM `spell_proc` WHERE `SpellId`= -78892;
DELETE FROM `spell_script_names` WHERE `ScriptName` IN ('spell_dru_stampede', 'spell_dru_feral_charge', 'spell_dru_stampede_triggered');
INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
(16979, 'spell_dru_feral_charge'),
(49376, 'spell_dru_feral_charge'),
(-81021, 'spell_dru_stampede_triggered');
DELETE FROM `spell_ranks` WHERE `first_spell_id`= 81021;
INSERT INTO `spell_ranks` (`first_spell_id`, `spell_id`, `rank`) VALUES
(81021, 81021, 1),
(81021, 81022, 2);
src/server/scripts/Spells/spell_druid.cpp
+69 -46
View File
@@ -102,10 +102,10 @@ enum DruidSpells
SPELL_DRUID_SKULL_BASH_INTERRUPT = 93985,
SPELL_DRUID_SKULL_BASH_COST_INCREASE_R1 = 82364,
SPELL_DRUID_SKULL_BASH_COST_INCREASE_R2 = 82365,
SPELL_DRUID_STAMPEDE_BAER_RANK_1 = 81016,
SPELL_DRUID_STAMPEDE_CAT_RANK_1 = 81021,
SPELL_DRUID_STAMPEDE_CAT_STATE = 109881,
SPELL_DRUID_SOLAR_BEAM_SILENCE = 81261,
SPELL_DRUID_STAMPEDE_RAVAGE_MARKER = 109881,
SPELL_DRUID_STAMPEDE_TRIGGERED_BEAR = 81016,
SPELL_DRUID_STAMPEDE_TRIGGERED_CAT = 81021,
SPELL_DRUID_STRENGTH_OF_THE_PANTHER = 90166,
SPELL_DRUID_SUNFIRE = 93402,
SPELL_DRUID_REGROWTH_REFRESH = 93036,
@@ -134,7 +134,8 @@ enum DruidSpellIconIds
SPELL_ICON_ID_SUNFIRE = 3262,
SPELL_ICON_ID_GLYPH_OF_FEROCIOUS_BITE = 1680,
SPELL_ICON_ID_GLYPH_OF_FRENZIED_REGENERATION = 50,
SPELL_ICON_ID_GIFT_OF_THE_EARTHMOTHER = 3186
SPELL_ICON_ID_GIFT_OF_THE_EARTHMOTHER = 3186,
SPELL_ICON_ID_STAMPEDE = 3930
};
enum MiscSpells
@@ -868,47 +869,6 @@ class spell_dru_starfall_dummy : public SpellScript
}
};
// -78892 - Stampede
class spell_dru_stampede : public AuraScript
{
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
{
SPELL_DRUID_STAMPEDE_BAER_RANK_1,
SPELL_DRUID_STAMPEDE_CAT_RANK_1,
SPELL_DRUID_STAMPEDE_CAT_STATE,
SPELL_DRUID_FERAL_CHARGE_CAT,
SPELL_DRUID_FERAL_CHARGE_BEAR
});
}
void HandleEffectCatProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo)
{
PreventDefaultAction();
if (GetTarget()->GetShapeshiftForm() != FORM_CAT || eventInfo.GetSpellInfo()->Id != SPELL_DRUID_FERAL_CHARGE_CAT)
return;
GetTarget()->CastSpell(GetTarget(), sSpellMgr->GetSpellWithRank(SPELL_DRUID_STAMPEDE_CAT_RANK_1, GetSpellInfo()->GetRank()), aurEff);
GetTarget()->CastSpell(GetTarget(), SPELL_DRUID_STAMPEDE_CAT_STATE, aurEff);
}
void HandleEffectBearProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo)
{
PreventDefaultAction();
if (GetTarget()->GetShapeshiftForm() != FORM_BEAR || eventInfo.GetSpellInfo()->Id != SPELL_DRUID_FERAL_CHARGE_BEAR)
return;
GetTarget()->CastSpell(GetTarget(), sSpellMgr->GetSpellWithRank(SPELL_DRUID_STAMPEDE_BAER_RANK_1, GetSpellInfo()->GetRank()), aurEff);
}
void Register() override
{
OnEffectProc.Register(&spell_dru_stampede::HandleEffectCatProc, EFFECT_0, SPELL_AURA_DUMMY);
OnEffectProc.Register(&spell_dru_stampede::HandleEffectBearProc, EFFECT_1, SPELL_AURA_DUMMY);
}
};
// 61336 - Survival Instincts
class spell_dru_survival_instincts : public SpellScript
{
@@ -2168,6 +2128,68 @@ class spell_dru_regrowth_refresh : public SpellScript
}
};
// 16979 - Feral Charge (Bear Form)
// 49376 - Feral Charge (Cat Form)
class spell_dru_feral_charge : public SpellScript
{
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
{
SPELL_DRUID_FERAL_CHARGE_BEAR,
SPELL_DRUID_FERAL_CHARGE_CAT,
SPELL_DRUID_STAMPEDE_TRIGGERED_BEAR,
SPELL_DRUID_STAMPEDE_TRIGGERED_CAT
});
}
void HandleBearFormEffect(SpellEffIndex /*effIndex*/)
{
if (AuraEffect const* stampedeEffect = GetCaster()->GetDummyAuraEffect(SPELLFAMILY_DRUID, SPELL_ICON_ID_STAMPEDE, EFFECT_0))
GetCaster()->CastSpell(nullptr, sSpellMgr->GetSpellWithRank(SPELL_DRUID_STAMPEDE_TRIGGERED_BEAR, stampedeEffect->GetSpellInfo()->GetRank()));
}
void HandleCatFormEffect(SpellEffIndex /*effIndex*/)
{
if (AuraEffect const* stampedeEffect = GetCaster()->GetDummyAuraEffect(SPELLFAMILY_DRUID, SPELL_ICON_ID_STAMPEDE, EFFECT_0))
GetCaster()->CastSpell(nullptr, sSpellMgr->GetSpellWithRank(SPELL_DRUID_STAMPEDE_TRIGGERED_CAT, stampedeEffect->GetSpellInfo()->GetRank()));
}
void Register() override
{
if (m_scriptSpellId == SPELL_DRUID_FERAL_CHARGE_BEAR)
OnEffectLaunchTarget.Register(&spell_dru_feral_charge::HandleBearFormEffect, EFFECT_0, SPELL_EFFECT_CHARGE);
else if (m_scriptSpellId == SPELL_DRUID_FERAL_CHARGE_CAT)
OnEffectLaunchTarget.Register(&spell_dru_feral_charge::HandleCatFormEffect, EFFECT_0, SPELL_EFFECT_TRIGGER_SPELL);
}
};
// -81021 - Stampede
class spell_dru_stampede_triggered : public AuraScript
{
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_DRUID_STAMPEDE_RAVAGE_MARKER });
}
void AfterApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
GetTarget()->CastSpell(nullptr, SPELL_DRUID_STAMPEDE_RAVAGE_MARKER);
}
void AfterRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
GetTarget()->RemoveAurasDueToSpell(SPELL_DRUID_STAMPEDE_RAVAGE_MARKER, GetTarget()->GetGUID());
}
void Register() override
{
// Going with SPELL_AURA_ANY because both ranks have different aura effects for some reason
AfterEffectApply.Register(&spell_dru_stampede_triggered::AfterApply, EFFECT_0, SPELL_AURA_ANY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK);
AfterEffectRemove.Register(&spell_dru_stampede_triggered::AfterRemove, EFFECT_0, SPELL_AURA_ANY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK);
}
};
void AddSC_druid_spell_scripts()
{
RegisterSpellScript(spell_dru_astral_alignment);
@@ -2184,6 +2206,7 @@ void AddSC_druid_spell_scripts()
RegisterSpellScript(spell_dru_empowered_touch_script);
RegisterSpellScript(spell_dru_enrage);
RegisterSpellScript(spell_dru_entangling_roots);
RegisterSpellScript(spell_dru_feral_charge);
RegisterSpellScript(spell_dru_ferocious_bite);
RegisterSpellScript(spell_dru_firebloom);
RegisterSpellScript(spell_dru_frenzied_regeneration);
@@ -2211,8 +2234,8 @@ void AddSC_druid_spell_scripts()
RegisterSpellAndAuraScriptPair(spell_dru_savage_roar, spell_dru_savage_roar_AuraScript);
RegisterSpellScript(spell_dru_shooting_stars);
RegisterSpellScript(spell_dru_skull_bash);
RegisterSpellScript(spell_dru_stampede_triggered);
RegisterSpellScript(spell_dru_starfall_dummy);
RegisterSpellScript(spell_dru_stampede);
RegisterSpellScript(spell_dru_solar_beam);
RegisterSpellAndAuraScriptPair(spell_dru_survival_instincts, spell_dru_survival_instincts_AuraScript);
RegisterSpellScript(spell_dru_swift_flight_passive);