[9665][fix] addition to IsNoStackSpellDueToSpell

[Auntie Mangos]

I'm pretty sure that this patch would completely replace this (and many other spell icon checks): http://getmangos.eu/community/viewtopic.php?id=9232

Also, if you are trying to prevent spells from stacking, you should return true (as in, it's true that it is a no stack spell.)

[pasdVn]

The Hunter Talent "Kindred Spirit" (http://www.wowhead.com/?search=spirits#talents) makes the pet cast two auras (http://www.wowhead.com/?spell=57485 the speed part, http://www.wowhead.com/?spell=57447 the damage part, and their ranks, ofc).

Those two auras are not allowed to stack currently (same icon... etc.).

patch:

From 9f0e82f5c0047b459fce4260b72b1824e24a10e5 Mon Sep 17 00:00:00 2001
From: pasdVn <[email protected]>
Date: Thu, 6 Aug 2009 11:41:00 +0200
Subject: [PATCH] Make pet auras of "Kindred Spirits" abled to stack.

---
src/game/SpellMgr.cpp |    4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp
index 7e820e4..cc695e9 100644
--- a/src/game/SpellMgr.cpp
+++ b/src/game/SpellMgr.cpp
@@ -1208,6 +1208,10 @@ bool SpellMgr::IsNoStackSpellDueToSpell(uint32 spellId_1, uint32 spellId_2) cons
                        (spellInfo_2->Id == 8326 && spellInfo_1->Id == 20584) )
                         return false;

+                    // Kindred Spirits
+                    if( spellInfo_1->SpellIconID == 3559 && spellInfo_2->SpellIconID == 3559 )
+                        return false;
+
                    break;
                }
                case SPELLFAMILY_MAGE:
-- 
1.5.5.1

Gihub: http://github.com/pasdVn/mangos/commit/9f0e82f5c0047b459fce4260b72b1824e24a10e5.patch

I think the iconid check is enough here. As far as I know no other spell uses this icon.

Quite funny, that this second effect got an extra bufficon, while similar pet talents don't...

Edit: Maybe one important thing I forgot to mention: Both pet castet spells are NOT passive(SPELL_ATTR_PASSIVE). That is why they are getting sorted out with the iconID check in IsNoStackSpellDueToSpell() and we need this special handling (in comparison to similar spells)...

[XTZGZoReX]

Seems good to me.

[pasdVn]

Ahh, allright. I somehow had this patch in my mind but, but did not find it again...

Also, if you are trying to prevent spells from stacking, you should return true (as in, it's true that it is a no stack spell.)

I want them to stack . So from this point of view this patch is correct at least^^.

[KAPATEJIb]

bump, talent still bugged and patch works

for 9261

 src/game/SpellMgr.cpp |    4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp
index b45f926..cc13ba4 100644
--- a/src/game/SpellMgr.cpp
+++ b/src/game/SpellMgr.cpp
@@ -1359,6 +1359,10 @@ bool SpellMgr::IsNoStackSpellDueToSpell(uint32 spellId_1, uint32 spellId_2) cons
                    if(spellInfo_1->SpellIconID == 2606 && spellInfo_2->SpellIconID == 2606)
                        return false;

+                    //Kindred Spirits (allow stack for auras)
+                    if (spellInfo_1->SpellIconID == 3559 && spellInfo_2->SpellIconID == 3559)
+                        return false;
+
                    // Brood Affliction: Bronze
                    if( (spellInfo_1->Id == 23170 && spellInfo_2->Id == 23171) ||
                        (spellInfo_2->Id == 23170 && spellInfo_1->Id == 23171) )

[darkstalker]

i think there is enough exceptions for the iconid check, why not remove it?

[hunuza]

Accepted in [9665].