pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-31 09:06:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Cleanup] Cleanup Deity Code (#4363)

Browse Source 
* [Cleanup] Cleanup Deity-based Code

* Final push.

* Update deity.cpp

* Update deity.cpp

* Update deity.cpp

* Cleanup

* Cleanup

* [Cleanup] Cleanup Skill-based Code

* Update deity.cpp

* Update lua_client.cpp
This commit is contained in:
Alex King
2024-06-01 19:21:26 -04:00
committed by GitHub
parent 76b9ce0ac1
commit caa647dc6b
19 changed files with 131 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/gm_commands/find/deity.cpp
+17 -18
View File
@@ -3,46 +3,45 @@
void FindDeity(Client *c, const Seperator *sep)
{
if (sep->IsNumber(2)) {
const auto deity_id = static_cast<EQ::deity::DeityType>(Strings::ToInt(sep->arg[2]));
const auto& deity_name = EQ::deity::GetDeityName(deity_id);
if (!deity_name.empty()) {
const auto deity_bit = EQ::deity::GetDeityBitmask(deity_id);
const uint32 deity_id = Strings::ToUnsignedInt(sep->arg[2]);
const std::string& deity_name = Deity::GetName(deity_id);
if (Strings::EqualFold(deity_name, "UNKNOWN DEITY")) {
c->Message(
Chat::White,
fmt::format(
"Deity {} | {} ({})",
deity_id,
deity_name,
Strings::Commify(deity_bit)
"Deity ID {} does not exist.",
deity_id
).c_str()
);
return;
}
const uint32 deity_bitmask = Deity::GetBitmask(deity_id);
c->Message(
Chat::White,
fmt::format(
"Deity ID {} was not found.",
deity_id
"Deity {} | {} ({})",
deity_id,
deity_name,
Strings::Commify(deity_bitmask)
).c_str()
);
return;
}
const auto& search_criteria = Strings::ToLower(sep->argplus[2]);
const std::string& search_criteria = Strings::ToLower(sep->argplus[2]);
auto found_count = 0;
uint32 found_count = 0;
for (const auto& d : EQ::deity::GetDeityMap()) {
const auto& deity_name_lower = Strings::ToLower(d.second);
for (const auto& d : deity_names) {
const std::string& deity_name_lower = Strings::ToLower(d.second);
if (!Strings::Contains(deity_name_lower, search_criteria)) {
continue;
}
const auto deity_bit = EQ::deity::GetDeityBitmask(d.first);
const uint32 deity_bitmask = Deity::GetBitmask(d.first);
c->Message(
Chat::White,
@@ -50,7 +49,7 @@ void FindDeity(Client *c, const Seperator *sep)
"Deity {} | {} ({})",
d.first,
d.second,
Strings::Commify(deity_bit)
Strings::Commify(deity_bitmask)
).c_str()
);