pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-11 16:51:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Code] SkillCaps Global to Singleton Cleanup (#4933)

Browse Source
This commit is contained in:
Alex King 2025-06-22 14:13:16 -04:00 committed by GitHub
parent 940f97c9ae
commit 2f4a5b56dd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/skill_caps.h
View File

@ -16,12 +16,16 @@ public:
static int32_t GetSkillCapMaxLevel(uint8 class_id, EQ::skills::SkillType skill_id); static int32_t GetSkillCapMaxLevel(uint8 class_id, EQ::skills::SkillType skill_id);
SkillCaps *SetContentDatabase(Database *db); SkillCaps *SetContentDatabase(Database *db);
static SkillCaps* Instance()
{
static SkillCaps instance;
return &instance;
}
private: private:
Database *m_content_database{}; Database *m_content_database{};
std::map<uint64, SkillCapsRepository::SkillCaps> m_skill_caps = {}; std::map<uint64, SkillCapsRepository::SkillCaps> m_skill_caps = {};
}; };
extern SkillCaps skill_caps;
#endif //CODE_SKILL_CAPS_H #endif //CODE_SKILL_CAPS_H

2
world/client.cpp
View File

@ -2171,7 +2171,7 @@ void Client::SetClassStartingSkills(PlayerProfile_Struct *pp)
i == EQ::skills::SkillAlcoholTolerance || i == EQ::skills::SkillBindWound) i == EQ::skills::SkillAlcoholTolerance || i == EQ::skills::SkillBindWound)
continue; continue;
pp->skills[i] = skill_caps.GetSkillCap(pp->class_, (EQ::skills::SkillType)i, 1).cap; pp->skills[i] = SkillCaps::Instance()->GetSkillCap(pp->class_, (EQ::skills::SkillType)i, 1).cap;
} }
} }

3
world/main.cpp
View File

@ -91,7 +91,6 @@
#include "../common/repositories/character_parcels_repository.h" #include "../common/repositories/character_parcels_repository.h"
#include "../common/ip_util.h" #include "../common/ip_util.h"
SkillCaps skill_caps;
ZoneStore zone_store; ZoneStore zone_store;
ClientList client_list; ClientList client_list;
GroupLFPList LFPGroupList; GroupLFPList LFPGroupList;
@ -206,7 +205,7 @@ int main(int argc, char **argv)
->SetExpansionContext() ->SetExpansionContext()
->ReloadContentFlags(); ->ReloadContentFlags();
skill_caps.SetContentDatabase(&content_db)->LoadSkillCaps(); SkillCaps::Instance()->SetContentDatabase(&content_db)->LoadSkillCaps();
std::unique_ptr<EQ::Net::ServertalkServer> server_connection; std::unique_ptr<EQ::Net::ServertalkServer> server_connection;
server_connection = std::make_unique<EQ::Net::ServertalkServer>(); server_connection = std::make_unique<EQ::Net::ServertalkServer>();

2
world/zonelist.cpp
View File

@ -978,7 +978,7 @@ void ZSList::SendServerReload(ServerReload::Type type, uchar *packet)
} else if (type == ServerReload::Type::Rules) { } else if (type == ServerReload::Type::Rules) {
RuleManager::Instance()->LoadRules(&database, RuleManager::Instance()->GetActiveRuleset(), true); RuleManager::Instance()->LoadRules(&database, RuleManager::Instance()->GetActiveRuleset(), true);
} else if (type == ServerReload::Type::SkillCaps) { } else if (type == ServerReload::Type::SkillCaps) {
skill_caps.ReloadSkillCaps(); SkillCaps::Instance()->ReloadSkillCaps();
} else if (type == ServerReload::Type::ContentFlags) { } else if (type == ServerReload::Type::ContentFlags) {
content_service.SetExpansionContext()->ReloadContentFlags(); content_service.SetExpansionContext()->ReloadContentFlags();
} else if (type == ServerReload::Type::Logs) { } else if (type == ServerReload::Type::Logs) {

10
zone/bot.cpp
View File

@ -1242,7 +1242,7 @@ uint16 Bot::GetPrimarySkillValue() {
} }
uint16 Bot::MaxSkill(EQ::skills::SkillType skillid, uint16 class_, uint16 level) const { uint16 Bot::MaxSkill(EQ::skills::SkillType skillid, uint16 class_, uint16 level) const {
return skill_caps.GetSkillCap(class_, skillid, level).cap; return SkillCaps::Instance()->GetSkillCap(class_, skillid, level).cap;
} }
uint32 Bot::GetTotalATK() { uint32 Bot::GetTotalATK() {
@ -3575,7 +3575,7 @@ void Bot::Depop() {
RemoveAllAuras(); RemoveAllAuras();
Mob* bot_pet = GetPet(); Mob* bot_pet = GetPet();
if (bot_pet) { if (bot_pet) {
if (bot_pet->Charmed()) { if (bot_pet->Charmed()) {
bot_pet->BuffFadeByEffect(SE_Charm); bot_pet->BuffFadeByEffect(SE_Charm);
@ -7342,7 +7342,7 @@ void Bot::CalcBotStats(bool showtext) {
SetLevel(GetBotOwner()->GetLevel()); SetLevel(GetBotOwner()->GetLevel());
for (int sindex = 0; sindex <= EQ::skills::HIGHEST_SKILL; ++sindex) { for (int sindex = 0; sindex <= EQ::skills::HIGHEST_SKILL; ++sindex) {
skills[sindex] = skill_caps.GetSkillCap(GetClass(), (EQ::skills::SkillType)sindex, GetLevel()).cap; skills[sindex] = SkillCaps::Instance()->GetSkillCap(GetClass(), (EQ::skills::SkillType)sindex, GetLevel()).cap;
} }
taunt_timer.Start(1000); taunt_timer.Start(1000);
@ -11274,7 +11274,7 @@ void Bot::SetSpellTypePriority(uint16 spell_type, uint8 priority_type, uint16 pr
std::list<BotSpellTypeOrder> Bot::GetSpellTypesPrioritized(uint8 priority_type) { std::list<BotSpellTypeOrder> Bot::GetSpellTypesPrioritized(uint8 priority_type) {
std::list<BotSpellTypeOrder> cast_order; std::list<BotSpellTypeOrder> cast_order;
for (uint16 i = BotSpellTypes::START; i <= BotSpellTypes::END; i++) { for (uint16 i = BotSpellTypes::START; i <= BotSpellTypes::END; i++) {
BotSpellTypeOrder typeSettings = { BotSpellTypeOrder typeSettings = {
.spellType = i, .spellType = i,
@ -13463,4 +13463,4 @@ bool Bot::HasControllablePet(uint8 ranks_required) {
return GetClass() != Class::Enchanter || return GetClass() != Class::Enchanter ||
GetPet()->GetPetType() != petAnimation || GetPet()->GetPetType() != petAnimation ||
GetAA(aaAnimationEmpathy) >= ranks_required; GetAA(aaAnimationEmpathy) >= ranks_required;
} }

8
zone/client.cpp
View File

@ -3196,7 +3196,7 @@ bool Client::CanHaveSkill(EQ::skills::SkillType skill_id) const
skill_id = EQ::skills::Skill2HPiercing; skill_id = EQ::skills::Skill2HPiercing;
} }
return skill_caps.GetSkillCap(GetClass(), skill_id, RuleI(Character, MaxLevel)).cap > 0; return SkillCaps::Instance()->GetSkillCap(GetClass(), skill_id, RuleI(Character, MaxLevel)).cap > 0;
} }
uint16 Client::MaxSkill(EQ::skills::SkillType skill_id, uint8 class_id, uint8 level) const uint16 Client::MaxSkill(EQ::skills::SkillType skill_id, uint8 class_id, uint8 level) const
@ -3209,7 +3209,7 @@ uint16 Client::MaxSkill(EQ::skills::SkillType skill_id, uint8 class_id, uint8 le
skill_id = EQ::skills::Skill2HPiercing; skill_id = EQ::skills::Skill2HPiercing;
} }
return skill_caps.GetSkillCap(class_id, skill_id, level).cap; return SkillCaps::Instance()->GetSkillCap(class_id, skill_id, level).cap;
} }
uint8 Client::GetSkillTrainLevel(EQ::skills::SkillType skill_id, uint8 class_id) uint8 Client::GetSkillTrainLevel(EQ::skills::SkillType skill_id, uint8 class_id)
@ -3222,7 +3222,7 @@ uint8 Client::GetSkillTrainLevel(EQ::skills::SkillType skill_id, uint8 class_id)
skill_id = EQ::skills::Skill2HPiercing; skill_id = EQ::skills::Skill2HPiercing;
} }
return skill_caps.GetSkillTrainLevel(class_id, skill_id, RuleI(Character, MaxLevel)); return SkillCaps::Instance()->GetSkillTrainLevel(class_id, skill_id, RuleI(Character, MaxLevel));
} }
uint16 Client::GetMaxSkillAfterSpecializationRules(EQ::skills::SkillType skillid, uint16 maxSkill) uint16 Client::GetMaxSkillAfterSpecializationRules(EQ::skills::SkillType skillid, uint16 maxSkill)
@ -12099,7 +12099,7 @@ void Client::MaxSkills()
auto current_skill_value = ( auto current_skill_value = (
EQ::skills::IsSpecializedSkill(s.first) ? EQ::skills::IsSpecializedSkill(s.first) ?
MAX_SPECIALIZED_SKILL : MAX_SPECIALIZED_SKILL :
skill_caps.GetSkillCap(GetClass(), s.first, GetLevel()).cap SkillCaps::Instance()->GetSkillCap(GetClass(), s.first, GetLevel()).cap
); );
if (GetSkill(s.first) < current_skill_value) { if (GetSkill(s.first) < current_skill_value) {

3
zone/main.cpp
View File

@ -108,7 +108,6 @@ ZoneEventScheduler event_scheduler;
WorldContentService content_service; WorldContentService content_service;
PlayerEventLogs player_event_logs; PlayerEventLogs player_event_logs;
DatabaseUpdate database_update; DatabaseUpdate database_update;
SkillCaps skill_caps;
EvolvingItemsManager evolving_items_manager; EvolvingItemsManager evolving_items_manager;
const SPDat_Spell_Struct* spells; const SPDat_Spell_Struct* spells;
@ -314,7 +313,7 @@ int main(int argc, char **argv)
player_event_logs.SetDatabase(&database)->Init(); player_event_logs.SetDatabase(&database)->Init();
skill_caps.SetContentDatabase(&content_db)->LoadSkillCaps(); SkillCaps::Instance()->SetContentDatabase(&content_db)->LoadSkillCaps();
const auto c = EQEmuConfig::get(); const auto c = EQEmuConfig::get();
if (c->auto_database_updates) { if (c->auto_database_updates) {

6
zone/merc.cpp
View File

@ -67,7 +67,7 @@ Merc::Merc(const NPCType* d, float x, float y, float z, float heading)
int r; int r;
for (r = 0; r <= EQ::skills::HIGHEST_SKILL; r++) { for (r = 0; r <= EQ::skills::HIGHEST_SKILL; r++) {
skills[r] = skill_caps.GetSkillCap(GetClass(), (EQ::skills::SkillType)r, GetLevel()).cap; skills[r] = SkillCaps::Instance()->GetSkillCap(GetClass(), (EQ::skills::SkillType)r, GetLevel()).cap;
} }
size = d->size; size = d->size;
@ -774,12 +774,12 @@ bool Merc::HasSkill(EQ::skills::SkillType skill_id) const {
} }
bool Merc::CanHaveSkill(EQ::skills::SkillType skill_id) const { bool Merc::CanHaveSkill(EQ::skills::SkillType skill_id) const {
return skill_caps.GetSkillCap(GetClass(), skill_id, RuleI(Character, MaxLevel)).cap > 0; return SkillCaps::Instance()->GetSkillCap(GetClass(), skill_id, RuleI(Character, MaxLevel)).cap > 0;
//if you don't have it by max level, then odds are you never will? //if you don't have it by max level, then odds are you never will?
} }
uint16 Merc::MaxSkill(EQ::skills::SkillType skillid, uint16 class_, uint16 level) const { uint16 Merc::MaxSkill(EQ::skills::SkillType skillid, uint16 class_, uint16 level) const {
return skill_caps.GetSkillCap(class_, skillid, level).cap; return SkillCaps::Instance()->GetSkillCap(class_, skillid, level).cap;
} }
void Merc::FillSpawnStruct(NewSpawn_Struct* ns, Mob* ForWho) { void Merc::FillSpawnStruct(NewSpawn_Struct* ns, Mob* ForWho) {

4
zone/npc.cpp
View File

@ -370,7 +370,7 @@ NPC::NPC(const NPCType *npc_type_data, Spawn2 *in_respawn, const glm::vec4 &posi
//give NPCs skill values... //give NPCs skill values...
int r; int r;
for (r = 0; r <= EQ::skills::HIGHEST_SKILL; r++) { for (r = 0; r <= EQ::skills::HIGHEST_SKILL; r++) {
skills[r] = skill_caps.GetSkillCap(GetClass(), (EQ::skills::SkillType)r, moblevel).cap; skills[r] = SkillCaps::Instance()->GetSkillCap(GetClass(), (EQ::skills::SkillType)r, moblevel).cap;
} }
// some overrides -- really we need to be able to set skills for mobs in the DB // some overrides -- really we need to be able to set skills for mobs in the DB
// There are some known low level SHM/BST pets that do not follow this, which supports // There are some known low level SHM/BST pets that do not follow this, which supports
@ -3726,7 +3726,7 @@ void NPC::RecalculateSkills()
{ {
int r; int r;
for (r = 0; r <= EQ::skills::HIGHEST_SKILL; r++) { for (r = 0; r <= EQ::skills::HIGHEST_SKILL; r++) {
skills[r] = skill_caps.GetSkillCap(GetClass(), (EQ::skills::SkillType)r, level).cap; skills[r] = SkillCaps::Instance()->GetSkillCap(GetClass(), (EQ::skills::SkillType)r, level).cap;
} }
// some overrides -- really we need to be able to set skills for mobs in the DB // some overrides -- really we need to be able to set skills for mobs in the DB

2
zone/worldserver.cpp
View File

@ -4627,7 +4627,7 @@ void WorldServer::ProcessReload(const ServerReload::Request& request)
break; break;
case ServerReload::Type::SkillCaps: case ServerReload::Type::SkillCaps:
skill_caps.ReloadSkillCaps(); SkillCaps::Instance()->ReloadSkillCaps();
break; break;
case ServerReload::Type::DataBucketsCache: case ServerReload::Type::DataBucketsCache: