mirror of
https://github.com/EQEmu/Server.git
synced 2025-12-11 21:01:29 +00:00
[Commands] Cleanup #resetaa and #resetaa_timer (#3047)
# Notes - Cleanup messages and logic.
This commit is contained in:
parent
218ef80f96
commit
b6497cdd6a
@ -7,15 +7,14 @@ void command_resetaa(Client *c, const Seperator *sep)
|
||||
return;
|
||||
}
|
||||
|
||||
auto target = c->GetTarget()->CastToClient();
|
||||
target->ResetAA();
|
||||
|
||||
auto t = c->GetTarget()->CastToClient();
|
||||
t->ResetAA();
|
||||
|
||||
c->Message(
|
||||
Chat::White,
|
||||
fmt::format(
|
||||
"Successfully reset all Alternate Advancements for {}.",
|
||||
c->GetTargetDescription(target)
|
||||
c->GetTargetDescription(t)
|
||||
).c_str()
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@ -2,43 +2,44 @@
|
||||
|
||||
void command_resetaa_timer(Client *c, const Seperator *sep)
|
||||
{
|
||||
int arguments = sep->argnum;
|
||||
const auto arguments = sep->argnum;
|
||||
if (!arguments) {
|
||||
c->Message(Chat::White, "Usage: #resetaa_timer all - Reset all Alternate Advancement timers");
|
||||
c->Message(Chat::White, "Usage: #resetaa_timer [Timer ID] - Reset Alternate Advancement timer by ID");
|
||||
return;
|
||||
}
|
||||
|
||||
auto target = c;
|
||||
auto t = c;
|
||||
if (c->GetTarget() && c->GetTarget()->IsClient()) {
|
||||
target = c->GetTarget()->CastToClient();
|
||||
t = c->GetTarget()->CastToClient();
|
||||
}
|
||||
|
||||
bool is_all = !strcasecmp(sep->arg[1], "all");
|
||||
const bool is_all = !strcasecmp(sep->arg[1], "all");
|
||||
|
||||
if (is_all) {
|
||||
c->Message(
|
||||
Chat::White,
|
||||
fmt::format(
|
||||
"Reset all Alternate Advancement timers for {}.",
|
||||
c->GetTargetDescription(target)
|
||||
c->GetTargetDescription(t)
|
||||
).c_str()
|
||||
);
|
||||
target->ResetAlternateAdvancementTimers();
|
||||
return;
|
||||
}
|
||||
|
||||
if (sep->IsNumber(1)) {
|
||||
int timer_id = Strings::ToInt(sep->arg[1]);
|
||||
t->ResetAlternateAdvancementTimers();
|
||||
|
||||
return;
|
||||
} else if (sep->IsNumber(1)) {
|
||||
const auto timer_id = Strings::ToInt(sep->arg[1]);
|
||||
|
||||
c->Message(
|
||||
Chat::White,
|
||||
fmt::format(
|
||||
"Reset Alternate Advancement timer {} for {}.",
|
||||
timer_id,
|
||||
c->GetTargetDescription(target)
|
||||
c->GetTargetDescription(t)
|
||||
).c_str()
|
||||
);
|
||||
target->ResetAlternateAdvancementTimer(timer_id);
|
||||
|
||||
t->ResetAlternateAdvancementTimer(timer_id);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user