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

[Commands] Cleanup #setlanguage Command. (#2464)

Browse Source 
* [Commands] Cleanup #setlanguage Command.

Cleanup #setlanguage command and remove unnecessary variables.

* Tabs not spaces.

* newline
This commit is contained in:
Kinglykrab 2022-10-12 21:13:25 -04:00 committed by GitHub
parent a9e218acfa
commit 303b35a755
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zone/command.cpp
View File

@ -286,7 +286,7 @@ int command_init(void)
command_add("setendurance", "[Endurance] - Set your or your target's Endurance", AccountStatus::GMAdmin, command_setendurance) || command_add("setendurance", "[Endurance] - Set your or your target's Endurance", AccountStatus::GMAdmin, command_setendurance) ||
command_add("setfaction", "[Faction ID] - Sets targeted NPC's faction in the database", AccountStatus::GMAreas, command_setfaction) || command_add("setfaction", "[Faction ID] - Sets targeted NPC's faction in the database", AccountStatus::GMAreas, command_setfaction) ||
command_add("sethp", "[Health] - Set your or your target's Health", AccountStatus::GMAdmin, command_sethp) || command_add("sethp", "[Health] - Set your or your target's Health", AccountStatus::GMAdmin, command_sethp) ||
command_add("setlanguage", "[language ID] [value] - Set your target's language skillnum to value", AccountStatus::Guide, command_setlanguage) || command_add("setlanguage", "[Language ID] [Value] - Set your or your target's Language by ID to Value", AccountStatus::Guide, command_setlanguage) ||
command_add("setlsinfo", "[Email] [Password] - Set loginserver email address and password (if supported by loginserver)", AccountStatus::Steward, command_setlsinfo) || command_add("setlsinfo", "[Email] [Password] - Set loginserver email address and password (if supported by loginserver)", AccountStatus::Steward, command_setlsinfo) ||
command_add("setmana", "[Mana] - Set your or your target's Mana", AccountStatus::GMAdmin, command_setmana) || command_add("setmana", "[Mana] - Set your or your target's Mana", AccountStatus::GMAdmin, command_setmana) ||
command_add("setpass", "[Account Name] [Password] - Set local password by account name", AccountStatus::GMLeadAdmin, command_setpass) || command_add("setpass", "[Account Name] [Password] - Set local password by account name", AccountStatus::GMLeadAdmin, command_setpass) ||

30
zone/gm_commands/setlanguage.cpp
View File

@ -1,39 +1,36 @@
#include "../client.h" #include "../client.h"
#include "../../common/languages.h" #include "../../common/languages.h"
#include "../../common/data_verification.h"
void command_setlanguage(Client *c, const Seperator *sep) void command_setlanguage(Client *c, const Seperator *sep)
{ {
Client *target = c; auto target = c;
if (c->GetTarget() && c->GetTarget()->IsClient()) { if (c->GetTarget() && c->GetTarget()->IsClient()) {
target = c->GetTarget()->CastToClient(); target = c->GetTarget()->CastToClient();
} }
auto language_id = sep->IsNumber(1) ? std::stoi(sep->arg[1]) : -1; auto language_id = sep->IsNumber(1) ? std::stoi(sep->arg[1]) : -1;
auto language_value = sep->IsNumber(2) ? std::stoi(sep->arg[2]) : -1; auto language_value = sep->IsNumber(2) ? std::stoi(sep->arg[2]) : -1;
if (!strcasecmp(sep->arg[1], "list")) { if (!strcasecmp(sep->arg[1], "list")) {
for (int language = LANG_COMMON_TONGUE; language <= LANG_UNKNOWN; language++) { for (const auto& language : EQ::constants::GetLanguageMap()) {
c->Message( c->Message(
Chat::White, Chat::White,
fmt::format( fmt::format(
"Language {}: {}", "Language {}: {}",
language, language.first,
EQ::constants::GetLanguageName(language) language.second
).c_str() ).c_str()
); );
} }
} } else if (
else if ( !EQ::ValueWithin(language_id, LANG_COMMON_TONGUE, LANG_UNKNOWN) ||
language_id < LANG_COMMON_TONGUE || !EQ::ValueWithin(language_value, 0, 100)
language_id > LANG_UNKNOWN || ) {
language_value < 0 ||
language_value > 100
) {
c->Message(Chat::White, "Usage: #setlanguage [Language ID] [Language Value]"); c->Message(Chat::White, "Usage: #setlanguage [Language ID] [Language Value]");
c->Message(Chat::White, "Usage: #setlanguage [List]"); c->Message(Chat::White, "Usage: #setlanguage [List]");
c->Message(Chat::White, "Language ID = 0 to 27", LANG_UNKNOWN); c->Message(Chat::White, "Language ID = 0 to 27");
c->Message(Chat::White, "Language Value = 0 to 100", HIGHEST_CAN_SET_SKILL); c->Message(Chat::White, "Language Value = 0 to 100");
} } else {
else {
LogInfo( LogInfo(
"Set language request from [{}], Target: [{}] Language ID: [{}] Language Value: [{}]", "Set language request from [{}], Target: [{}] Language ID: [{}] Language Value: [{}]",
c->GetCleanName(), c->GetCleanName(),
@ -58,4 +55,3 @@ void command_setlanguage(Client *c, const Seperator *sep)
} }
} }
} }