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

[Cleanup] Cleanup #setskill and #setskillall Commands (#3367)

Browse Source 
# Notes
- No need to cap at 400 for max skill.
- When setting skill/skills, if we go over cap, set to cap.
This commit is contained in:
Alex King 2023-05-24 23:36:38 -04:00 committed by GitHub
parent a5106420e8
commit 3144ac1a28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 62 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
zone/gm_commands/setskill.cpp
View File

@ -2,54 +2,45 @@
void command_setskill(Client *c, const Seperator *sep) void command_setskill(Client *c, const Seperator *sep)
{ {
Client *target = c; const auto arguments = sep->argnum;
if (c->GetTarget() && c->GetTarget()->IsClient()) {
target = c->GetTarget()->CastToClient();
}
auto skill_id = sep->IsNumber(1) ? Strings::ToInt(sep->arg[1]) : -1; if (arguments < 2 || !sep->IsNumber(1) || !sep->IsNumber(2)) {
auto skill_value = sep->IsNumber(2) ? Strings::ToInt(sep->arg[2]) : -1;
if (
skill_id < 0 ||
skill_id > EQ::skills::HIGHEST_SKILL ||
skill_value < 0 ||
skill_value > HIGHEST_CAN_SET_SKILL
) {
c->Message(Chat::White, "Usage: #setskill [Skill ID] [Skill Value]"); c->Message(Chat::White, "Usage: #setskill [Skill ID] [Skill Value]");
c->Message(Chat::White, fmt::format("Skill ID = 0 to {}", EQ::skills::HIGHEST_SKILL).c_str()); return;
c->Message(Chat::White, fmt::format("Skill Value = 0 to {}", HIGHEST_CAN_SET_SKILL).c_str());
} }
else {
LogInfo( auto t = c;
"Set skill request from [{}], Target: [{}] Skill ID: [{}] Skill Value: [{}]", if (c->GetTarget() && c->GetTarget()->IsClient()) {
c->GetCleanName(), t = c->GetTarget()->CastToClient();
c->GetTargetDescription(target), }
skill_id,
skill_value const auto skill_id = Strings::ToInt(sep->arg[1]);
const auto skill_value = Strings::ToInt(sep->arg[2]);
if (!EQ::ValueWithin(skill_id, EQ::skills::Skill1HBlunt, EQ::skills::HIGHEST_SKILL)) {
c->Message(Chat::White, "Usage: #setskill [Skill ID] [Skill Value]");
c->Message(Chat::White, fmt::format("Skill ID: 0 to {}", EQ::skills::HIGHEST_SKILL).c_str());
return;
}
const auto skill_type = static_cast<EQ::skills::SkillType>(skill_id);
t->SetSkill(
skill_type,
skill_value > t->MaxSkill(skill_type) ? t->MaxSkill(skill_type) : skill_value
); );
if ( if (c != t) {
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( c->Message(
Chat::White, Chat::White,
fmt::format( fmt::format(
"Set {} ({}) to {} for {}.", "Set {} ({}) to {} for {}.",
EQ::skills::GetSkillName((EQ::skills::SkillType) skill_id), EQ::skills::GetSkillName(skill_type),
skill_id, skill_id,
skill_value, skill_value > t->MaxSkill(skill_type) ? t->MaxSkill(skill_type) : skill_value,
c->GetTargetDescription(target) c->GetTargetDescription(t)
).c_str() ).c_str()
); );
} }
} }
}
}

57
zone/gm_commands/setskillall.cpp
View File

@ -2,45 +2,42 @@
void command_setskillall(Client *c, const Seperator *sep) void command_setskillall(Client *c, const Seperator *sep)
{ {
auto target = c; const auto arguments = sep->argnum;
if (c->GetTarget() && c->GetTarget()->IsClient()) {
target = c->GetTarget()->CastToClient(); if (!arguments || !sep->IsNumber(1)) {
c->Message(Chat::White, "Usage: #setskillall [Skill Level] - Set all of your or your target's skills to the specified skill level");
return;
} }
if (!sep->IsNumber(1)) { auto t = c;
c->Message(Chat::White, "Usage: #setskillall [Skill Level] - Set all of your or your target's skills to the specified skill level"); if (c->GetTarget() && c->GetTarget()->IsClient()) {
c->Message( t = c->GetTarget()->CastToClient();
Chat::White, }
fmt::format(
"Note: Skill Level ranges from 0 to {}", if (c->Admin() < commandSetSkillsOther && t != c) {
HIGHEST_CAN_SET_SKILL c->Message(Chat::White, "Your status is not high enough to set another player's skills.");
).c_str() return;
); }
} else {
if (c->Admin() >= commandSetSkillsOther || c->GetTarget() == c) {
LogInfo(
"Set ALL skill request from [{}], target:[{}]",
c->GetCleanName(),
c->GetTargetDescription(target)
);
auto skill_level = static_cast<uint16>(Strings::ToUnsignedInt(sep->arg[1])); auto skill_level = static_cast<uint16>(Strings::ToUnsignedInt(sep->arg[1]));
for (const auto& s : EQ::skills::GetSkillTypeMap()) {
if (c != t) {
c->Message( c->Message(
Chat::White, Chat::White,
fmt::format( fmt::format(
"Setting all skills to {} for {}.", "Setting {} ({}) to {} for {}.",
skill_level, s.second,
c->GetTargetDescription(target) s.first,
skill_level > t->MaxSkill(s.first) ? t->MaxSkill(s.first) : skill_level,
c->GetTargetDescription(t)
).c_str() ).c_str()
); );
for (EQ::skills::SkillType skill_num = EQ::skills::Skill1HBlunt; skill_num <= EQ::skills::HIGHEST_SKILL; skill_num = (EQ::skills::SkillType) (skill_num + 1)) {
target->SetSkill(skill_num, skill_level);
}
} else {
c->Message(Chat::White, "Your status is not high enough to set another player's skills.");
}
}
} }
t->SetSkill(
s.first,
skill_level > t->MaxSkill(s.first) ? t->MaxSkill(s.first) : skill_level
);
}
}