server/mangos
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Remove Remnants of Two obsolete tables: npc_trainer_template & npc_vendor_template"

Browse Source 
This reverts commit 6fb855fda6e18856d22a61908d34175e0be81a35.
This commit is contained in:
Antz 2019-01-07 22:28:54 +00:00
parent 736328ad71
commit c9ec51161a
5 changed files with 82 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/game/ChatCommands/Level3.cpp
View File

@ -579,6 +579,10 @@ bool ChatHandler::HandleReloadNpcTextCommand(char* /*args*/)
bool ChatHandler::HandleReloadNpcTrainerCommand(char* /*args*/)
{
sLog.outString("Re-Loading `npc_trainer_template` Table!");
sObjectMgr.LoadTrainerTemplates();
SendGlobalSysMessage("DB table `npc_trainer_template` reloaded.", SEC_MODERATOR);
sLog.outString("Re-Loading `npc_trainer` Table!");
sObjectMgr.LoadTrainers();
SendGlobalSysMessage("DB table `npc_trainer` reloaded.", SEC_MODERATOR);
@ -588,6 +592,10 @@ bool ChatHandler::HandleReloadNpcTrainerCommand(char* /*args*/)
bool ChatHandler::HandleReloadNpcVendorCommand(char* /*args*/)
{
// not safe reload vendor template tables independent...
sLog.outString("Re-Loading `npc_vendor_template` Table!");
sObjectMgr.LoadVendorTemplates();
SendGlobalSysMessage("DB table `npc_vendor_template` reloaded.", SEC_MODERATOR);
sLog.outString("Re-Loading `npc_vendor` Table!");
sObjectMgr.LoadVendors();
SendGlobalSysMessage("DB table `npc_vendor` reloaded.", SEC_MODERATOR);

65
src/game/Object/ObjectMgr.cpp
View File

@ -792,7 +792,7 @@ void ObjectMgr::LoadCreatureItemTemplates()
}
sLog.outString(">> Loaded %u creature item template", sEquipmentStorageItem.GetRecordCount());
sLog.outString();
sLog.outString();
}
void ObjectMgr::LoadCreatureClassLvlStats()
@ -7994,6 +7994,41 @@ void ObjectMgr::LoadTrainers(char const* tableName, bool isTemplates)
sLog.outString();
}
void ObjectMgr::LoadTrainerTemplates()
{
LoadTrainers("npc_trainer_template", true);
// post loading check
std::set<uint32> trainer_ids;
bool hasErrored = false;
for (CacheTrainerSpellMap::const_iterator tItr = m_mCacheTrainerTemplateSpellMap.begin(); tItr != m_mCacheTrainerTemplateSpellMap.end(); ++tItr)
{ trainer_ids.insert(tItr->first); }
for (uint32 i = 1; i < sCreatureStorage.GetMaxEntry(); ++i)
{
if (CreatureInfo const* cInfo = sCreatureStorage.LookupEntry<CreatureInfo>(i))
{
if (cInfo->TrainerTemplateId)
{
if (m_mCacheTrainerTemplateSpellMap.find(cInfo->TrainerTemplateId) != m_mCacheTrainerTemplateSpellMap.end())
{ trainer_ids.erase(cInfo->TrainerTemplateId); }
else
{
sLog.outErrorDb("Creature (Entry: %u) has TrainerTemplateId = %u for nonexistent trainer template", cInfo->Entry, cInfo->TrainerTemplateId);
hasErrored = true;
}
}
}
}
for (std::set<uint32>::const_iterator tItr = trainer_ids.begin(); tItr != trainer_ids.end(); ++tItr)
{ sLog.outErrorDb("Table `npc_trainer_template` has trainer template %u not used by any trainers ", *tItr); }
if (hasErrored || !trainer_ids.empty()) // Append extra line in case of reported errors
{ sLog.outString(); }
}
void ObjectMgr::LoadVendors(char const* tableName, bool isTemplates)
{
CacheVendorItemMap& vendorList = isTemplates ? m_mCacheVendorTemplateItemMap : m_mCacheVendorItemMap;
@ -8047,6 +8082,34 @@ void ObjectMgr::LoadVendors(char const* tableName, bool isTemplates)
}
void ObjectMgr::LoadVendorTemplates()
{
LoadVendors("npc_vendor_template", true);
// post loading check
std::set<uint32> vendor_ids;
for (CacheVendorItemMap::const_iterator vItr = m_mCacheVendorTemplateItemMap.begin(); vItr != m_mCacheVendorTemplateItemMap.end(); ++vItr)
{ vendor_ids.insert(vItr->first); }
for (uint32 i = 1; i < sCreatureStorage.GetMaxEntry(); ++i)
{
if (CreatureInfo const* cInfo = sCreatureStorage.LookupEntry<CreatureInfo>(i))
{
if (cInfo->VendorTemplateId)
{
if (m_mCacheVendorTemplateItemMap.find(cInfo->VendorTemplateId) != m_mCacheVendorTemplateItemMap.end())
{ vendor_ids.erase(cInfo->VendorTemplateId); }
else
sLog.outErrorDb("Creature (Entry: %u) has VendorTemplateId = %u for nonexistent vendor template", cInfo->Entry, cInfo->VendorTemplateId);
}
}
}
for (std::set<uint32>::const_iterator vItr = vendor_ids.begin(); vItr != vendor_ids.end(); ++vItr)
{ sLog.outErrorDb("Table `npc_vendor_template` has vendor template %u not used by any vendors ", *vItr); }
}
void ObjectMgr::LoadGossipMenu(std::set<uint32>& gossipScriptSet)
{
m_mGossipMenusMap.clear();

2
src/game/Object/ObjectMgr.h
View File

@ -706,10 +706,12 @@ class ObjectMgr
void LoadGossipMenus();
void LoadVendorTemplates();
void LoadVendors()
{
LoadVendors("npc_vendor", false);
}
void LoadTrainerTemplates();
void LoadTrainers()
{
LoadTrainers("npc_trainer", false);

7
src/game/WorldHandlers/NPCHandler.cpp
View File

@ -288,13 +288,18 @@ void WorldSession::HandleTrainerBuySpellOpcode(WorldPacket& recv_data)
// check present spell in trainer spell list
TrainerSpellData const* cSpells = unit->GetTrainerSpells();
TrainerSpellData const* tSpells = unit->GetTrainerTemplateSpells();
if (!cSpells)
if (!cSpells && !tSpells)
{ return; }
// Try find spell in npc_trainer
TrainerSpell const* trainer_spell = cSpells ? cSpells->Find(spellId) : NULL;
// Not found, try find in npc_trainer_template
if (!trainer_spell && tSpells)
{ trainer_spell = tSpells->Find(spellId); }
// Not found anywhere, cheating?
if (!trainer_spell)
{ return; }

2
src/game/WorldHandlers/World.cpp
View File

@ -1262,9 +1262,11 @@ void World::SetInitialWorldSettings()
sObjectMgr.LoadGossipMenus();
sLog.outString("Loading Vendors...");
sObjectMgr.LoadVendorTemplates(); // must be after load ItemTemplate
sObjectMgr.LoadVendors(); // must be after load CreatureTemplate, VendorTemplate, and ItemTemplate
sLog.outString("Loading Trainers...");
sObjectMgr.LoadTrainerTemplates(); // must be after load CreatureTemplate
sObjectMgr.LoadTrainers(); // must be after load CreatureTemplate, TrainerTemplate
sLog.outString("Loading Waypoint scripts..."); // before loading from creature_movement