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

[Bug Fix] Allow High Level Spells to be Unmemorized. (#2641)

Browse Source 
* [Bug Fix] Allow High Level Spells to be Unmemorized.

# Notes
- If you deleveled below a spell's level, you couldn't unmemorize it, this fixes that.

* Update client_process.cpp
This commit is contained in:
Alex King 2022-12-14 17:18:51 -05:00 committed by GitHub
parent bc277ac296
commit 337dc54eb9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 58 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
zone/client_process.cpp
View File

@ -1083,72 +1083,86 @@ void Client::OPTGB(const EQApplicationPacket *app)
void Client::OPMemorizeSpell(const EQApplicationPacket* app)
{
if(app->size != sizeof(MemorizeSpell_Struct))
{
LogError("[Client::OPMemorizeSpell] Wrong size on OP_MemorizeSpell. Got: [{}] Expected: [{}]", app->size, sizeof(MemorizeSpell_Struct));
if (app->size != sizeof(MemorizeSpell_Struct)) {
LogError(
"[Client::OPMemorizeSpell] Wrong size on OP_MemorizeSpell. Got: [{}] Expected: [{}]",
app->size,
sizeof(MemorizeSpell_Struct)
);
DumpPacket(app);
return;
}
const MemorizeSpell_Struct* memspell = (const MemorizeSpell_Struct*) app->pBuffer;
const auto* m = (MemorizeSpell_Struct*) app->pBuffer;
if(!IsValidSpell(memspell->spell_id))
{
Message(Chat::Red, "Unexpected error: spell id out of range");
if (!IsValidSpell(m->spell_id)) {
Message(
Chat::Red,
fmt::format(
"Spell ID {} does not exist or is invalid.",
m->spell_id
).c_str()
);
return;
}
if
(
GetClass() > 16 ||
GetLevel() < spells[memspell->spell_id].classes[GetClass()-1]
)
{
char val1[20]={0};
MessageString(Chat::Red,SPELL_LEVEL_TO_LOW,ConvertArray(spells[memspell->spell_id].classes[GetClass()-1],val1),spells[memspell->spell_id].name);
//Message(Chat::Red, "Unexpected error: Class cant use this spell at your level!");
if (
m->scribing != memSpellForget &&
(
!EQ::ValueWithin(GetClass(), PLAYER_CLASS_WARRIOR, PLAYER_CLASS_BERSERKER) ||
GetLevel() < spells[m->spell_id].classes[GetClass() - 1]
)
) {
MessageString(
Chat::Red,
SPELL_LEVEL_TO_LOW,
std::to_string(spells[m->spell_id].classes[GetClass() - 1]).c_str(),
spells[m->spell_id].name
);
return;
}
switch(memspell->scribing)
{
case memSpellScribing: { // scribing spell to book
const EQ::ItemInstance* inst = m_inv[EQ::invslot::slotCursor];
switch (m->scribing) {
case memSpellScribing: {
const auto* inst = m_inv[EQ::invslot::slotCursor];
if (inst && inst->IsClassCommon())
{
const EQ::ItemData* item = inst->GetItem();
if (inst && inst->IsClassCommon()) {
const auto* item = inst->GetItem();
if (RuleB(Character, RestrictSpellScribing) && !item->IsEquipable(GetRace(), GetClass())) {
if (
RuleB(Character, RestrictSpellScribing) &&
!item->IsEquipable(GetRace(), GetClass())
) {
MessageString(Chat::Red, CANNOT_USE_ITEM);
break;
}
if(item && item->Scroll.Effect == (int32)(memspell->spell_id))
{
ScribeSpell(memspell->spell_id, memspell->slot);
if (item && item->Scroll.Effect == static_cast<int32>(m->spell_id)) {
ScribeSpell(m->spell_id, m->slot);
DeleteItemInInventory(EQ::invslot::slotCursor, 1, true);
} else {
Message(Chat::Red, "Scribing spell: Item Instance exists but item does not or spell ids do not match.");
}
else
Message(0,"Scribing spell: inst exists but item does not or spell ids do not match.");
}
else
Message(0,"Scribing a spell without an inst on your cursor?");
break;
}
case memSpellMemorize: { // memming spell
if(HasSpellScribed(memspell->spell_id))
{
MemSpell(memspell->spell_id, memspell->slot);
}
else
{
database.SetMQDetectionFlag(AccountName(), GetName(), "OP_MemorizeSpell but we don't have this spell scribed...", zone->GetShortName());
} else {
Message(Chat::Red, "Scribing a spell without an Item Instance on your cursor?");
}
break;
}
case memSpellForget: { // unmemming spell
UnmemSpell(memspell->slot);
case memSpellMemorize: {
if (HasSpellScribed(m->spell_id)) {
MemSpell(m->spell_id, m->slot);
} else {
database.SetMQDetectionFlag(
AccountName(),
GetName(),
"OP_MemorizeSpell but we don't have this spell scribed...",
zone->GetShortName()
);
}
break;
}
case memSpellForget: {
UnmemSpell(m->slot);
break;
}
}