araxiaonline/TrinityCore
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore.git synced 2026-06-13 03:32:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Scripts/Spells: Update Sudden Death (#31550)

Browse Source
This commit is contained in:
MoltenCrystal
2026-02-16 16:34:33 +01:00
committed by GitHub
parent 9b79ef5d4b
commit 6b35cce86b
2 changed files with 15 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/updates/world/master/2026_02_16_01_world.sql Normal file
View File

@@ -0,0 +1,8 @@
DELETE FROM `spell_script_names` WHERE `ScriptName` IN ('spell_warr_sudden_death','spell_warr_sudden_death_proc');
INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
(29725,'spell_warr_sudden_death');
DELETE FROM `spell_proc` WHERE `SpellId` IN (29725,52437);
INSERT INTO `spell_proc` (`SpellId`,`SchoolMask`,`SpellFamilyName`,`SpellFamilyMask0`,`SpellFamilyMask1`,`SpellFamilyMask2`,`SpellFamilyMask3`,`ProcFlags`,`ProcFlags2`,`SpellTypeMask`,`SpellPhaseMask`,`HitMask`,`AttributesMask`,`DisableEffectsMask`,`ProcsPerMinute`,`Chance`,`Cooldown`,`Charges`) VALUES
(29725,0x00,4,0x00000000,0x00000000,0x00000000,0x00000000,0x0,0x0,0x1,0x2,0x0,0x0,0x0,0,0,0,0), -- Sudden Death
(52437,0x00,4,0x00000000,0x00000000,0x00000000,0x00000000,0x0,0x0,0x0,0x2,0x0,0x18,0x0,0,0,0,0); -- Sudden Death

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

@@ -103,8 +103,8 @@ enum WarriorSpells
SPELL_WARRIOR_STORM_BOLT_STUN = 132169,
SPELL_WARRIOR_STORM_BOLTS = 436162,
SPELL_WARRIOR_STRATEGIST = 384041,
SPELL_WARRIOR_SUDDEN_DEATH = 280721,
SPELL_WARRIOR_SUDDEN_DEATH_BUFF = 280776,
SPELL_WARRIOR_SUDDEN_DEATH = 29725,
SPELL_WARRIOR_SUDDEN_DEATH_BUFF = 52437,
SPELL_WARRIOR_SWEEPING_STRIKES_EXTRA_ATTACK_1 = 12723,
SPELL_WARRIOR_SWEEPING_STRIKES_EXTRA_ATTACK_2 = 26654,
SPELL_WARRIOR_TAUNT = 355,
@@ -1480,39 +1480,25 @@ class spell_warr_strategist : public AuraScript
}
};
// 280776 - Sudden Death
// 29725 - Sudden Death
class spell_warr_sudden_death : public AuraScript
{
static bool CheckProc(AuraScript const&, ProcEventInfo const& eventInfo)
{
// should only proc on primary target
return eventInfo.GetActionTarget() == eventInfo.GetProcSpell()->m_targets.GetUnitTarget();
}
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_warr_sudden_death::CheckProc);
}
};
// 280721 - Sudden Death
class spell_warr_sudden_death_proc : public AuraScript
{
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_WARRIOR_SUDDEN_DEATH_BUFF });
}
void HandleProc(AuraEffect* /*aurEff*/, ProcEventInfo& /*eventInfo*/) const
void HandleProc(AuraEffect const* /*aurEff*/, ProcEventInfo const& /*eventInfo*/) const
{
GetTarget()->CastSpell(nullptr, SPELL_WARRIOR_SUDDEN_DEATH_BUFF, CastSpellExtraArgsInit{
Unit* target = GetTarget();
target->CastSpell(target, SPELL_WARRIOR_SUDDEN_DEATH_BUFF, CastSpellExtraArgsInit{
.TriggerFlags = TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR
});
}
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_warr_sudden_death_proc::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
OnEffectProc += AuraEffectProcFn(spell_warr_sudden_death::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
@@ -1874,7 +1860,6 @@ void AddSC_warrior_spell_scripts()
RegisterSpellScript(spell_warr_storm_bolts);
RegisterSpellScript(spell_warr_strategist);
RegisterSpellScript(spell_warr_sudden_death);
RegisterSpellScript(spell_warr_sudden_death_proc);
RegisterSpellScript(spell_warr_sweeping_strikes);
RegisterSpellScript(spell_warr_tenderize);
RegisterSpellScript(spell_warr_thunder_clap);