diff options
| -rw-r--r-- | sql/updates/world/master/2023_05_18_00_world.sql | 7 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_warrior.cpp | 38 |
2 files changed, 45 insertions, 0 deletions
diff --git a/sql/updates/world/master/2023_05_18_00_world.sql b/sql/updates/world/master/2023_05_18_00_world.sql new file mode 100644 index 00000000000..501f673b7b3 --- /dev/null +++ b/sql/updates/world/master/2023_05_18_00_world.sql @@ -0,0 +1,7 @@ +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_warr_brutal_vitality'; +INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES +(384036,'spell_warr_brutal_vitality'); + +DELETE FROM `spell_proc` WHERE `SpellId` IN (384036); +INSERT INTO `spell_proc` (`SpellId`,`SchoolMask`,`SpellFamilyName`,`SpellFamilyMask0`,`SpellFamilyMask1`,`SpellFamilyMask2`,`SpellFamilyMask3`,`ProcFlags`,`ProcFlags2`,`SpellTypeMask`,`SpellPhaseMask`,`HitMask`,`AttributesMask`,`DisableEffectsMask`,`ProcsPerMinute`,`Chance`,`Cooldown`,`Charges`) VALUES +(384036,0x00,4,0x00000000,0x00000000,0x00000000,0x00000000,0x0,0x0,0x1,0x2,0x403,0x0,0x0,0,0,0,0); -- Brutal Vitality diff --git a/src/server/scripts/Spells/spell_warrior.cpp b/src/server/scripts/Spells/spell_warrior.cpp index 3f199d9263e..6a8a10cead7 100644 --- a/src/server/scripts/Spells/spell_warrior.cpp +++ b/src/server/scripts/Spells/spell_warrior.cpp @@ -49,6 +49,7 @@ enum WarriorSpells SPELL_WARRIOR_GLYPH_OF_HEROIC_LEAP = 159708, SPELL_WARRIOR_GLYPH_OF_HEROIC_LEAP_BUFF = 133278, SPELL_WARRIOR_HEROIC_LEAP_JUMP = 178368, + SPELL_WARRIOR_IGNORE_PAIN = 190456, SPELL_WARRIOR_IMPENDING_VICTORY = 202168, SPELL_WARRIOR_IMPENDING_VICTORY_HEAL = 202166, SPELL_WARRIOR_IMPROVED_HEROIC_LEAP = 157449, @@ -94,6 +95,42 @@ class spell_warr_bloodthirst : public SpellScript } }; +// 384036 - Brutal Vitality +class spell_warr_brutal_vitality : public AuraScript +{ + PrepareAuraScript(spell_warr_brutal_vitality); + + bool Validate(SpellInfo const* /*spellInfo*/) override + { + return ValidateSpellInfo({ SPELL_WARRIOR_IGNORE_PAIN }); + } + + void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) + { + _damageAmount += CalculatePct(eventInfo.GetDamageInfo()->GetDamage(), aurEff->GetAmount()); + } + + void HandleDummyTick(AuraEffect const* /*aurEff*/) + { + if (_damageAmount == 0) + return; + + if (AuraEffect* ignorePainAura = GetTarget()->GetAuraEffect(SPELL_WARRIOR_IGNORE_PAIN, EFFECT_0)) + ignorePainAura->ChangeAmount(ignorePainAura->GetAmount() + _damageAmount); + + _damageAmount = 0; + } + + void Register() override + { + AfterEffectProc += AuraEffectProcFn(spell_warr_brutal_vitality::HandleProc, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic += AuraEffectPeriodicFn(spell_warr_brutal_vitality::HandleDummyTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + } + +private: + uint32 _damageAmount = 0; +}; + // 100 - Charge class spell_warr_charge : public SpellScript { @@ -699,6 +736,7 @@ class spell_warr_victory_rush : public SpellScript void AddSC_warrior_spell_scripts() { RegisterSpellScript(spell_warr_bloodthirst); + RegisterSpellScript(spell_warr_brutal_vitality); RegisterSpellScript(spell_warr_charge); RegisterSpellScript(spell_warr_charge_drop_fire_periodic); RegisterSpellScript(spell_warr_charge_effect); |