pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-21 23:08:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed memorization for parity with RoF2

Browse Source
This commit is contained in:
dannuic
2026-04-17 23:35:34 -06:00
parent ec5a9d0bd4
commit 3bb7f94713
1 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/patches/tob.cpp
+20 -7
View File
@@ -25,6 +25,7 @@
#include <cinttypes> #include <cinttypes>
#include <set> #include <set>
#include "common/packet_dump.h"
#include "world/sof_char_create_data.h" #include "world/sof_char_create_data.h"
namespace TOB namespace TOB
@@ -961,11 +962,13 @@ namespace TOB
ENCODE_LENGTH_EXACT(MemorizeSpell_Struct); ENCODE_LENGTH_EXACT(MemorizeSpell_Struct);
SETUP_DIRECT_ENCODE(MemorizeSpell_Struct, structs::MemorizeSpell_Struct); SETUP_DIRECT_ENCODE(MemorizeSpell_Struct, structs::MemorizeSpell_Struct);
// TODO: TOB has a "finish memming" value (2) here, might be needed to keep client spell gems in sync // in TOB, 2 is "finish memming" so that becomes 1 in emu and 3 is "unmem" which becomes 2
if (emu->scribing == 2) if (emu->scribing == 1)
eq->scribing = 2;
else if (emu->scribing == 2)
eq->scribing = 3; eq->scribing = 3;
else else
OUT(scribing); OUT(scribing); // TODO: can handle 4 here (I assume it's just like 2 or 3 but can have a reduction component)
OUT(slot); OUT(slot);
OUT(spell_id); OUT(spell_id);
@@ -3842,11 +3845,21 @@ namespace TOB
DECODE_LENGTH_EXACT(structs::MemorizeSpell_Struct); DECODE_LENGTH_EXACT(structs::MemorizeSpell_Struct);
SETUP_DIRECT_DECODE(MemorizeSpell_Struct, structs::MemorizeSpell_Struct); SETUP_DIRECT_DECODE(MemorizeSpell_Struct, structs::MemorizeSpell_Struct);
// TODO: TOB has a "finish memming" value (2) here, might be needed to keep client spell gems in sync // TOB sends status 1 here to let the server know that it's started memming, but doesn't want a response
if (emu->scribing == 3) if (eq->scribing == 1) {
eq->scribing = 2; // TODO: There should be a timer set here to detect short-mem cheats, and then checked when the 2 packet is sent
// The previous detection will still happen on scribing == 2, the new client just handles it better
__packet->SetOpcode(OP_Unknown);
return;
}
// in TOB, 2 is "finish memming" so that becomes 1 in emu and 3 is "unmem" which becomes 2
if (eq->scribing == 2)
emu->scribing = 1;
else if (eq->scribing == 3)
emu->scribing = 2;
else else
IN(scribing); IN(scribing); // TODO: Handle 4 here (clicky keyring)
IN(slot); IN(slot);
IN(spell_id); IN(spell_id);