pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-19 13:28:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Character] Convert Delete/Load/Save of Character Disciplines to Repositories (#3850)

Browse Source 
* [Character] Convert Delete/Load/Save of Character Disciplines to Repositories

- Convert `DeleteCharacterDiscipline` and `SaveCharacterDiscipline` to repositories.
- `LoadCharacterDiscipline` already used repositories, cleaned up the logic.

* Update effects.cpp

* Update client.cpp

* Update effects.cpp

* Update client.cpp

* Update zonedb.cpp

* Update client.cpp
This commit is contained in:
Alex King
2024-01-07 00:41:01 -05:00
committed by GitHub
parent fd787af53a
commit 2dd0e51936
6 changed files with 111 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/zonedb.cpp
+30 -16
View File
@@ -766,24 +766,27 @@ bool ZoneDatabase::LoadCharacterLeadershipAbilities(uint32 character_id, PlayerP
bool ZoneDatabase::LoadCharacterDisciplines(uint32 character_id, PlayerProfile_Struct* pp){
auto character_disciplines = CharacterDisciplinesRepository::GetWhere(
const auto& l = CharacterDisciplinesRepository::GetWhere(
database, fmt::format(
"`id` = {} ORDER BY `slot_id`",
character_id
)
);
if (character_disciplines.empty()) {
if (l.empty()) {
return false;
}
/* Initialize Disciplines */
memset(pp->disciplines.values, 0, (sizeof(pp->disciplines.values[0]) * MAX_PP_DISCIPLINES));
for (auto& row : character_disciplines) {
if (row.slot_id < MAX_PP_DISCIPLINES && IsValidSpell(row.disc_id)) {
pp->disciplines.values[row.slot_id] = row.disc_id;
for (int slot_id = 0; slot_id < MAX_PP_DISCIPLINES; slot_id++) { // Initialize Disciplines
pp->disciplines.values[slot_id] = 0;
}
for (const auto& e : l) {
if (IsValidSpell(e.disc_id) && e.slot_id < MAX_PP_DISCIPLINES) {
pp->disciplines.values[e.slot_id] = e.disc_id;
}
}
return true;
}
@@ -1018,11 +1021,16 @@ bool ZoneDatabase::SaveCharacterSkill(uint32 character_id, uint32 skill_id, uint
);
}
bool ZoneDatabase::SaveCharacterDisc(uint32 character_id, uint32 slot_id, uint32 disc_id){
std::string query = StringFormat("REPLACE INTO `character_disciplines` (id, slot_id, disc_id) VALUES (%u, %u, %u)", character_id, slot_id, disc_id);
auto results = QueryDatabase(query);
LogDebug("ZoneDatabase::SaveCharacterDisc for character ID: [{}], slot:[{}] disc_id:[{}] done", character_id, slot_id, disc_id);
return true;
bool ZoneDatabase::SaveCharacterDiscipline(uint32 character_id, uint32 slot_id, uint32 disc_id)
{
return CharacterDisciplinesRepository::ReplaceOne(
*this,
CharacterDisciplinesRepository::CharacterDisciplines{
.id = character_id,
.slot_id = static_cast<uint16_t>(slot_id),
.disc_id = static_cast<uint16_t>(disc_id)
}
);
}
void ZoneDatabase::SaveCharacterTribute(Client* c)
@@ -1316,10 +1324,16 @@ bool ZoneDatabase::DeleteCharacterSpell(uint32 character_id, uint32 slot_id)
);
}
bool ZoneDatabase::DeleteCharacterDisc(uint32 character_id, uint32 slot_id){
std::string query = StringFormat("DELETE FROM `character_disciplines` WHERE `slot_id` = %u AND `id` = %u", slot_id, character_id);
QueryDatabase(query);
return true;
bool ZoneDatabase::DeleteCharacterDiscipline(uint32 character_id, uint32 slot_id)
{
return CharacterDisciplinesRepository::DeleteWhere(
*this,
fmt::format(
"`id` = {} AND `slot_id` = {}",
character_id,
slot_id
)
);
}
bool ZoneDatabase::DeleteCharacterBandolier(uint32 character_id, uint32 bandolier_id)