aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAqua Deus <95978183+aquadeus@users.noreply.github.com>2022-02-26 23:12:28 +0100
committerGitHub <noreply@github.com>2022-02-26 23:12:28 +0100
commit8fe7748f30122e13f6d1b83db69a39cd1c1f2448 (patch)
treefa37dd2c811f509b9c89ffe643f52149ad7f52c9
parentf9753cb3dc89d2cf689879e95e4473ee9da1bc59 (diff)
Scripts/Spells: Delete obsolete druid spell scripts (#27813)
-rw-r--r--sql/updates/world/master/2022_02_26_01_world_druid_obsolete_spells.sql1
-rw-r--r--src/server/scripts/Spells/spell_druid.cpp175
2 files changed, 2 insertions, 174 deletions
diff --git a/sql/updates/world/master/2022_02_26_01_world_druid_obsolete_spells.sql b/sql/updates/world/master/2022_02_26_01_world_druid_obsolete_spells.sql
new file mode 100644
index 00000000000..790d6cff4b7
--- /dev/null
+++ b/sql/updates/world/master/2022_02_26_01_world_druid_obsolete_spells.sql
@@ -0,0 +1 @@
+DELETE FROM `spell_script_names` WHERE `ScriptName` IN ('spell_dru_stampede', 'spell_dru_living_seed', 'spell_dru_flight_form', 'spell_dru_predatory_strikes', 'spell_dru_mark_of_the_wild', 'spell_dru_idol_lifebloom', 'spell_dru_living_seed_proc');
diff --git a/src/server/scripts/Spells/spell_druid.cpp b/src/server/scripts/Spells/spell_druid.cpp
index 23905a2bfe2..afb2ea380c7 100644
--- a/src/server/scripts/Spells/spell_druid.cpp
+++ b/src/server/scripts/Spells/spell_druid.cpp
@@ -54,8 +54,6 @@ enum DruidSpells
SPELL_DRUID_ECLIPSE_SOLAR_AURA = 48517,
SPELL_DRUID_ECLIPSE_SOLAR_SPELL_CNT = 326053,
SPELL_DRUID_EXHILARATE = 28742,
- SPELL_DRUID_FERAL_CHARGE_BEAR = 16979,
- SPELL_DRUID_FERAL_CHARGE_CAT = 49376,
SPELL_DRUID_FORM_AQUATIC_PASSIVE = 276012,
SPELL_DRUID_FORM_AQUATIC = 1066,
SPELL_DRUID_FORM_FLIGHT = 33943,
@@ -76,8 +74,6 @@ enum DruidSpells
SPELL_DRUID_LANGUISH = 71023,
SPELL_DRUID_LIFEBLOOM_ENERGIZE = 64372,
SPELL_DRUID_LIFEBLOOM_FINAL_HEAL = 33778,
- SPELL_DRUID_LIVING_SEED_HEAL = 48503,
- SPELL_DRUID_LIVING_SEED_PROC = 48504,
SPELL_DRUID_MANGLE = 33917,
SPELL_DRUID_MOONFIRE_DAMAGE = 164812,
SPELL_DRUID_PROWL = 5215,
@@ -86,15 +82,12 @@ enum DruidSpells
SPELL_DRUID_SAVAGE_ROAR = 62071,
SPELL_DRUID_SKULL_BASH_CHARGE = 221514,
SPELL_DRUID_SKULL_BASH_INTERRUPT = 93985,
- SPELL_DRUID_STAMPEDE_BAER_RANK_1 = 81016,
- SPELL_DRUID_STAMPEDE_CAT_RANK_1 = 81021,
- SPELL_DRUID_STAMPEDE_CAT_STATE = 109881,
SPELL_DRUID_SUNFIRE_DAMAGE = 164815,
SPELL_DRUID_SURVIVAL_INSTINCTS = 50322,
SPELL_DRUID_TRAVEL_FORM = 783,
SPELL_DRUID_THRASH_BEAR = 77758,
SPELL_DRUID_THRASH_BEAR_AURA = 192090,
- SPELL_DRUID_THRASH_CAT = 106830,
+ SPELL_DRUID_THRASH_CAT = 106830
};
class RaidCheck
@@ -526,26 +519,6 @@ private:
float _damageMultiplier = 0.0f;
};
-// -33943 - Flight Form
-class spell_dru_flight_form : public SpellScript
-{
- PrepareSpellScript(spell_dru_flight_form);
-
- SpellCastResult CheckCast()
- {
- Unit* caster = GetCaster();
- if (caster->IsInDisallowedMountForm())
- return SPELL_FAILED_NOT_SHAPESHIFT;
-
- return SPELL_CAST_OK;
- }
-
- void Register() override
- {
- OnCheckCast += SpellCheckCastFn(spell_dru_flight_form::CheckCast);
- }
-};
-
// 37336 - Druid Forms Trinket
class spell_dru_forms_trinket : public AuraScript
{
@@ -680,32 +653,6 @@ class spell_dru_gore : public AuraScript
}
};
-// 34246 - Idol of the Emerald Queen
-// 60779 - Idol of Lush Moss
-class spell_dru_idol_lifebloom : public AuraScript
-{
- PrepareAuraScript(spell_dru_idol_lifebloom);
-
- void HandleEffectCalcSpellMod(AuraEffect const* aurEff, SpellModifier*& spellMod)
- {
- if (!spellMod)
- {
- SpellModifierByClassMask* mod = new SpellModifierByClassMask(GetAura());
- mod->op = SpellModOp::PeriodicHealingAndDamage;
- mod->type = SPELLMOD_FLAT;
- mod->spellId = GetId();
- mod->mask = aurEff->GetSpellEffectInfo().SpellClassMask;
- spellMod = mod;
- }
- static_cast<SpellModifierByClassMask*>(spellMod)->value = aurEff->GetAmount() / 7;
- }
-
- void Register() override
- {
- DoEffectCalcSpellMod += AuraEffectCalcSpellModFn(spell_dru_idol_lifebloom::HandleEffectCalcSpellMod, EFFECT_0, SPELL_AURA_DUMMY);
- }
-};
-
// 99 - Incapacitating Roar
class spell_dru_incapacitating_roar : public spell_dru_base_transformer
{
@@ -848,59 +795,6 @@ class spell_dru_lifebloom : public AuraScript
}
};
-// -48496 - Living Seed
-class spell_dru_living_seed : public AuraScript
-{
- PrepareAuraScript(spell_dru_living_seed);
-
- bool Validate(SpellInfo const* /*spellInfo*/) override
- {
- return ValidateSpellInfo({ SPELL_DRUID_LIVING_SEED_PROC });
- }
-
- void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo)
- {
- PreventDefaultAction();
-
- HealInfo* healInfo = eventInfo.GetHealInfo();
- if (!healInfo || !healInfo->GetHeal())
- return;
-
- CastSpellExtraArgs args(aurEff);
- args.AddSpellMod(SPELLVALUE_BASE_POINT0, CalculatePct(healInfo->GetHeal(), aurEff->GetAmount()));
- GetTarget()->CastSpell(eventInfo.GetProcTarget(), SPELL_DRUID_LIVING_SEED_PROC, args);
- }
-
- void Register() override
- {
- OnEffectProc += AuraEffectProcFn(spell_dru_living_seed::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
- }
-};
-
-// 48504 - Living Seed (Proc)
-class spell_dru_living_seed_proc : public AuraScript
-{
- PrepareAuraScript(spell_dru_living_seed_proc);
-
- bool Validate(SpellInfo const* /*spellInfo*/) override
- {
- return ValidateSpellInfo({ SPELL_DRUID_LIVING_SEED_HEAL });
- }
-
- void HandleProc(AuraEffect* aurEff, ProcEventInfo& /*eventInfo*/)
- {
- PreventDefaultAction();
- CastSpellExtraArgs args(aurEff);
- args.AddSpellMod(SPELLVALUE_BASE_POINT0, aurEff->GetAmount());
- GetTarget()->CastSpell(GetTarget(), SPELL_DRUID_LIVING_SEED_HEAL, args);
- }
-
- void Register() override
- {
- OnEffectProc += AuraEffectProcFn(spell_dru_living_seed_proc::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
- }
-};
-
// 8921 - Moonfire
class spell_dru_moonfire : public SpellScript
{
@@ -945,24 +839,6 @@ class spell_dru_omen_of_clarity : public AuraScript
}
};
-// -16972 - Predatory Strikes
-class spell_dru_predatory_strikes : public AuraScript
-{
- PrepareAuraScript(spell_dru_predatory_strikes);
-
- void UpdateAmount(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
- {
- if (Player* target = GetTarget()->ToPlayer())
- target->UpdateAttackPowerAndDamage();
- }
-
- void Register() override
- {
- AfterEffectApply += AuraEffectApplyFn(spell_dru_predatory_strikes::UpdateAmount, EFFECT_ALL, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK);
- AfterEffectRemove += AuraEffectRemoveFn(spell_dru_predatory_strikes::UpdateAmount, EFFECT_ALL, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK);
- }
-};
-
// 5215 - Prowl
class spell_dru_prowl : public spell_dru_base_transformer
{
@@ -1077,49 +953,6 @@ class spell_dru_skull_bash : public SpellScript
}
};
-// -78892 - Stampede
-class spell_dru_stampede : public AuraScript
-{
- PrepareAuraScript(spell_dru_stampede);
-
- 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* aurEff, ProcEventInfo& eventInfo)
- {
- PreventDefaultAction();
- if (GetTarget()->GetShapeshiftForm() != FORM_CAT_FORM || eventInfo.GetDamageInfo()->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* aurEff, ProcEventInfo& eventInfo)
- {
- PreventDefaultAction();
- if (GetTarget()->GetShapeshiftForm() != FORM_BEAR_FORM || eventInfo.GetDamageInfo()->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 += AuraEffectProcFn(spell_dru_stampede::HandleEffectCatProc, EFFECT_0, SPELL_AURA_DUMMY);
- OnEffectProc += AuraEffectProcFn(spell_dru_stampede::HandleEffectBearProc, EFFECT_1, SPELL_AURA_DUMMY);
- }
-};
-
// 106898 - Stampeding Roar
class spell_dru_stampeding_roar : public spell_dru_base_transformer
{
@@ -1752,25 +1585,19 @@ void AddSC_druid_spell_scripts()
RegisterSpellScript(spell_dru_eclipse_dummy);
RegisterSpellScript(spell_dru_eclipse_ooc);
RegisterSpellScript(spell_dru_ferocious_bite);
- RegisterSpellScript(spell_dru_flight_form);
RegisterSpellScript(spell_dru_forms_trinket);
RegisterSpellScript(spell_dru_galactic_guardian);
RegisterSpellScript(spell_dru_gore);
- RegisterSpellScript(spell_dru_idol_lifebloom);
RegisterSpellScript(spell_dru_incapacitating_roar);
RegisterSpellScript(spell_dru_innervate);
RegisterSpellScript(spell_dru_item_t6_trinket);
RegisterSpellScript(spell_dru_lifebloom);
- RegisterSpellScript(spell_dru_living_seed);
- RegisterSpellScript(spell_dru_living_seed_proc);
RegisterSpellScript(spell_dru_moonfire);
RegisterSpellScript(spell_dru_omen_of_clarity);
- RegisterSpellScript(spell_dru_predatory_strikes);
RegisterSpellScript(spell_dru_prowl);
RegisterSpellScript(spell_dru_rip);
RegisterSpellAndAuraScriptPair(spell_dru_savage_roar, spell_dru_savage_roar_aura);
RegisterSpellScript(spell_dru_skull_bash);
- RegisterSpellScript(spell_dru_stampede);
RegisterSpellScript(spell_dru_stampeding_roar);
RegisterSpellScript(spell_dru_starfall_dummy);
RegisterSpellScript(spell_dru_sunfire);