[Fix] Spells with same Icons

[Auntie Mangos]

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

Now spells with the same icons don't replace each other.

For which repository revision was the patch created?

s0733 but it works on higher revisions too

Is there a thread in the bug report section or at lighthouse?

http://getmangos.eu/community/showthread.php?12593-[Question]-Spells-with-same-icon&highlight=icon

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

Me

diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp
index c48e40c..30646ac 100644
--- a/src/game/SpellMgr.cpp
+++ b/src/game/SpellMgr.cpp
@@ -1976,10 +1977,13 @@ bool SpellMgr::IsNoStackSpellDueToSpell(uint32 spellId_1, uint32 spellId_2) cons
        bool isModifier = false;
        for (int i = 0; i < MAX_EFFECT_INDEX; ++i)
        {
-            if (spellInfo_1->EffectApplyAuraName[i] == SPELL_AURA_ADD_FLAT_MODIFIER ||
+            if ((spellInfo_1->EffectApplyAuraName[i] == SPELL_AURA_ADD_FLAT_MODIFIER ||
                spellInfo_1->EffectApplyAuraName[i] == SPELL_AURA_ADD_PCT_MODIFIER  ||
                spellInfo_2->EffectApplyAuraName[i] == SPELL_AURA_ADD_FLAT_MODIFIER ||
-                spellInfo_2->EffectApplyAuraName[i] == SPELL_AURA_ADD_PCT_MODIFIER )
+                spellInfo_2->EffectApplyAuraName[i] == SPELL_AURA_ADD_PCT_MODIFIER ) ||
+
+               (spellInfo_1->EffectApplyAuraName[i] != spellInfo_2->EffectApplyAuraName[i] ||
+                spellInfo_1->Effect[i] != spellInfo_2->Effect[i]))
                isModifier = true;
        }

[Auntie Mangos]

This was already discussed here:

http://getmangos.eu/community/showthread.php?2779-[patch]-Delete-A-Strange-Icon-Check-In-Aura-Stack-Check

[Auntie Mangos]

There are some problems with scrolls, thats why I sent this post.

http://getmangos.eu/community/showthread.php?13635-Fix-buff-problem-with-quot-scrolls-of-...-quot&p=112250&highlight=#post112250

[Hundekuchen]

okay, but some spell don't work together at time, for example:

IconID: 453

http://www.wowhead.com/spell=33089

http://www.wowhead.com/spell=20925

http://www.wowhead.com/spell=45479

Icon: 173

http://www.wowhead.com/spell=19028

http://www.wowhead.com/spell=44415

and many more...

And i checked the problem with Scroll of intellect and Arcane intellect and some more, and it works fine

My script is only an extra check for incoming spells

[Hundekuchen]

please comment

[j4r0d]

Yeah... i've tested it and works fine also for Essence of Gossamer and Devotion aura, great job

[alexluana]

there other spells that don't work like

http://www.wowhead.com/spell=72412 doesn't work with

http://www.wowhead.com/spell=20375

when the ring procs, it will immediatly cancel "Seal of Command" and if u activate during the ring proc SoC it will overwrite the ring proc:P

with respect,

Axel

[Forusim]

Does this work as intended?

[Schmoozerd]

no, this has to be rewritten (if still needed), because of Laise's new aura system (which by the way fixed some stacking problems)

[Hundekuchen]

At time i'm very busy, do you have a link to "Laise's new aura"?

[michalpolko]

You can find it implemented in the latest official revision of MaNGOS

[Hundekuchen]

the bug is still there, I have updated the code and add a new line to improve the check

[VladimirMangos]

We will not in any cases adding check base at spell name. This is slow check and not work always becase some spell ranks have different names. I understand some porblems existing with current check. But suggested way not proper sollution.

[Hundekuchen]

I understand, because of that I delete the part of name check and create better check.

I tested it with a lot of spells, and not everything works, but now it work much better as before

[Hundekuchen]

bumb, can someone test the new version