[Commands] Add #unmemspell and #unmemspells Commands. (#1867)

- Add #unmemspell [Spell ID] command to unmemorize a spell by ID from you or your target.
- Add #unmemspells command to unmemorize all spells from you or your target.
- Cleanup #memspell command and change arguments from #memspell [Slot] [Spell ID] to #memspell [Spell ID] [Spell Gem] for easier use.
- Add #memspell [Spell ID] functionality to memorize to first open spell gem if there are any using FindEmptyMemSlot helper method.
- Rename client->FindMemmedSpellByID(spell_id) to FindMemmedSpellBySpellID(spell_id).
- Add client->FindEmptyMemSlot() helper method.
- Add $client->FindEmptyMemSlot() to Perl.
- Add client:FindEmptyMemSlot() to Lua.
- Add $client->FindMemmedSpellBySpellID(spell_id) to Perl.
- Add client:FindMemmedSpellBySpellID(spell_id) to Lua.
This commit is contained in:
Kinglykrab
2021-12-08 18:18:14 -05:00
committed by GitHub
parent 1a1c3abc24
commit 94166e0f95
11 changed files with 265 additions and 54 deletions
+52 -20
View File
@@ -5,43 +5,75 @@ void command_memspell(Client *c, const Seperator *sep)
int arguments = sep->argnum;
if (
!arguments ||
!sep->IsNumber(1) ||
!sep->IsNumber(2)
!sep->IsNumber(1)
) {
c->Message(Chat::White, "Usage: #memspell [Slot] [Spell ID]");
c->Message(Chat::White, "Usage: #memspell [Spell ID] [Spell Gem]");
return;
}
Client* target = c;
auto target = c;
if (c->GetTarget() && c->GetTarget()->IsClient() && c->GetGM()) {
target = c->GetTarget()->CastToClient();
}
uint32 spell_gem = std::stoul(sep->arg[1]);
uint32 slot = (spell_gem - 1);
uint16 spell_id = static_cast<uint16>(std::stoul(sep->arg[2]));
if (
IsValidSpell(spell_id) &&
slot < EQ::spells::SPELL_GEM_COUNT
) {
target->MemSpell(spell_id, slot);
auto spell_id = static_cast<uint16>(std::stoul(sep->arg[1]));
if (!IsValidSpell(spell_id)) {
c->Message(
Chat::White,
fmt::format(
"{} ({}) has been memorized to Spell Gem {} ({}) for {}.",
GetSpellName(spell_id),
spell_id,
spell_gem,
slot,
"Spell ID {} could not be found.",
spell_id
).c_str()
);
return;
}
auto empty_slot = target->FindEmptyMemSlot();
if (empty_slot == -1) {
c->Message(
Chat::White,
fmt::format(
"{} not have a place to memorize {} ({}).",
(
c == target ?
"yourself" :
"You do" :
fmt::format(
"{} ({})",
"{} ({}) does",
target->GetCleanName(),
target->GetID()
)
)
),
GetSpellName(spell_id),
spell_id
).c_str()
);
return;
}
auto spell_gem = sep->IsNumber(2) ? std::stoul(sep->arg[2]) : empty_slot;
if (spell_gem > EQ::spells::SPELL_GEM_COUNT) {
c->Message(
Chat::White,
fmt::format(
"Spell Gems range from 0 to {}.",
EQ::spells::SPELL_GEM_COUNT
).c_str()
);
return;
}
target->MemSpell(spell_id, spell_gem);
if (c != target) {
c->Message(
Chat::White,
fmt::format(
"{} ({}) memorized to spell gem {} for {} ({}).",
GetSpellName(spell_id),
spell_id,
spell_gem,
target->GetCleanName(),
target->GetID()
).c_str()
);
}
+68
View File
@@ -0,0 +1,68 @@
#include "../client.h"
void command_unmemspell(Client *c, const Seperator *sep)
{
int arguments = sep->argnum;
if (
!arguments ||
!sep->IsNumber(1)
) {
c->Message(Chat::White, "Usage: #unmemspell [Spell ID]");
return;
}
auto target = c;
if (c->GetTarget() && c->GetTarget()->IsClient() && c->GetGM()) {
target = c->GetTarget()->CastToClient();
}
auto spell_id = static_cast<uint16>(std::stoul(sep->arg[1]));
if (!IsValidSpell(spell_id)) {
c->Message(
Chat::White,
fmt::format(
"Spell ID {} could not be found.",
spell_id
).c_str()
);
return;
}
auto spell_gem = target->FindMemmedSpellBySpellID(spell_id);
if (spell_gem == -1) {
c->Message(
Chat::White,
fmt::format(
"{} not have {} ({}) memorized.",
(
c == target ?
"You do" :
fmt::format(
"{} ({}) does",
target->GetCleanName(),
target->GetID()
)
),
GetSpellName(spell_id),
spell_id
).c_str()
);
return;
}
target->UnmemSpellBySpellID(spell_id);
if (c != target) {
c->Message(
Chat::White,
fmt::format(
"{} ({}) unmemorized for {} ({}) from spell gem {}.",
GetSpellName(spell_id),
spell_id,
target->GetCleanName(),
target->GetID(),
spell_gem
).c_str()
);
}
}
+43
View File
@@ -0,0 +1,43 @@
#include "../client.h"
void command_unmemspells(Client *c, const Seperator *sep)
{
auto target = c;
if (c->GetTarget() && c->GetTarget()->IsClient() && c->GetGM()) {
target = c->GetTarget()->CastToClient();
}
auto memmed_count = target->MemmedCount();
if (!memmed_count) {
c->Message(
Chat::White,
fmt::format(
"{} no spells to unmemorize.",
(
c == target ?
"You have" :
fmt::format(
"{} ({}) has",
target->GetCleanName(),
target->GetID()
)
)
).c_str()
);
return;
}
target->UnmemSpellAll();
if (c != target) {
c->Message(
Chat::White,
fmt::format(
"{} ({}) has had {} spells unmemorized.",
target->GetCleanName(),
target->GetID(),
memmed_count
).c_str()
);
}
}