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

[Commands] Cleanup #untraindisc Command. (#1996)

Browse Source 
- Cleanup messages and logic.
This commit is contained in:
Kinglykrab 2022-02-16 06:03:51 -05:00 committed by GitHub
parent a83ad7080a
commit ed7e2b2652
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 60 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zone/command.cpp
View File

@ -386,7 +386,7 @@ int command_init(void)
command_add("unmemspells", " - Unmemorize all spells for you or your target", AccountStatus::Guide, command_unmemspells) || command_add("unmemspells", " - Unmemorize all spells for you or your target", AccountStatus::Guide, command_unmemspells) ||
command_add("unscribespell", "[spellid] - Unscribe specified spell from your target's spell book.", AccountStatus::GMCoder, command_unscribespell) || command_add("unscribespell", "[spellid] - Unscribe specified spell from your target's spell book.", AccountStatus::GMCoder, command_unscribespell) ||
command_add("unscribespells", "- Clear out your or your player target's spell book.", AccountStatus::GMCoder, command_unscribespells) || command_add("unscribespells", "- Clear out your or your player target's spell book.", AccountStatus::GMCoder, command_unscribespells) ||
command_add("untraindisc", "[spellid] - Untrain specified discipline from your target.", AccountStatus::GMCoder, command_untraindisc) || command_add("untraindisc", "[Spell ID] - Untrain your or your target's discipline by Spell ID", AccountStatus::GMCoder, command_untraindisc) ||
command_add("untraindiscs", "- Untrains all disciplines from your target.", AccountStatus::GMCoder, command_untraindiscs) || command_add("untraindiscs", "- Untrains all disciplines from your target.", AccountStatus::GMCoder, command_untraindiscs) ||
command_add("uptime", "[zone server id] - Get uptime of worldserver, or zone server if argument provided", AccountStatus::Steward, command_uptime) || command_add("uptime", "[zone server id] - Get uptime of worldserver, or zone server if argument provided", AccountStatus::Steward, command_uptime) ||
command_add("version", "- Display current version of EQEmu server", AccountStatus::Player, command_version) || command_add("version", "- Display current version of EQEmu server", AccountStatus::Player, command_version) ||

67
zone/gm_commands/untraindisc.cpp
View File

@ -1,17 +1,68 @@
#include "../client.h" #include "../client.h"
#include "../../common/data_verification.h"
void command_untraindisc(Client *c, const Seperator *sep) void command_untraindisc(Client *c, const Seperator *sep)
{ {
Client *t = c; int arguments = sep->argnum;
if (c->GetTarget() && c->GetTarget()->IsClient() && c->GetGM()) { if (!arguments || !sep->IsNumber(1)) {
t = c->GetTarget()->CastToClient(); c->Message(Chat::White, "Usage: #untraindisc [Spell ID] - Untrain your or your target's discipline by Spell ID");
return;
} }
for (int i = 0; i < MAX_PP_DISCIPLINES; i++) { auto target = c;
if (t->GetPP().disciplines.values[i] == atoi(sep->arg[1])) { if (c->GetTarget() && c->GetTarget()->IsClient() && c->GetGM()) {
t->UntrainDisc(i, 1); target = c->GetTarget()->CastToClient();
return; }
}
uint16 spell_id = EQ::Clamp(std::stoi(sep->arg[1]), 0, 65535);
if (!IsValidSpell(spell_id)) {
c->Message(
Chat::White,
fmt::format(
"Spell ID {} could not be found.",
spell_id
).c_str()
);
return;
}
auto spell_name = GetSpellName(spell_id);
if (target->HasDisciplineLearned(spell_id)) {
target->UntrainDiscBySpellID(spell_id);
c->Message(
Chat::White,
fmt::format(
"Untraining {} ({}) for {}.",
spell_name,
spell_id,
c == target ?
"yourself" :
fmt::format(
"{} ({})",
target->GetCleanName(),
target->GetID()
)
).c_str()
);
} else {
c->Message(
Chat::White,
fmt::format(
"{} not have {} ({}) trained.",
c == target ?
"You do" :
fmt::format(
"{} ({}) does",
target->GetCleanName(),
target->GetID()
),
spell_name,
spell_id
).c_str()
);
} }
} }