Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-15 23:20:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Scripts/Spells: Fix Shockwave and implement Rumbling Earth talent (#31020)

Browse Source
This commit is contained in:
Jeremy
2025-06-02 22:16:30 +02:00
committed by GitHub
parent f9c9a28d4e
commit 27ff4ebfd3
2 changed files with 48 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
src/server/scripts/Spells/spell_warrior.cpp
View File

@@ -60,6 +60,7 @@ enum WarriorSpells
SPELL_WARRIOR_MORTAL_STRIKE = 12294,
SPELL_WARRIOR_MORTAL_WOUNDS = 213667,
SPELL_WARRIOR_RALLYING_CRY = 97463,
SPELL_WARRIOR_RUMBLING_EARTH = 275339,
SPELL_WARRIOR_SHIELD_BLOCK_AURA = 132404,
SPELL_WARRIOR_SHIELD_CHARGE_EFFECT = 385953,
SPELL_WARRIOR_SHIELD_SLAM = 23922,
@@ -567,6 +568,41 @@ class spell_warr_rallying_cry : public SpellScript
}
};
// 275339 - (attached to 46968 - Shockwave)
class spell_warr_rumbling_earth : public SpellScript
{
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellEffect({ { SPELL_WARRIOR_RUMBLING_EARTH, EFFECT_1 } });
}
bool Load() override
{
return GetCaster()->HasAura(SPELL_WARRIOR_RUMBLING_EARTH);
}
void HandleCooldownReduction(SpellEffIndex /*effIndex*/) const
{
Unit* caster = GetCaster();
Aura const* rumblingEarth = caster->GetAura(SPELL_WARRIOR_RUMBLING_EARTH);
if (!rumblingEarth)
return;
AuraEffect const* minTargetCount = rumblingEarth->GetEffect(EFFECT_0);
AuraEffect const* cooldownReduction = rumblingEarth->GetEffect(EFFECT_1);
if (!minTargetCount || !cooldownReduction)
return;
if (GetUnitTargetCountForEffect(EFFECT_0) >= minTargetCount->GetAmount())
GetCaster()->GetSpellHistory()->ModifyCooldown(GetSpellInfo()->Id, Seconds(-cooldownReduction->GetAmount()));
}
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_warr_rumbling_earth::HandleCooldownReduction, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
// 2565 - Shield Block
class spell_warr_shield_block : public SpellScript
{
@@ -608,37 +644,23 @@ class spell_warr_shield_charge : public SpellScript
// 46968 - Shockwave
class spell_warr_shockwave : public SpellScript
{
bool Validate(SpellInfo const* spellInfo) override
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return !ValidateSpellInfo({ SPELL_WARRIOR_SHOCKWAVE, SPELL_WARRIOR_SHOCKWAVE_STUN })
&& ValidateSpellEffect({ { spellInfo->Id, EFFECT_3 } });
return ValidateSpellInfo({ SPELL_WARRIOR_SHOCKWAVE_STUN });
}
bool Load() override
void HandleStun(SpellEffIndex /*effIndex*/) const
{
return GetCaster()->GetTypeId() == TYPEID_PLAYER;
}
void HandleStun(SpellEffIndex /*effIndex*/)
{
GetCaster()->CastSpell(GetHitUnit(), SPELL_WARRIOR_SHOCKWAVE_STUN, true);
++_targetCount;
}
// Cooldown reduced by 20 sec if it strikes at least 3 targets.
void HandleAfterCast()
{
if (_targetCount >= uint32(GetEffectInfo(EFFECT_0).CalcValue()))
GetCaster()->ToPlayer()->GetSpellHistory()->ModifyCooldown(GetSpellInfo()->Id, Seconds(-GetEffectInfo(EFFECT_3).CalcValue()));
GetCaster()->CastSpell(GetHitUnit(), SPELL_WARRIOR_SHOCKWAVE_STUN, CastSpellExtraArgsInit{
.TriggerFlags = TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR,
.TriggeringSpell = GetSpell()
});
}
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_warr_shockwave::HandleStun, EFFECT_0, SPELL_EFFECT_DUMMY);
AfterCast += SpellCastFn(spell_warr_shockwave::HandleAfterCast);
OnEffectHitTarget += SpellEffectFn(spell_warr_shockwave::HandleStun, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
}
uint32 _targetCount = 0;
};
// 107570 - Storm Bolt
@@ -892,6 +914,7 @@ void AddSC_warrior_spell_scripts()
RegisterSpellScript(spell_warr_item_t10_prot_4p_bonus);
RegisterSpellScript(spell_warr_mortal_strike);
RegisterSpellScript(spell_warr_rallying_cry);
RegisterSpellScript(spell_warr_rumbling_earth);
RegisterSpellScript(spell_warr_shield_block);
RegisterSpellScript(spell_warr_shield_charge);
RegisterSpellScript(spell_warr_shockwave);