diff options
| -rw-r--r-- | sql/updates/world/master/2023_05_14_00_world.sql | 9 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_warrior.cpp | 42 |
2 files changed, 51 insertions, 0 deletions
diff --git a/sql/updates/world/master/2023_05_14_00_world.sql b/sql/updates/world/master/2023_05_14_00_world.sql new file mode 100644 index 00000000000..8b6aa14e407 --- /dev/null +++ b/sql/updates/world/master/2023_05_14_00_world.sql @@ -0,0 +1,9 @@ +-- +DELETE FROM `spell_proc` WHERE `SpellId` IN (383103); +INSERT INTO `spell_proc` (`SpellId`,`SchoolMask`,`SpellFamilyName`,`SpellFamilyMask0`,`SpellFamilyMask1`,`SpellFamilyMask2`,`SpellFamilyMask3`,`ProcFlags`,`ProcFlags2`,`SpellTypeMask`,`SpellPhaseMask`,`HitMask`,`AttributesMask`,`DisableEffectsMask`,`ProcsPerMinute`,`Chance`,`Cooldown`,`Charges`) VALUES +(383103,0x00,4,0x00080000,0x00000000,0x00400000,0x00000000,0x0,0x0,0x1,0x2,0x403,0x0,0x0,0,0,0,0); -- Fueled by Violence + +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_warr_fueled_by_violence'; +INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES +(383103, 'spell_warr_fueled_by_violence'); + diff --git a/src/server/scripts/Spells/spell_warrior.cpp b/src/server/scripts/Spells/spell_warrior.cpp index dde78d06f96..b37b8ce1c6c 100644 --- a/src/server/scripts/Spells/spell_warrior.cpp +++ b/src/server/scripts/Spells/spell_warrior.cpp @@ -44,6 +44,7 @@ enum WarriorSpells SPELL_WARRIOR_COLOSSUS_SMASH = 167105, SPELL_WARRIOR_COLOSSUS_SMASH_EFFECT = 208086, SPELL_WARRIOR_EXECUTE = 20647, + SPELL_WARRIOR_FUELED_BY_VIOLENCE_HEAL = 383104, SPELL_WARRIOR_GLYPH_OF_THE_BLAZING_TRAIL = 123779, SPELL_WARRIOR_GLYPH_OF_HEROIC_LEAP = 159708, SPELL_WARRIOR_GLYPH_OF_HEROIC_LEAP_BUFF = 133278, @@ -199,6 +200,46 @@ class spell_warr_colossus_smash : public SpellScript } }; +// 383103 - Fueled by Violence +class spell_warr_fueled_by_violence : public AuraScript +{ + PrepareAuraScript(spell_warr_fueled_by_violence); + + bool Validate(SpellInfo const* spellInfo) override + { + return ValidateSpellInfo({ SPELL_WARRIOR_FUELED_BY_VIOLENCE_HEAL }); + } + + void HandleProc(ProcEventInfo& eventInfo) + { + PreventDefaultAction(); + + _nextHealAmount += CalculatePct(eventInfo.GetDamageInfo()->GetDamage(), GetEffectInfo(EFFECT_0).CalcValue(GetTarget())); + } + + void HandlePeriodic(AuraEffect const* aurEff) + { + if (_nextHealAmount == 0) + return; + + Unit* target = GetTarget(); + CastSpellExtraArgs args(TRIGGERED_FULL_MASK); + args.AddSpellBP0(_nextHealAmount); + + target->CastSpell(target, SPELL_WARRIOR_FUELED_BY_VIOLENCE_HEAL, args); + _nextHealAmount = 0; + } + + void Register() override + { + OnProc += AuraProcFn(spell_warr_fueled_by_violence::HandleProc); + OnEffectPeriodic += AuraEffectPeriodicFn(spell_warr_fueled_by_violence::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + } + +private: + uint32 _nextHealAmount; +}; + // 6544 - Heroic leap class spell_warr_heroic_leap : public SpellScript { @@ -640,6 +681,7 @@ void AddSC_warrior_spell_scripts() RegisterSpellScript(spell_warr_charge_drop_fire_periodic); RegisterSpellScript(spell_warr_charge_effect); RegisterSpellScript(spell_warr_colossus_smash); + RegisterSpellScript(spell_warr_fueled_by_violence); RegisterSpellScript(spell_warr_heroic_leap); RegisterSpellScript(spell_warr_heroic_leap_jump); RegisterSpellScript(spell_warr_impending_victory); |