* [2008_10_19_01_mangos_spell_affect.sql] List fake data for last spells expected to listed in spell_affect and enable post-loading check for spell-affect data.

This commit is contained in:
VladimirMangos 2008-10-19 08:18:29 +04:00
parent 157134a0a7
commit d1ebd52390
4 changed files with 19 additions and 4 deletions

View file

@ -11533,6 +11533,7 @@ INSERT INTO `spell_affect` VALUES
(30086,0,0x0000071B804CC41A), (30086,0,0x0000071B804CC41A),
(30086,1,0x0000000000000400), (30086,1,0x0000000000000400),
(30086,2,0x0000000000000002), (30086,2,0x0000000000000002),
(30017,0,0x0000000000000000),
(30143,0,0x0000002000000000), (30143,0,0x0000002000000000),
(30144,0,0x0000002000000000), (30144,0,0x0000002000000000),
(30145,0,0x0000002000000000), (30145,0,0x0000002000000000),
@ -11543,6 +11544,7 @@ INSERT INTO `spell_affect` VALUES
(30248,0,0x0000200000000000), (30248,0,0x0000200000000000),
(30251,0,0x000010C000000125), (30251,0,0x000010C000000125),
(30256,0,0x000010C000000125), (30256,0,0x000010C000000125),
(30280,0,0x0000000000000000),
(30288,0,0x0000004000000001), (30288,0,0x0000004000000001),
(30289,0,0x0000004000000001), (30289,0,0x0000004000000001),
(30290,0,0x0000004000000001), (30290,0,0x0000004000000001),
@ -11739,6 +11741,7 @@ INSERT INTO `spell_affect` VALUES
(34492,1,0x0000000000000080), (34492,1,0x0000000000000080),
(34493,0,0x00004000000000C2), (34493,0,0x00004000000000C2),
(34493,1,0x0000000000000080), (34493,1,0x0000000000000080),
(34520,1,0x0000000000000000),
(34754,0,0x0000000400001800), (34754,0,0x0000000400001800),
(34936,0,0x0000004000000001), (34936,0,0x0000004000000001),
(34948,1,0x0000000000000020), (34948,1,0x0000000000000020),
@ -11827,6 +11830,7 @@ INSERT INTO `spell_affect` VALUES
(37505,0,0x0000000100000000), (37505,0,0x0000000100000000),
(37507,0,0x0000000000000800), (37507,0,0x0000000000000800),
(37508,0,0x0000000100061800), (37508,0,0x0000000100061800),
(37508,1,0x0000000000000000),
(37512,0,0x00000080000F0000), (37512,0,0x00000080000F0000),
(37513,0,0x0000000000000001), (37513,0,0x0000000000000001),
(37517,0,0x0000014D2A600CEF), (37517,0,0x0000014D2A600CEF),
@ -11944,6 +11948,7 @@ INSERT INTO `spell_affect` VALUES
(44300,0,0x0000800000000000), (44300,0,0x0000800000000000),
(44301,0,0x0000000001000000), (44301,0,0x0000000001000000),
(44302,0,0x0000000001000000), (44302,0,0x0000000001000000),
(44373,0,0x0000000000000000),
(46088,0,0x0000044000000000), (46088,0,0x0000044000000000),
(46090,0,0x0000000000000002), (46090,0,0x0000000000000002),
(46091,0,0x0000000000800000), (46091,0,0x0000000000800000),

View file

@ -0,0 +1,11 @@
DELETE FROM spell_affect WHERE entry IN (30017,30280,44373) AND effectId = 0;
INSERT INTO spell_affect (entry, effectId, SpellFamilyMask) VALUES
(30017,0,0x0000000000000000),
(30280,0,0x0000000000000000),
(44373,0,0x0000000000000000);
DELETE FROM spell_affect WHERE entry IN (34520,37508) AND effectId = 1;
INSERT INTO spell_affect (entry, effectId, SpellFamilyMask) VALUES
(34520,1,0x0000000000000000),
(37508,1,0x0000000000000000);

View file

@ -94,6 +94,7 @@ pkgdata_DATA = \
06760_mangos_creature_template.sql \ 06760_mangos_creature_template.sql \
2008_10_18_01_characters_characters.sql \ 2008_10_18_01_characters_characters.sql \
2008_10_18_02_mangos_spell_proc_event.sql \ 2008_10_18_02_mangos_spell_proc_event.sql \
2008_10_19_01_mangos_spell_affect.sql \
README README
## Additional files to include when running 'make dist' ## Additional files to include when running 'make dist'
@ -169,4 +170,5 @@ EXTRA_DIST = \
06760_mangos_creature_template.sql \ 06760_mangos_creature_template.sql \
2008_10_18_01_characters_characters.sql \ 2008_10_18_01_characters_characters.sql \
2008_10_18_02_mangos_spell_proc_event.sql \ 2008_10_18_02_mangos_spell_proc_event.sql \
2008_10_19_01_mangos_spell_affect.sql \
README README

View file

@ -743,8 +743,6 @@ void SpellMgr::LoadSpellAffects()
sLog.outString(); sLog.outString();
sLog.outString( ">> Loaded %u spell affect definitions", count ); sLog.outString( ">> Loaded %u spell affect definitions", count );
/*
// Commented for now, as it still produces many errors (still quite many spells miss spell_affect)
for (uint32 id = 0; id < sSpellStore.GetNumRows(); ++id) for (uint32 id = 0; id < sSpellStore.GetNumRows(); ++id)
{ {
SpellEntry const* spellInfo = sSpellStore.LookupEntry(id); SpellEntry const* spellInfo = sSpellStore.LookupEntry(id);
@ -765,10 +763,9 @@ void SpellMgr::LoadSpellAffects()
if(mSpellAffectMap.find((id<<8) + effectId) != mSpellAffectMap.end()) if(mSpellAffectMap.find((id<<8) + effectId) != mSpellAffectMap.end())
continue; continue;
sLog.outErrorDb("Spell %u (%s) misses spell_affect for effect %u",id,spellInfo->SpellName[sWorld.GetDBClang()], effectId); sLog.outErrorDb("Spell %u (%s) misses spell_affect for effect %u",id,spellInfo->SpellName[sWorld.GetDefaultDbcLocale()], effectId);
} }
} }
*/
} }
bool SpellMgr::IsAffectedBySpell(SpellEntry const *spellInfo, uint32 spellId, uint8 effectId, uint64 familyFlags) const bool SpellMgr::IsAffectedBySpell(SpellEntry const *spellInfo, uint32 spellId, uint8 effectId, uint64 familyFlags) const