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

[Commands] Cleanup #picklock Command (#3046)

Browse Source 
* [Commands] Cleanup #picklock Command

# Notes
- Cleanup messages and logic.

* Update picklock.cpp
This commit is contained in:
Alex King 2023-03-05 22:34:05 -05:00 committed by GitHub
parent a90d41480a
commit 218ef80f96
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
zone/gm_commands/picklock.cpp
View File

@ -2,23 +2,28 @@
void command_picklock(Client *c, const Seperator *sep)
{
Mob *target = c->GetTarget();
if (!target) {
c->Message(Chat::Red, "You must have a target.");
if (!c->GetTarget() || !c->GetTarget()->IsNPC()) {
c->Message(Chat::White, "You must target an NPC to use this command.");
return;
}
if (target->IsNPC()) {
if (c->HasSkill(EQ::skills::SkillPickLock)) {
if (DistanceSquaredNoZ(c->GetPosition(), target->GetPosition()) > RuleI(Adventure, LDoNTrapDistanceUse)) {
c->Message(Chat::Red, "%s is too far away.", target->GetCleanName());
return;
}
c->HandleLDoNPickLock(target->CastToNPC(), c->GetSkill(EQ::skills::SkillPickLock), LDoNTypeMechanical);
}
else {
c->Message(Chat::Red, "You do not have the pick locks skill.");
auto t = c->GetTarget()->CastToNPC();
if (c->HasSkill(EQ::skills::SkillPickLock)) {
if (DistanceSquaredNoZ(c->GetPosition(), t->GetPosition()) > RuleI(Adventure, LDoNTrapDistanceUse)) {
c->Message(
Chat::White,
fmt::format(
"{} is too far away.",
c->GetTargetDescription(t)
).c_str()
);
return;
}
c->HandleLDoNPickLock(t, c->GetSkill(EQ::skills::SkillPickLock), LDoNTypeMechanical);
} else {
c->Message(Chat::White, "You do not have the Pick Lock skill.");
}
}