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

Timestamp:

11/19/08 13:38:14 (17 years ago)

Author:

yumileroy

Message:

[svn] Fix a compile error about M_PI_2.
Update Felmyst script to test new setActive function.
Fix the bug that priest's fear is unbreakable (dirty hack before find the correct way).
(some unfinished unused content included, just ignore them, will finish them later)

Original author: megamage
Date: 2008-10-27 10:57:53-05:00

Files:

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

trunk/src/game/SpellMgr.cpp

@@ -1970 +1970 @@
 
 // set data in core for now
-void SpellMgr::LoadSpellExtraInfo()
-{
-    SpellExtraInfo info;
-    info.info[SPELL_EXTRA_INFO_CONE_TYPE] = 0;
-    info.info[SPELL_EXTRA_INFO_MAX_TARGETS] = 0;
-    info.info[SPELL_EXTRA_INFO_SHARE_DAMAGE] = 0;
-
-    info.info[SPELL_EXTRA_INFO_CONE_TYPE] = 1;
-    SpellEntry const* tempSpell;
-    for(uint32 i = 0; i < GetSpellStore()->GetNumRows(); ++i)
-    {
-        tempSpell = GetSpellStore()->LookupEntry(i);
-        if(tempSpell && tempSpell->SpellVisual == 3879)
-            mSpellExtraInfoMap[tempSpell->Id] = info;
-    }
-    info.info[SPELL_EXTRA_INFO_CONE_TYPE] = 2;
-    mSpellExtraInfoMap[26029] = info; // dark glare
-    mSpellExtraInfoMap[37433] = info; // spout
-    mSpellExtraInfoMap[43140] = info; // flame breath
-    mSpellExtraInfoMap[43215] = info; // flame breath
-    info.info[SPELL_EXTRA_INFO_CONE_TYPE] = 0;
-
-    info.info[SPELL_EXTRA_INFO_SHARE_DAMAGE] = 1;
+void SpellMgr::LoadSpellExtraAttr()
+{
+    SpellExtraAttribute tempAttr;
+    tempAttr.attr[SPELL_EXTRA_ATTR_CONE_TYPE] = 0;
+    tempAttr.attr[SPELL_EXTRA_ATTR_MAX_TARGETS] = 0;
+    tempAttr.attr[SPELL_EXTRA_ATTR_SHARE_DAMAGE] = 0;
+
+    tempAttr.attr[SPELL_EXTRA_ATTR_CONE_TYPE] = 1;
+    {
+        SpellEntry const* tempSpell;
+        for(uint32 i = 0; i < GetSpellStore()->GetNumRows(); ++i)
+        {
+            tempSpell = GetSpellStore()->LookupEntry(i);
+            if(tempSpell && tempSpell->SpellVisual == 3879)
+                mSpellExtraAttrMap[tempSpell->Id] = tempAttr;
+        }
+    }
+    tempAttr.attr[SPELL_EXTRA_ATTR_CONE_TYPE] = 2;
+    mSpellExtraAttrMap[26029] = tempAttr; // dark glare
+    mSpellExtraAttrMap[37433] = tempAttr; // spout
+    mSpellExtraAttrMap[43140] = tempAttr; // flame breath
+    mSpellExtraAttrMap[43215] = tempAttr; // flame breath
+    tempAttr.attr[SPELL_EXTRA_ATTR_CONE_TYPE] = 0;
+
+    tempAttr.attr[SPELL_EXTRA_ATTR_SHARE_DAMAGE] = 1;
     for(uint32 i = 0; i < 46000; ++i)
     {
@@ -2005 +2007 @@
             case 42384:                             // Brutal Swipe
             case 45150:                             // Meteor Slash
-                mSpellExtraInfoMap[i] = info;
+                mSpellExtraAttrMap[i] = tempAttr;
                 break;
             default:
@@ -2011 +2013 @@
         }
     }
-    info.info[SPELL_EXTRA_INFO_SHARE_DAMAGE] = 0;
-
-    info.info[SPELL_EXTRA_INFO_MAX_TARGETS] = 1;
+    tempAttr.attr[SPELL_EXTRA_ATTR_SHARE_DAMAGE] = 0;
+
+    tempAttr.attr[SPELL_EXTRA_ATTR_MAX_TARGETS] = 1;
     for(uint32 i = 0; i < 46000; ++i)
     {
@@ -2022 +2024 @@
             case 31347: // Doom
             case 41635: // Prayer of Mending
-                mSpellExtraInfoMap[i] = info;
+                mSpellExtraAttrMap[i] = tempAttr;
                 break;
             default:
@@ -2028 +2030 @@
         }
     }
-    info.info[SPELL_EXTRA_INFO_MAX_TARGETS] = 3;
-    mSpellExtraInfoMap[41376] = info;   //Spite
-    info.info[SPELL_EXTRA_INFO_MAX_TARGETS] = 0;
+    tempAttr.attr[SPELL_EXTRA_ATTR_MAX_TARGETS] = 3;
+    mSpellExtraAttrMap[41376] = tempAttr;   //Spite
+    tempAttr.attr[SPELL_EXTRA_ATTR_MAX_TARGETS] = 0;
+
+    //hack here, only for those strange exceptions!
+    // Psychic Scream
+    SpellEntry *tempSpell;
+    if(tempSpell = (SpellEntry*)GetSpellStore()->LookupEntry(8122))
+        tempSpell->AttributesEx |= SPELL_ATTR_BREAKABLE_BY_DAMAGE;
+    if(tempSpell = (SpellEntry*)GetSpellStore()->LookupEntry(8124))
+        tempSpell->AttributesEx |= SPELL_ATTR_BREAKABLE_BY_DAMAGE;
+    if(tempSpell = (SpellEntry*)GetSpellStore()->LookupEntry(10888))
+        tempSpell->AttributesEx |= SPELL_ATTR_BREAKABLE_BY_DAMAGE;
+    if(tempSpell = (SpellEntry*)GetSpellStore()->LookupEntry(10890))
+        tempSpell->AttributesEx |= SPELL_ATTR_BREAKABLE_BY_DAMAGE;
+}
+
+void SpellMgr::LoadSpellLinked()
+{
+    mSpellLinkedMap.clear();    // need for reload case
+    uint32 count = 0;
+
+    //                                                0       1
+    QueryResult *result = WorldDatabase.Query("SELECT spell0, spell1 FROM spell_linked_spell");
+    if( !result )
+    {
+        barGoLink bar( 1 );
+        bar.step();
+        sLog.outString();
+        sLog.outString( ">> Loaded %u spell pet auras", count );
+        return;
+    }
+
+    barGoLink bar( result->GetRowCount() );
+
+    do
+    {
+        Field *fields = result->Fetch();
+
+        bar.step();
+
+        uint16 spell = fields[0].GetUInt16();
+        uint16 pet = fields[1].GetUInt16();
+        uint16 aura = fields[2].GetUInt16();
+
+        SpellPetAuraMap::iterator itr = mSpellPetAuraMap.find(spell);
+        if(itr != mSpellPetAuraMap.end())
+        {
+            itr->second.AddAura(pet, aura);
+        }
+        else
+        {
+            SpellEntry const* spellInfo = sSpellStore.LookupEntry(spell);
+            if (!spellInfo)
+            {
+                sLog.outErrorDb("Spell %u listed in `spell_pet_auras` does not exist", spell);
+                continue;
+            }
+            int i = 0;
+            for(; i < 3; ++i)
+                if((spellInfo->Effect[i] == SPELL_EFFECT_APPLY_AURA &&
+                    spellInfo->EffectApplyAuraName[i] == SPELL_AURA_DUMMY) ||
+                    spellInfo->Effect[i] == SPELL_EFFECT_DUMMY)
+                    break;
+
+            if(i == 3)
+            {
+                sLog.outError("Spell %u listed in `spell_pet_auras` does not have dummy aura or dummy effect", spell);
+                continue;
+            }
+
+            SpellEntry const* spellInfo2 = sSpellStore.LookupEntry(aura);
+            if (!spellInfo2)
+            {
+                sLog.outErrorDb("Aura %u listed in `spell_pet_auras` does not exist", aura);
+                continue;
+            }
+
+            PetAura pa(pet, aura, spellInfo->EffectImplicitTargetA[i] == TARGET_PET, spellInfo->EffectBasePoints[i] + spellInfo->EffectBaseDice[i]);
+            mSpellPetAuraMap[spell] = pa;
+        }
+
+        ++count;
+    } while( result->NextRow() );
+
+    delete result;
+
+    sLog.outString();
+    sLog.outString( ">> Loaded %u spell pet auras", count );
 }