Changeset 253 for trunk/src/game/SpellMgr.cpp

Timestamp:

11/19/08 13:51:05 (17 years ago)

Author:

yumileroy

Message:

Backed out changeset 835660b317dc

Original author: KingPin? <KingPin?@Trinitycore.org>
Date: 2008-11-17 22:07:21-06:00

Files:

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

trunk/src/game/SpellMgr.cpp

@@ -99 +99 @@
     return (spellInfo->Attributes & SPELL_ATTR_PASSIVE) != 0;
 }
-/*not used for now so commented out
+
 bool IsNoStackAuraDueToAura(uint32 spellId_1, uint32 effIndex_1, uint32 spellId_2, uint32 effIndex_2)
 {
@@ -108 +108 @@
 
     if (spellInfo_1->Effect[effIndex_1] != spellInfo_2->Effect[effIndex_2] ||
+        spellInfo_1->EffectItemType[effIndex_1] != spellInfo_2->EffectItemType[effIndex_2] ||
         spellInfo_1->EffectMiscValue[effIndex_1] != spellInfo_2->EffectMiscValue[effIndex_2] ||
         spellInfo_1->EffectApplyAuraName[effIndex_1] != spellInfo_2->EffectApplyAuraName[effIndex_2])
@@ -113 +114 @@
 
     return true;
-}*/
+}
 
 int32 CompareAuraRanks(uint32 spellId_1, uint32 effIndex_1, uint32 spellId_2, uint32 effIndex_2)
@@ -244 +245 @@
         case SPELL_CURSE:
         case SPELL_ASPECT:
-        case SPELL_POSITIVE_SHOUT:
-        case SPELL_JUDGEMENT:
-        case SPELL_WARLOCK_CORRUPTION:
-            return spellSpec1==spellSpec2;
-        default:
-            return false;
-    }
-}
-
-bool IsSingleFromSpellSpecificPerTarget(uint32 spellSpec1,uint32 spellSpec2)
-{
-    switch(spellSpec1)
-    {
         case SPELL_TRACKER:
         case SPELL_WARLOCK_ARMOR:
@@ -262 +250 @@
         case SPELL_ELEMENTAL_SHIELD:
         case SPELL_MAGE_POLYMORPH:
+        case SPELL_POSITIVE_SHOUT:
+        case SPELL_JUDGEMENT:
+        case SPELL_WARLOCK_CORRUPTION:
             return spellSpec1==spellSpec2;
         case SPELL_BATTLE_ELIXIR:
@@ -1040 +1031 @@
 }
 
-bool SpellMgr::IsNoStackSpellDueToSpell(uint32 spellId_1, uint32 spellId_2, bool isFromTheSameCaster ) const
-{
+bool SpellMgr::IsNoStackSpellDueToSpell(uint32 spellId_1, uint32 spellId_2) const
+{
+    if(spellId_1 == spellId_2) // auras due to the same spell
+        return false;
+
     SpellEntry const *spellInfo_1 = sSpellStore.LookupEntry(spellId_1);
     SpellEntry const *spellInfo_2 = sSpellStore.LookupEntry(spellId_2);
@@ -1047 +1041 @@
     if(!spellInfo_1 || !spellInfo_2)
         return false;
-
-    SpellSpecific spellId_spec_1 = GetSpellSpecific(spellId_1);
-    SpellSpecific spellId_spec_2 = GetSpellSpecific(spellId_2);
-    if (spellId_spec_1 && spellId_spec_2)
-        if (IsSingleFromSpellSpecificPerTarget(spellId_spec_1,spellId_spec_2)
-            || (IsSingleFromSpellSpecificPerCaster(spellId_spec_1,spellId_spec_2) && isFromTheSameCaster))
-            return true;
 
     if(spellInfo_1->SpellFamilyName != spellInfo_2->SpellFamilyName)
@@ -1064 +1051 @@
             return false;
     }
-
-    //if both elixirs are not battle/guardian/potions/flasks then always stack
-    else if ((spellInfo_1->SpellFamilyName == SPELLFAMILY_POTION)
-        &&(spellId_spec_1 || spellId_spec_2))
-        return false;
-
     else if (spellInfo_1->SpellFamilyFlags != spellInfo_2->SpellFamilyFlags)
         return false;
 
     for(uint32 i = 0; i < 3; ++i)
-    {
-        if(spellInfo_1->Effect[i] != spellInfo_2->Effect[i])
+        if(spellInfo_1->Effect[i] != spellInfo_2->Effect[i]
+            || spellInfo_1->EffectApplyAuraName[i] != spellInfo_2->EffectApplyAuraName[i])
             return false;
-        if (spellInfo_1->EffectApplyAuraName[i] || spellInfo_2->EffectApplyAuraName[i])
-        {
-            if(spellInfo_1->EffectApplyAuraName[i] != spellInfo_2->EffectApplyAuraName[i]
-                || spellInfo_1->EffectMiscValue[i] != spellInfo_2->EffectMiscValue[i])
-                    // need itemtype check? need to find an example
-                return false;
-            else if (!isFromTheSameCaster)
-                switch(spellInfo_1->EffectApplyAuraName[i])
-                    {
-                    //spells with these auras from different casters will stack
-                        case SPELL_AURA_PERIODIC_DAMAGE:
-                        case SPELL_AURA_PERIODIC_HEAL:
-                        case SPELL_AURA_PERIODIC_TRIGGER_SPELL:
-                        case SPELL_AURA_PERIODIC_ENERGIZE:
-                        case SPELL_AURA_PERIODIC_MANA_LEECH:
-                        case SPELL_AURA_PERIODIC_LEECH:
-                        //exception for shaman positive totems with these auras
-                        if ((spellInfo_1->SpellFamilyName != SPELLFAMILY_SHAMAN)
-                            ||(spellInfo_1->Effect[i]!=SPELL_AURA_MOD_INCREASE_ENERGY))
-                            return false;
-                        default:
-                            break;
-                    }
-        }
-    }
+
     return true;
 }