Changeset 87

Timestamp:

11/19/08 13:33:03 (17 years ago)

Author:

yumileroy

Message:

[svn] Try to remove the big hack in SpellMgr::IsNoStackSpellDueToSpell?. Not sure if this works.

Original author: megamage
Date: 2008-10-21 11:22:12-05:00

Files:

• trunk/src/game/SpellMgr.cpp (modified) (2 diffs)

trunk/src/game/SpellMgr.cpp

@@ -1034 +1034 @@
         return false;
 
-    if(spellInfo_1->Id == spellId_2)
-        return false;
+    if(spellInfo_1->Id == spellId_2) //checked before 
+        return false;
+
+    if(spellInfo_1->SpellFamilyName && spellInfo_1->SpellFamilyName == spellInfo_2->SpellFamilyName) //resurrection sickness
+    {
+        if(spellInfo_1->SpellFamilyFlags == spellInfo_2->SpellFamilyFlags)
+            return true;
+        //Corruption & Seed of corruption
+        if(spellInfo_1->SpellFamilyName == SPELLFAMILY_WARLOCK)
+            if( spellInfo_1->SpellIconID == 313 && spellInfo_2->SpellIconID == 1932 ||
+                spellInfo_2->SpellIconID == 313 && spellInfo_1->SpellIconID == 1932 )
+                if(spellInfo_1->SpellVisual != 0 && spellInfo_2->SpellVisual != 0)
+                    return true;                        // can't be stacked
+    }
 
     //I think we don't check this correctly because i need a exception for spell:
     //72,11327,18461...(called from 1856,1857...) Call Aura 16,31, after trigger another spell who call aura 77 and 77 remove 16 and 31, this should not happen.
-    if(spellInfo_2->SpellFamilyFlags == 2048)
-        return false;
+    //if(spellInfo_2->SpellFamilyFlags == 2048)
+    //    return false;
 
     // Resurrection sickness
-    if((spellInfo_1->Id == SPELL_ID_PASSIVE_RESURRECTION_SICKNESS) != (spellInfo_2->Id==SPELL_ID_PASSIVE_RESURRECTION_SICKNESS))
-        return false;
+    //if((spellInfo_1->Id == SPELL_ID_PASSIVE_RESURRECTION_SICKNESS) != (spellInfo_2->Id==SPELL_ID_PASSIVE_RESURRECTION_SICKNESS))
+    //    return false;
 
     // Specific spell family spells
-    switch(spellInfo_1->SpellFamilyName)
+    /*switch(spellInfo_1->SpellFamilyName)
     {
         case SPELLFAMILY_GENERIC:
@@ -1347 +1359 @@
 
     if (IsRankSpellDueToSpell(spellInfo_1, spellId_2))
-        return true;
-
-    if (spellInfo_1->SpellIconID != spellInfo_2->SpellIconID ||
-        !spellInfo_1->SpellIconID)
+        return true;*/
+
+    if (spellInfo_1->SpellIconID != spellInfo_2->SpellIconID 
+        || !spellInfo_1->SpellIconID)
         return false;