[fix]Reign of the Dead/Reign of the Unliving(item spells)

[laise]

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

fixes mote/shard gaining , cd to proc and final dmg spell laucn on third mote/shard

For which repository revision was the patch created?

9362

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

haven't seen any

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

me

diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 6344463..7489c45 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -7603,6 +7603,32 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, Aura* triggeredB
                trigger_spell_id = 54843;
                target = pVictim;
            }
+            // Reign of the Unliving, Item - Coliseum 25 Normal Caster Trinket
+            else if (auraSpellInfo->Id == 67712)
+            {
+                Aura *aur = GetAura(67713, 0);
+                if (aur && int32(aur->GetStackAmount() + 1) >= triggerAmount)
+                {
+                    RemoveAurasDueToSpell(67713);
+                    CastSpell(pVictim, 67714, true, NULL, triggeredByAura);
+                    return true;
+                }
+                else
+                    trigger_spell_id = 67713;
+            }
+            // Reign of the Unliving (heroic), Item - Coliseum 25 Heroic Caster Trinket
+            else if (auraSpellInfo->Id == 67758)
+            {
+                Aura *aur = GetAura(67759, 0);
+                if (aur && int32(aur->GetStackAmount() + 1) >= triggerAmount)
+                {
+                    RemoveAurasDueToSpell(67759);
+                    CastSpell(pVictim, 67760, true, NULL, triggeredByAura);
+                    return true;
+                }
+                else
+                    trigger_spell_id = 67759;
+            }
            break;
        }
        case SPELLFAMILY_SHAMAN:

-- (67758) Item - Coliseum 25 Heroic Caster Trinket ()
DELETE FROM `spell_proc_event` WHERE `entry` IN (67758);
INSERT INTO `spell_proc_event` VALUES
(67758, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 2);

-- (67712) Item - Coliseum 25 Normal Caster Trinket ()
DELETE FROM `spell_proc_event` WHERE `entry` IN (67712);
INSERT INTO `spell_proc_event` VALUES
(67712, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 2);

[zhanhang02]

test and work fine,thank you.

[laise]

first post updated

[Ranger]

other procs:

-- (67653) Coliseum 5 Tank Trinket ()
DELETE FROM `spell_proc_event` WHERE `entry` IN (67653);
INSERT INTO `spell_proc_event` VALUES
(67653, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000000, 0.000000, 0.000000, 45);

-- (67670) Coliseum 5 CasterTrinket ()
DELETE FROM `spell_proc_event` WHERE `entry` IN (67670);
INSERT INTO `spell_proc_event` VALUES
(67670, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0.000000, 0.000000, 45);

-- (67672) Coliseum 5 Melee Trinket ()
DELETE FROM `spell_proc_event` WHERE `entry` IN (67672);
INSERT INTO `spell_proc_event` VALUES
(67672, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000000, 0.000000, 0.000000, 45);

-- (67667) Coliseum 5 Healer Trinket ()
DELETE FROM `spell_proc_event` WHERE `entry` IN (67667);
INSERT INTO `spell_proc_event` VALUES
(67667, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00004000, 0x00000000, 0.000000, 0.000000, 45);

[xarly]

For me is not working properly.

I get the aura but only one (it doesn't stack, so I never get three)