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

[Commands] Cleanup #scribespell and #scribespells Commands. (#2534)

Browse Source 
- Cleanup messages and logic.
This commit is contained in:
Kinglykrab 2022-11-14 14:05:34 -05:00 committed by GitHub
parent 9c967c24b8
commit 8d184fc6c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 96 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zone/command.cpp
View File

@ -271,8 +271,8 @@ int command_init(void)
command_add("rules", "(subcommand) - Manage server rules", AccountStatus::GMImpossible, command_rules) ||
command_add("save", "Force your player or player corpse target to be saved to the database", AccountStatus::Guide, command_save) ||
command_add("scale", "Handles npc scaling", AccountStatus::GMLeadAdmin, command_scale) ||
command_add("scribespell", "[spellid] - Scribe specified spell in your target's spell book.", AccountStatus::GMCoder, command_scribespell) ||
command_add("scribespells", "[max level] [min level] - Scribe all spells for you or your player target that are usable by them, up to level specified. (may freeze client for a few seconds)", AccountStatus::GMLeadAdmin, command_scribespells) ||
command_add("scribespell", "[Spell ID] - Scribe a spell by ID to your or your target's spell book.", AccountStatus::GMCoder, command_scribespell) ||
command_add("scribespells", "[Max level] [Min level] - Scribe all spells for you or your player target that are usable by them, up to level specified. (may freeze client for a few seconds)", AccountStatus::GMLeadAdmin, command_scribespells) ||
command_add("sendzonespawns", "Refresh spawn list for all clients in zone", AccountStatus::GMLeadAdmin, command_sendzonespawns) ||
command_add("sensetrap", "Analog for ldon sense trap for the newer clients since we still don't have it working.", AccountStatus::Player, command_sensetrap) ||
command_add("serverinfo", "Get CPU, Operating System, and Process Information about the server", AccountStatus::GMMgmt, command_serverinfo) ||

99
zone/gm_commands/scribespell.cpp
View File

@ -2,65 +2,92 @@
void command_scribespell(Client *c, const Seperator *sep)
{
uint16 spell_id = 0;
uint16 book_slot = -1;
Client *t = c;
auto arguments = sep->argnum;
if (!arguments || !sep->IsNumber(1)) {
c->Message(Chat::White, "Usage: #scribespell [Spell ID]");
return;
}
auto t = c;
if (c->GetTarget() && c->GetTarget()->IsClient() && c->GetGM()) {
t = c->GetTarget()->CastToClient();
}
if (!sep->arg[1][0]) {
c->Message(Chat::White, "FORMAT: #scribespell <spellid>");
return;
}
spell_id = atoi(sep->arg[1]);
const auto spell_id = std::stoul(sep->arg[1]);
if (IsValidSpell(spell_id)) {
t->Message(Chat::White, "Scribing spell: %s (%i) to spellbook.", spells[spell_id].name, spell_id);
t->Message(
Chat::White,
fmt::format(
"Scribing {} ({}) to spellbook.",
spells[spell_id].name,
spell_id
).c_str()
);
if (t != c) {
c->Message(Chat::White, "Scribing spell: %s (%i) for %s.", spells[spell_id].name, spell_id, t->GetName());
c->Message(
Chat::White,
fmt::format(
"Scribing {} ({}) for {}.",
spells[spell_id].name,
spell_id,
t->GetName()
).c_str()
);
}
LogInfo("Scribe spell: [{}] ([{}]) request for [{}] from [{}]",
spells[spell_id].name,
spell_id,
t->GetName(),
c->GetName());
LogInfo(
"Scribe spell: [{}] ([{}]) request for [{}] from [{}]",
spells[spell_id].name,
spell_id,
t->GetName(),
c->GetName()
);
if (spells[spell_id].classes[WARRIOR] != 0 && spells[spell_id].skill != 52 &&
spells[spell_id].classes[t->GetPP().class_ - 1] > 0 && !IsDiscipline(spell_id)) {
book_slot = t->GetNextAvailableSpellBookSlot();
if (
spells[spell_id].classes[WARRIOR] != 0 &&
spells[spell_id].skill != EQ::skills::SkillTigerClaw &&
spells[spell_id].classes[t->GetPP().class_ - 1] > 0 &&
!IsDiscipline(spell_id)
) {
auto book_slot = t->GetNextAvailableSpellBookSlot();
if (book_slot >= 0 && t->FindSpellBookSlotBySpellID(spell_id) < 0) {
t->ScribeSpell(spell_id, book_slot);
}
else {
} else {
t->Message(
Chat::Red,
"Unable to scribe spell: %s (%i) to your spellbook.",
spells[spell_id].name,
spell_id
Chat::White,
fmt::format(
"Unable to scribe {} ({}) to your spellbook.",
spells[spell_id].name,
spell_id
).c_str()
);
if (t != c) {
c->Message(
Chat::Red,
"Unable to scribe spell: %s (%i) for %s.",
spells[spell_id].name,
spell_id,
t->GetName());
Chat::White,
fmt::format(
"Unable to scribe {} ({}) for {}.",
spells[spell_id].name,
spell_id,
t->GetName()
).c_str()
);
}
}
} else {
c->Message(Chat::White, "Your target cannot scribe this spell.");
}
else {
c->Message(Chat::Red, "Your target can not scribe this spell.");
}
}
else {
c->Message(Chat::Red, "Spell ID: %i is an unknown spell and cannot be scribed.", spell_id);
} else {
c->Message(
Chat::White,
fmt::format(
"Spell ID {} is an unknown spell and cannot be scribed.",
spell_id
).c_str()
);
}
}

58
zone/gm_commands/scribespells.cpp
View File

@ -2,21 +2,22 @@
void command_scribespells(Client *c, const Seperator *sep)
{
Client *target = c;
if (c->GetTarget() && c->GetTarget()->IsClient() && c->GetGM()) {
target = c->GetTarget()->CastToClient();
}
if (sep->argnum < 1 || !sep->IsNumber(1)) {
auto arguments = sep->argnum;
if (!arguments || !sep->IsNumber(1)) {
c->Message(Chat::White, "Usage: #scribespells [Max Level] [Min Level]");
return;
}
uint8 rule_max_level = (uint8) RuleI(Character, MaxLevel);
uint8 max_level = (uint8) std::stoi(sep->arg[1]);
auto t = c;
if (c->GetTarget() && c->GetTarget()->IsClient() && c->GetGM()) {
t = c->GetTarget()->CastToClient();
}
uint8 rule_max_level = RuleI(Character, MaxLevel);
auto max_level = static_cast<uint8>(std::stoul(sep->arg[1]));
uint8 min_level = (
sep->IsNumber(2) ?
(uint8) std::stoi(sep->arg[2]) :
static_cast<uint8>(std::stoul(sep->arg[2])) :
1
); // Default to Level 1 if there isn't a 2nd argument
@ -31,35 +32,38 @@ void command_scribespells(Client *c, const Seperator *sep)
}
if (max_level < 1 || min_level < 1) {
c->Message(Chat::White, "Level must be greater than or equal to 1.");
c->Message(Chat::White, "Maximum Level and Minimum Level must be greater than 0.");
return;
}
if (min_level > max_level) {
c->Message(Chat::White, "Minimum Level must be less than or equal to Maximum Level.");
c->Message(Chat::White, "Maximum Level must be greater than Minimum Level.");
return;
}
uint16 scribed_spells = target->ScribeSpells(min_level, max_level);
if (c != target) {
std::string spell_message = (
scribed_spells > 0 ?
(
scribed_spells == 1 ?
"A new spell" :
const auto scribed_spells = t->ScribeSpells(min_level, max_level);
if (c != t) {
const auto target_description = c->GetTargetDescription(t);
if (!scribed_spells) {
c->Message(
Chat::White,
fmt::format(
"{} New spells",
scribed_spells
)
) :
"No new spells"
);
"No new spells scribed for {}.",
target_description
).c_str()
);
return;
}
c->Message(
Chat::White,
fmt::format(
"{} scribed for {}.",
spell_message,
c->GetTargetDescription(target)
"{} New spell{} scribed for {}.",
scribed_spells,
scribed_spells != 1 ? "s" : "",
target_description
).c_str()
);
}