[sql Fix][9068] Righteous Vengeance

[Auntie Mangos]

What bug does the patch fix? What features does the patch add?

It modifies calculation of Righteous Vengeance to add remaining damage of previous aura.

It adds proc from Crusader Strike talent.

UPDATE:

Added Sheath of Light ( it has same effect as RV )

For which repository revision was the patch created?

8946

Is there a thread in the bug report section or at lighthouse? If yes, please add a link to the thread.

http://getmangos.eu/community/viewtopic.php?id=10673

Who has been writing this patch? Please include either forum user names or email addresses.

Me

DB part

UPDATE spell_proc_event SET SpellFamilyMask1 = 163840 WHERE entry IN (53380,53381,53382);

Core part

diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index b373f80..27f2df7 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -5973,6 +5973,22 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAu
                // 4 damage tick
                basepoints0 = triggerAmount*damage/400;
                triggered_spell_id = 61840;
+
+				if ( !target )
+					break;
+				// get previous aura
+				Unit::AuraList const &periodicAuras = target->GetAurasByType( SPELL_AURA_PERIODIC_DAMAGE );
+				for( Unit::AuraList::const_iterator i = periodicAuras.begin(); i != periodicAuras.end(); ++i )
+				{
+					if ( (*i)->GetCasterGUID() == GetGUID() && (*i)->GetSpellProto()->SpellIconID == 3025 )
+					{
+						// add remaining damage to new aura
+						Modifier const* mod = (*i)->GetModifier();
+						int32 tickCount = 1 + int32( (*i)->GetAuraDuration() / mod->periodictime );
+						basepoints0 += int32( mod->m_amount * tickCount / 4 );	//damage per tick * remaining ticks count
+						break;
+					}
+				}
                break;
            }
            // Sheath of Light
@@ -5981,6 +5997,22 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAu
                // 4 healing tick
                basepoints0 = triggerAmount*damage/400;
                triggered_spell_id = 54203;
+				
+				if ( !target )
+					break;
+				// get previous aura
+				Unit::AuraList const &periodicAuras = target->GetAurasByType( SPELL_AURA_PERIODIC_HEAL );
+				for( Unit::AuraList::const_iterator i = periodicAuras.begin(); i != periodicAuras.end(); ++i )
+				{
+					if ( (*i)->GetCasterGUID() == GetGUID() && (*i)->GetSpellProto()->SpellIconID == 3030 )
+					{
+						// add remaining heal to new aura
+						Modifier const* mod = (*i)->GetModifier();
+						int32 tickCount = 1 + int32( (*i)->GetAuraDuration() / mod->periodictime );
+						basepoints0 += int32( mod->m_amount * tickCount / 4 );	//damage per tick * remaining ticks count
+						break;
+					}
+				}		
                break;
            }
            switch(dummySpell->Id)

[MrLama]

Performed little modifications

- one if instead of two in for loop

- changed calculation to work with unmodified aura damage, because modifications will be applied later on new aura.

[SplinterC]

Why not this:

@@ -5973,7 +5973,19 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAu
                // 4 damage tick
                basepoints0 = triggerAmount*damage/400;
                triggered_spell_id = 61840;
-                break;
+
+                Unit::AuraList const &periodicAuras = target->GetAurasByType( SPELL_AURA_PERIODIC_DAMAGE );
+                for( Unit::AuraList::const_iterator i = periodicAuras.begin(); i != periodicAuras.end(); ++i )
+                {
+                     if ((*i)->GetCasterGUID() == GetGUID() && (*i)->GetSpellProto()->SpellIconID == 3025 &&
+                         (*i)->GetSpellProto()->SpellVisual[0] == 5652)
+                     {
+                         int32 tickremains = int32((*i)->GetAuraDuration() / (*i)->GetModifier()->periodictime );
+                         basepoints0 += int32((*i)->GetModifier()->m_amount * tickremains /4);
+                         break;
+                     }
+               }
+               break;
            }
            // Sheath of Light
            if (dummySpell->SpellIconID == 3030)

[MrLama]

Ok, I modified code a little (updated first post) and added Sheath of Light too. It has same effect as Righteous Vengeance but it is periodic heal.

[MrLama]

Absolete due to:

[9057] Implement some damage related spell attributes support.

http://github.com/mangos/mangos/commit/ba5b8650f7350d447119171b60405c59134a577b

Please remove, thanks

[KAPATEJIb]

but what about SQL part? it's still useful?

[VladimirMangos]

but what about SQL part? it's still useful?

Added in [9068]. Thanks author for patch and KAPATEJIb for pointing