From 92f8340da32b5633e982d8dd35975723923eef1a Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Tue, 28 Apr 2020 01:27:47 +0200 Subject: [PATCH] Core/Spells: allow Victory Rush's damage to crit but keep its healing effect non-critical --- src/server/game/Spells/SpellMgr.cpp | 6 ------ src/server/scripts/Spells/spell_warrior.cpp | 4 +++- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index 3a527dba72a..03708f821ce 100644 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -5674,12 +5674,6 @@ void SpellMgr::LoadSpellInfoCorrections() spellInfo->RangeEntry = sSpellRangeStore.LookupEntry(2); // 5 yards (combat range) }); - // Victory Rush - ApplySpellFix({ 34428 }, [](SpellInfo* spellInfo) - { - spellInfo->AttributesEx2 |= SPELL_ATTR2_CANT_CRIT; - }); - for (uint32 i = 0; i < GetSpellInfoStoreSize(); ++i) { SpellInfo* spellInfo = mSpellInfoMap[i]; diff --git a/src/server/scripts/Spells/spell_warrior.cpp b/src/server/scripts/Spells/spell_warrior.cpp index 8c33d7cabb4..55976546ba2 100644 --- a/src/server/scripts/Spells/spell_warrior.cpp +++ b/src/server/scripts/Spells/spell_warrior.cpp @@ -746,7 +746,7 @@ class spell_warr_victory_rush : public SpellScript SetEffectValue(CalculatePct(GetCaster()->GetTotalAttackPowerValue(BASE_ATTACK), GetSpellInfo()->Effects[EFFECT_0].CalcValue())); } - void HandleImpendingVictoryHeal(SpellEffIndex /*effIndex*/) + void HandleImpendingVictoryHeal(SpellEffIndex effIndex) { if (Unit* caster = GetCaster()) { @@ -761,6 +761,8 @@ class spell_warr_victory_rush : public SpellScript SetEffectValue(damage); } + else + SetEffectValue(GetSpellInfo()->Effects[effIndex].CalcValue()); caster->RemoveAurasDueToSpell(SPELL_WARRIOR_VICTORIOUS); caster->RemoveAurasDueToSpell(SPELL_WARRIOR_VICTORIOUS_IMPENDING_VICTORY);