[8234] Implement support for explcit discovery spell 64323. Also better checks at loading. Author: VladimirMangos

--HG--
branch : trunk

3 files changed, 22 insertions, 2 deletions

diff --git a/src/game/SkillDiscovery.cpp b/src/game/SkillDiscovery.cpp
index de441168576..686fcf889b9 100644
--- a/src/game/SkillDiscovery.cpp
+++ b/src/game/SkillDiscovery.cpp
@@ -106,7 +106,9 @@ void LoadSkillDiscoveryTable()
             {
                 if (reportedReqSpells.count(reqSkillOrSpell)==0)
                 {
-                    sLog.outErrorDb("Spell (ID: %u) not have have MECHANIC_DISCOVERY (28) value in Mechanic field in spell.dbc and not 100%% chance random discovery ability but listed for spellId %u (and maybe more) in `skill_discovery_template` table",reqSkillOrSpell,spellId);
+                    sLog.outErrorDb("Spell (ID: %u) not have MECHANIC_DISCOVERY (28) value in Mechanic field in spell.dbc"
+                        " and not 100%% chance random discovery ability but listed for spellId %u (and maybe more) in `skill_discovery_template` table",
+                        reqSkillOrSpell,spellId);
                     reportedReqSpells.insert(reqSkillOrSpell);
                 }
                 continue;
@@ -145,6 +147,21 @@ void LoadSkillDiscoveryTable()
     sLog.outString( ">> Loaded %u skill discovery definitions", count );
     if(!ssNonDiscoverableEntries.str().empty())
         sLog.outErrorDb("Some items can't be successfully discovered: have in chance field value < 0.000001 in `skill_discovery_template` DB table . List:\n%s",ssNonDiscoverableEntries.str().c_str());
+
+    // report about empty data for explicit discovery spells
+    for(uint32 spell_id = 1; spell_id < sSpellStore.GetNumRows(); ++spell_id)
+    {
+        SpellEntry const* spellEntry = sSpellStore.LookupEntry(spell_id);
+        if(!spellEntry)
+            continue;
+
+        // skip not explicit discovery spells
+        if (!IsExplicitDiscoverySpell(spellEntry))
+            continue;
+
+        if(SkillDiscoveryStore.find(spell_id)==SkillDiscoveryStore.end())
+            sLog.outErrorDb("Spell (ID: %u) is 100%% chance random discovery ability but not have data in `skill_discovery_template` table",spell_id);
+    }
 }
 
 uint32 GetExplicitDiscoverySpell(uint32 spellId, Player* player)
diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp
index 4bf42f13ac3..592145354d5 100644
--- a/src/game/SpellEffects.cpp
+++ b/src/game/SpellEffects.cpp
@@ -5089,6 +5089,7 @@ void Spell::EffectScriptEffect(uint32 effIndex)
                 case 61177:                                 // Northrend Inscription Research
                 case 61288:                                 // Minor Inscription Research
                 case 61756:                                 // Northrend Inscription Research (FAST QA VERSION)
+                case 64323:                                 // Book of Glyph Mastery
                 {
                     if(m_caster->GetTypeId() != TYPEID_PLAYER)
                         return;
diff --git a/src/game/SpellMgr.h b/src/game/SpellMgr.h
index 8315fdc2965..db1473bcb3b 100644
--- a/src/game/SpellMgr.h
+++ b/src/game/SpellMgr.h
@@ -224,7 +224,9 @@ inline bool IsElementalShield(SpellEntry const *spellInfo)
 
 inline bool IsExplicitDiscoverySpell(SpellEntry const *spellInfo)
 {
-    return spellInfo->Effect[0]==SPELL_EFFECT_CREATE_RANDOM_ITEM && spellInfo->Effect[1]==SPELL_EFFECT_SCRIPT_EFFECT;
+    return spellInfo->Effect[0] == SPELL_EFFECT_CREATE_RANDOM_ITEM
+        && spellInfo->Effect[1] == SPELL_EFFECT_SCRIPT_EFFECT
+        || spellInfo->Id == 64323;                          // Book of Glyph Mastery (Effect0==SPELL_EFFECT_SCRIPT_EFFECT without any other data)
 }
 
 inline bool IsLootCraftingSpell(SpellEntry const *spellInfo)