[Commands] Cleanup #movement Command (#3715)

# Notes
- Cleanup messages and logic.
This commit is contained in:
Alex King 2023-11-26 01:13:03 -05:00 committed by GitHub
parent c9993fb698
commit 93ddffa57f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -3,74 +3,84 @@
void command_movement(Client *c, const Seperator *sep)
{
auto &mgr = MobMovementManager::Get();
if (sep->arg[1][0] == 0) {
c->Message(Chat::White, "Usage: #movement stats/clearstats/walkto/runto/rotateto/stop/packet");
const int arguments = sep->argnum;
if (!arguments) {
c->Message(Chat::White, "Usage: #movement [clear|packet|rotate|run|stats|stop|walk]");
return;
}
if (strcasecmp(sep->arg[1], "stats") == 0) {
mgr.DumpStats(c);
const bool is_clear = !strcasecmp(sep->arg[1], "clear");
const bool is_packet = !strcasecmp(sep->arg[1], "packet");
const bool is_rotate = !strcasecmp(sep->arg[1], "rotate");
const bool is_run = !strcasecmp(sep->arg[1], "run");
const bool is_stats = !strcasecmp(sep->arg[1], "stats");
const bool is_stop = !strcasecmp(sep->arg[1], "stop");
const bool is_walk = !strcasecmp(sep->arg[1], "walk");
if (
!is_clear &&
!is_packet &&
!is_rotate &&
!is_run &&
!is_stats &&
!is_stop &&
!is_walk
) {
c->Message(Chat::White, "Usage: #movement [clear|packet|rotate|run|stats|stop|walk]");
return;
}
else if (strcasecmp(sep->arg[1], "clearstats") == 0) {
mgr.ClearStats();
}
else if (strcasecmp(sep->arg[1], "walkto") == 0) {
auto target = c->GetTarget();
if (target == nullptr) {
c->Message(Chat::White, "No target found.");
auto &m = MobMovementManager::Get();
if (is_clear) {
m.ClearStats();
} else if (is_packet) {
Mob *t = c->GetTarget();
if (!t) {
c->Message(Chat::White, "You must have a target to use this command.");
return;
}
target->WalkTo(c->GetX(), c->GetY(), c->GetZ());
}
else if (strcasecmp(sep->arg[1], "runto") == 0) {
auto target = c->GetTarget();
if (target == nullptr) {
c->Message(Chat::White, "No target found.");
const float x = sep->IsNumber(2) ? Strings::ToFloat(sep->arg[2]) : 0.0f;
const float y = sep->IsNumber(3) ? Strings::ToFloat(sep->arg[3]) : 0.0f;
const float z = sep->IsNumber(4) ? Strings::ToFloat(sep->arg[4]) : 0.0f;
const float heading = sep->IsNumber(5) ? Strings::ToFloat(sep->arg[5]) : 0.0f;
const int animation = sep->IsNumber(6) ? Strings::ToInt(sep->arg[6]) : 0.0f;
m.SendCommandToClients(t, x, y, z, heading, animation, ClientRangeAny);
} else if (is_rotate) {
Mob *t = c->GetTarget();
if (!t) {
c->Message(Chat::White, "You must have a target to use this command.");
return;
}
target->RunTo(c->GetX(), c->GetY(), c->GetZ());
}
else if (strcasecmp(sep->arg[1], "rotateto") == 0) {
auto target = c->GetTarget();
if (target == nullptr) {
c->Message(Chat::White, "No target found.");
t->RotateToWalking(t->CalculateHeadingToTarget(c->GetX(), c->GetY()));
} else if (is_run) {
Mob *t = c->GetTarget();
if (!t) {
c->Message(Chat::White, "You must have a target to use this command.");
return;
}
target->RotateToWalking(target->CalculateHeadingToTarget(c->GetX(), c->GetY()));
}
else if (strcasecmp(sep->arg[1], "stop") == 0) {
auto target = c->GetTarget();
if (target == nullptr) {
c->Message(Chat::White, "No target found.");
t->RunTo(c->GetX(), c->GetY(), c->GetZ());
} else if (is_stats) {
m.DumpStats(c);
} else if (is_stop) {
Mob *t = c->GetTarget();
if (!t) {
c->Message(Chat::White, "You must have a target to use this command.");
return;
}
target->StopNavigation();
}
else if (strcasecmp(sep->arg[1], "packet") == 0) {
auto target = c->GetTarget();
if (target == nullptr) {
c->Message(Chat::White, "No target found.");
t->StopNavigation();
} else if (is_walk) {
Mob *t = c->GetTarget();
if (!t) {
c->Message(Chat::White, "You must have a target to use this command.");
return;
}
mgr.SendCommandToClients(
target,
Strings::ToFloat(sep->arg[2]),
Strings::ToFloat(sep->arg[3]),
Strings::ToFloat(sep->arg[4]),
Strings::ToFloat(sep->arg[5]),
Strings::ToInt(sep->arg[6]),
ClientRangeAny
);
}
else {
c->Message(Chat::White, "Usage: #movement stats/clearstats/walkto/runto/rotateto/stop/packet");
t->WalkTo(c->GetX(), c->GetY(), c->GetZ());
}
}