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

[Commands] Cleanup #setskill Command. (#1704)

Browse Source 
* [Commands] Cleanup #setskill Command.
- Cleanup message and logic.

* Optimize GetSkillName().
This commit is contained in:
Kinglykrab 2021-11-10 21:20:40 -05:00 committed by GitHub
parent 32d606c667
commit b17c24d2df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 48 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/skills.cpp
View File

@ -263,12 +263,8 @@ const std::map<EQ::skills::SkillType, std::string>& EQ::skills::GetSkillTypeMap(
std::string EQ::skills::GetSkillName(SkillType skill) std::string EQ::skills::GetSkillName(SkillType skill)
{ {
if (skill >= Skill1HBlunt && skill <= Skill2HPiercing) { if (skill >= Skill1HBlunt && skill <= Skill2HPiercing) {
std::map<SkillType, std::string> skills = GetSkillTypeMap(); auto skills = GetSkillTypeMap();
for (auto current_skill : skills) { return skills[skill];
if (skill == current_skill.first) {
return current_skill.second;
}
}
} }
return std::string(); return std::string();
} }

65
zone/command.cpp
View File

@ -3721,29 +3721,56 @@ void command_setlanguage(Client *c, const Seperator *sep)
} }
} }
void command_setskill(Client *c, const Seperator *sep) void command_setskill(Client* c, const Seperator* sep)
{ {
if (c->GetTarget() == nullptr) { Client* target = c;
c->Message(Chat::White, "Error: #setskill: No target."); if (c->GetTarget() && c->GetTarget()->IsClient()) {
target = c->GetTarget()->CastToClient();
} }
else if (!c->GetTarget()->IsClient()) {
c->Message(Chat::White, "Error: #setskill: Target must be a client."); auto skill_id = sep->IsNumber(1) ? std::stoi(sep->arg[1]) : -1;
} auto skill_value = sep->IsNumber(2) ? std::stoi(sep->arg[2]) : -1;
else if ( if (
!sep->IsNumber(1) || atoi(sep->arg[1]) < 0 || atoi(sep->arg[1]) > EQ::skills::HIGHEST_SKILL || skill_id < 0 ||
!sep->IsNumber(2) || atoi(sep->arg[2]) < 0 || atoi(sep->arg[2]) > HIGHEST_CAN_SET_SKILL skill_id > EQ::skills::HIGHEST_SKILL ||
) skill_value < 0 ||
{ skill_value > HIGHEST_CAN_SET_SKILL
c->Message(Chat::White, "Usage: #setskill skill x "); ) {
c->Message(Chat::White, " skill = 0 to %d", EQ::skills::HIGHEST_SKILL); c->Message(Chat::White, "Usage: #setskill [Skill ID] [Skill Value]");
c->Message(Chat::White, " x = 0 to %d", HIGHEST_CAN_SET_SKILL); c->Message(Chat::White, fmt::format("Skill ID = 0 to {}", EQ::skills::HIGHEST_SKILL).c_str());
c->Message(Chat::White, fmt::format("Skill Value = 0 to {}", HIGHEST_CAN_SET_SKILL).c_str());
} }
else { else {
LogInfo("Set skill request from [{}], target:[{}] skill_id:[{}] value:[{}]", c->GetName(), c->GetTarget()->GetName(), atoi(sep->arg[1]), atoi(sep->arg[2]) ); LogInfo(
int skill_num = atoi(sep->arg[1]); "Set skill request from [{}], Target: [{}] Skill ID: [{}] Skill Value: [{}]",
uint16 skill_value = atoi(sep->arg[2]); c->GetCleanName(),
if (skill_num <= EQ::skills::HIGHEST_SKILL) target->GetCleanName(),
c->GetTarget()->CastToClient()->SetSkill((EQ::skills::SkillType)skill_num, skill_value); skill_id,
skill_value
);
if (
skill_id >= EQ::skills::Skill1HBlunt &&
skill_id <= EQ::skills::HIGHEST_SKILL
) {
target->SetSkill(
(EQ::skills::SkillType)skill_id,
skill_value
);
if (c != target) {
c->Message(
Chat::White,
fmt::format(
"Set {} ({}) to {} for {}.",
EQ::skills::GetSkillName((EQ::skills::SkillType)skill_id),
skill_id,
skill_value,
target->GetCleanName()
).c_str()
);
}
}
} }
} }