mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-16 13:37:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[8014] Fixes and cleanup in error messages at skill_discovery_template loading.

Browse source 
Signed-off-by: VladimirMangos <vladimir@getmangos.com>
This commit is contained in:
NoFantasy 2009-06-14 19:30:29 +04:00 • committed by VladimirMangos
parent 25140ea3cc
commit 2377917176
2 changed files with 100 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

64
src/game/SkillDiscovery.cpp
View file

@ -56,9 +56,15 @@ void LoadSkillDiscoveryTable()
if (result) if (result)
{ {
sLog.outString();
sLog.outString( ">> Loaded 0 skill discovery definitions. DB table `skill_discovery_template` is empty." );
return;
}
barGoLink bar(result->GetRowCount()); barGoLink bar(result->GetRowCount());
std::ostringstream ssNonDiscoverableEntries; std::ostringstream ssNonDiscoverableEntries;
std::set<uint32> reportedReqSpells;
do do
{ {
@ -70,28 +76,36 @@ void LoadSkillDiscoveryTable()
uint32 reqSkillValue = fields[2].GetInt32(); uint32 reqSkillValue = fields[2].GetInt32();
float chance = fields[3].GetFloat(); float chance = fields[3].GetFloat();
if( chance <= 0 ) // chance if (chance <= 0) // chance
{ {
ssNonDiscoverableEntries << "spellId = " << spellId << " reqSkillOrSpell = " << reqSkillOrSpell ssNonDiscoverableEntries << "spellId = " << spellId << " reqSkillOrSpell = " << reqSkillOrSpell
<< " reqSkillValue = " << reqSkillValue << " chance = " << chance << "(chance problem)\n"; << " reqSkillValue = " << reqSkillValue << " chance = " << chance << "(chance problem)\n";
continue; continue;
} }
if(reqSkillOrSpell > 0) // spell case if (reqSkillOrSpell > 0) // spell case
{ {
SpellEntry const* spellEntry = sSpellStore.LookupEntry(reqSkillOrSpell); SpellEntry const* reqSpellEntry = sSpellStore.LookupEntry(reqSkillOrSpell);
if( !spellEntry ) if (!reqSpellEntry)
{
if(reportedReqSpells.count(reqSkillOrSpell)==0)
{ {
sLog.outErrorDb("Spell (ID: %u) have not existed spell (ID: %i) in `reqSpell` field in `skill_discovery_template` table",spellId,reqSkillOrSpell); sLog.outErrorDb("Spell (ID: %u) have not existed spell (ID: %i) in `reqSpell` field in `skill_discovery_template` table",spellId,reqSkillOrSpell);
reportedReqSpells.insert(reqSkillOrSpell);
}
continue; continue;
} }
// mechanic discovery // mechanic discovery
if (spellEntry->Mechanic != MECHANIC_DISCOVERY && if (reqSpellEntry->Mechanic != MECHANIC_DISCOVERY &&
// explicit discovery ability // explicit discovery ability
!IsExplicitDiscoverySpell(spellEntry)) !IsExplicitDiscoverySpell(reqSpellEntry))
{ {
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 in `skill_discovery_template` table",spellId); 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);
reportedReqSpells.insert(reqSkillOrSpell);
}
continue; continue;
} }
@ -128,12 +142,6 @@ void LoadSkillDiscoveryTable()
sLog.outString( ">> Loaded %u skill discovery definitions", count ); sLog.outString( ">> Loaded %u skill discovery definitions", count );
if(!ssNonDiscoverableEntries.str().empty()) 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()); 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());
}
else
{
sLog.outString();
sLog.outString( ">> Loaded 0 skill discovery definitions. DB table `skill_discovery_template` is empty." );
}
} }
uint32 GetExplicitDiscoverySpell(uint32 spellId, Player* player) uint32 GetExplicitDiscoverySpell(uint32 spellId, Player* player)
@ -141,7 +149,7 @@ uint32 GetExplicitDiscoverySpell(uint32 spellId, Player* player)
// explicit discovery spell chances (always success if case exist) // explicit discovery spell chances (always success if case exist)
// in this case we have both skill and spell // in this case we have both skill and spell
SkillDiscoveryMap::const_iterator tab = SkillDiscoveryStore.find(spellId); SkillDiscoveryMap::const_iterator tab = SkillDiscoveryStore.find(spellId);
if(tab == SkillDiscoveryStore.end()) if (tab == SkillDiscoveryStore.end())
return 0; return 0;
SkillLineAbilityMap::const_iterator lower = spellmgr.GetBeginSkillLineAbilityMap(spellId); SkillLineAbilityMap::const_iterator lower = spellmgr.GetBeginSkillLineAbilityMap(spellId);
@ -150,8 +158,8 @@ uint32 GetExplicitDiscoverySpell(uint32 spellId, Player* player)
float full_chance = 0; float full_chance = 0;
for(SkillDiscoveryList::const_iterator item_iter = tab->second.begin(); item_iter != tab->second.end(); ++item_iter) for(SkillDiscoveryList::const_iterator item_iter = tab->second.begin(); item_iter != tab->second.end(); ++item_iter)
if(item_iter->reqSkillValue <= skillvalue) if (item_iter->reqSkillValue <= skillvalue)
if(!player->HasSpell(item_iter->spellId)) if (!player->HasSpell(item_iter->spellId))
full_chance += item_iter->chance; full_chance += item_iter->chance;
float rate = full_chance / 100.0f; float rate = full_chance / 100.0f;
@ -159,13 +167,13 @@ uint32 GetExplicitDiscoverySpell(uint32 spellId, Player* player)
for(SkillDiscoveryList::const_iterator item_iter = tab->second.begin(); item_iter != tab->second.end(); ++item_iter) for(SkillDiscoveryList::const_iterator item_iter = tab->second.begin(); item_iter != tab->second.end(); ++item_iter)
{ {
if(item_iter->reqSkillValue > skillvalue) if (item_iter->reqSkillValue > skillvalue)
continue; continue;
if(player->HasSpell(item_iter->spellId)) if (player->HasSpell(item_iter->spellId))
continue; continue;
if(item_iter->chance > roll) if (item_iter->chance > roll)
return item_iter->spellId; return item_iter->spellId;
roll -= item_iter->chance; roll -= item_iter->chance;
@ -181,31 +189,31 @@ uint32 GetSkillDiscoverySpell(uint32 skillId, uint32 spellId, Player* player)
// check spell case // check spell case
SkillDiscoveryMap::const_iterator tab = SkillDiscoveryStore.find(spellId); SkillDiscoveryMap::const_iterator tab = SkillDiscoveryStore.find(spellId);
if(tab != SkillDiscoveryStore.end()) if (tab != SkillDiscoveryStore.end())
{ {
for(SkillDiscoveryList::const_iterator item_iter = tab->second.begin(); item_iter != tab->second.end(); ++item_iter) for(SkillDiscoveryList::const_iterator item_iter = tab->second.begin(); item_iter != tab->second.end(); ++item_iter)
{ {
if( roll_chance_f(item_iter->chance * sWorld.getRate(RATE_SKILL_DISCOVERY)) if (roll_chance_f(item_iter->chance * sWorld.getRate(RATE_SKILL_DISCOVERY)) &&
&& item_iter->reqSkillValue <= skillvalue item_iter->reqSkillValue <= skillvalue &&
&& !player->HasSpell(item_iter->spellId) ) !player->HasSpell(item_iter->spellId))
return item_iter->spellId; return item_iter->spellId;
} }
return 0; return 0;
} }
if(!skillId) if (!skillId)
return 0; return 0;
// check skill line case // check skill line case
tab = SkillDiscoveryStore.find(-(int32)skillId); tab = SkillDiscoveryStore.find(-(int32)skillId);
if(tab != SkillDiscoveryStore.end()) if (tab != SkillDiscoveryStore.end())
{ {
for(SkillDiscoveryList::const_iterator item_iter = tab->second.begin(); item_iter != tab->second.end(); ++item_iter) for(SkillDiscoveryList::const_iterator item_iter = tab->second.begin(); item_iter != tab->second.end(); ++item_iter)
{ {
if( roll_chance_f(item_iter->chance * sWorld.getRate(RATE_SKILL_DISCOVERY)) if (roll_chance_f(item_iter->chance * sWorld.getRate(RATE_SKILL_DISCOVERY)) &&
&& item_iter->reqSkillValue <= skillvalue item_iter->reqSkillValue <= skillvalue &&
&& !player->HasSpell(item_iter->spellId) ) !player->HasSpell(item_iter->spellId))
return item_iter->spellId; return item_iter->spellId;
} }

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "8013" #define REVISION_NR "8014"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__