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 #sensetrap Command. (#2137)

Browse Source 
* [Commands] Cleanup #sensetrap Command.
- Cleanup messages and logic.

* Update sensetrap.cpp
This commit is contained in:
Kinglykrab 2022-05-06 20:01:29 -04:00 committed by GitHub
parent a0ed0d57c5
commit 132c936c90
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
zone/gm_commands/sensetrap.cpp
View File

@ -2,23 +2,29 @@
void command_sensetrap(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::SkillSenseTraps)) {
if (DistanceSquaredNoZ(c->GetPosition(), target->GetPosition()) > RuleI(Adventure, LDoNTrapDistanceUse)) {
c->Message(Chat::Red, "%s is too far away.", target->GetCleanName());
return;
}
c->HandleLDoNSenseTraps(target->CastToNPC(), c->GetSkill(EQ::skills::SkillSenseTraps), LDoNTypeMechanical);
}
else {
c->Message(Chat::Red, "You do not have the sense traps skill.");
}
auto target = c->GetTarget()->CastToNPC();
if (!c->HasSkill(EQ::skills::SkillSenseTraps)) {
c->Message(Chat::White, "You do not have the Sense Traps skill.");
return;
}
if (DistanceSquaredNoZ(c->GetPosition(), target->GetPosition()) > RuleI(Adventure, LDoNTrapDistanceUse)) {
c->Message(
Chat::White,
fmt::format(
"{} ({}) is too far away.",
target->GetCleanName(),
target->GetID()
).c_str()
);
}
c->HandleLDoNSenseTraps(target, c->GetSkill(EQ::skills::SkillSenseTraps), LDoNTypeMechanical);
}