Skip to content

Commit 4e9f344

Browse files
authored
Scripts/Spells: Remove outdated parts of death knight spell scripts (TrinityCore#30237)
1 parent 4b7465a commit 4e9f344

File tree

1 file changed

+5
-26
lines changed

1 file changed

+5
-26
lines changed

src/server/scripts/Spells/spell_dk.cpp

Lines changed: 5 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -96,14 +96,10 @@ enum DeathKnightSpells
9696
SPELL_DK_SOUL_REAPER_DAMAGE = 343295,
9797
SPELL_DK_SUBDUING_GRASP_DEBUFF = 454824,
9898
SPELL_DK_SUBDUING_GRASP_TALENT = 454822,
99-
SPELL_DK_TIGHTENING_GRASP = 206970,
100-
//SPELL_DK_TIGHTENING_GRASP_SLOW = 143375, // dropped in BfA
10199
SPELL_DK_UNHOLY = 137007,
102100
SPELL_DK_UNHOLY_GROUND_HASTE = 374271,
103101
SPELL_DK_UNHOLY_GROUND_TALENT = 374265,
104102
SPELL_DK_UNHOLY_VIGOR = 196263,
105-
SPELL_DK_VOLATILE_SHIELDING = 207188,
106-
SPELL_DK_VOLATILE_SHIELDING_DAMAGE = 207194
107103
};
108104

109105
enum Misc
@@ -151,7 +147,7 @@ class spell_dk_anti_magic_shell : public AuraScript
151147

152148
bool Validate(SpellInfo const* spellInfo) override
153149
{
154-
return ValidateSpellInfo({ SPELL_DK_RUNIC_POWER_ENERGIZE, SPELL_DK_VOLATILE_SHIELDING })
150+
return ValidateSpellInfo({ SPELL_DK_RUNIC_POWER_ENERGIZE })
155151
&& ValidateSpellEffect({ { spellInfo->Id, EFFECT_1 }, { SPELL_DK_ANTI_MAGIC_BARRIER, EFFECT_2 } });
156152
}
157153

@@ -178,29 +174,15 @@ class spell_dk_anti_magic_shell : public AuraScript
178174
{
179175
absorbedAmount += absorbAmount;
180176

181-
if (!GetTarget()->HasAura(SPELL_DK_VOLATILE_SHIELDING))
182-
{
183-
CastSpellExtraArgs args(aurEff);
184-
args.AddSpellMod(SPELLVALUE_BASE_POINT0, CalculatePct(absorbAmount, 2 * absorbAmount * 100 / maxHealth));
185-
GetTarget()->CastSpell(GetTarget(), SPELL_DK_RUNIC_POWER_ENERGIZE, args);
186-
}
187-
}
188-
189-
void HandleEffectRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
190-
{
191-
if (AuraEffect const* volatileShielding = GetTarget()->GetAuraEffect(SPELL_DK_VOLATILE_SHIELDING, EFFECT_1))
192-
{
193-
CastSpellExtraArgs args(volatileShielding);
194-
args.AddSpellMod(SPELLVALUE_BASE_POINT0, CalculatePct(absorbedAmount, volatileShielding->GetAmount()));
195-
GetTarget()->CastSpell(nullptr, SPELL_DK_VOLATILE_SHIELDING_DAMAGE, args);
196-
}
177+
CastSpellExtraArgs args(aurEff);
178+
args.AddSpellMod(SPELLVALUE_BASE_POINT0, CalculatePct(absorbAmount, 2 * absorbAmount * 100 / maxHealth));
179+
GetTarget()->CastSpell(GetTarget(), SPELL_DK_RUNIC_POWER_ENERGIZE, args);
197180
}
198181

199182
void Register() override
200183
{
201184
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_anti_magic_shell::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB);
202185
AfterEffectAbsorb += AuraEffectAbsorbFn(spell_dk_anti_magic_shell::Trigger, EFFECT_0);
203-
AfterEffectRemove += AuraEffectRemoveFn(spell_dk_anti_magic_shell::HandleEffectRemove, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB, AURA_EFFECT_HANDLE_REAL);
204186
}
205187

206188
private:
@@ -1086,15 +1068,12 @@ class spell_dk_raise_dead : public SpellScript
10861068
{
10871069
bool Validate(SpellInfo const* /*spellInfo*/) override
10881070
{
1089-
return ValidateSpellInfo({ SPELL_DK_RAISE_DEAD_SUMMON, SPELL_DK_SLUDGE_BELCHER, SPELL_DK_SLUDGE_BELCHER_SUMMON });
1071+
return ValidateSpellInfo({ SPELL_DK_RAISE_DEAD_SUMMON });
10901072
}
10911073

10921074
void HandleDummy(SpellEffIndex /*effIndex*/)
10931075
{
10941076
uint32 spellId = SPELL_DK_RAISE_DEAD_SUMMON;
1095-
if (GetCaster()->HasAura(SPELL_DK_SLUDGE_BELCHER))
1096-
spellId = SPELL_DK_SLUDGE_BELCHER_SUMMON;
1097-
10981077
GetCaster()->CastSpell(nullptr, spellId, true);
10991078
}
11001079

0 commit comments

Comments
 (0)