pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-03-28 19:52:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Blocked buffs

Browse Source
This commit is contained in:
KimLS 2024-12-16 22:13:37 -08:00
parent 62a84388c0
commit 852667016d
4 changed files with 62 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
common/patches/laurion.cpp
View File

@ -3186,6 +3186,27 @@ namespace Laurion
FINISH_ENCODE(); FINISH_ENCODE();
} }
ENCODE(OP_BlockedBuffs)
{
ENCODE_LENGTH_EXACT(BlockedBuffs_Struct);
SETUP_DIRECT_ENCODE(BlockedBuffs_Struct, structs::BlockedBuffs_Struct);
for (uint32 i = 0; i < BLOCKED_BUFF_COUNT; ++i)
eq->SpellID[i] = emu->SpellID[i];
for (uint32 i = BLOCKED_BUFF_COUNT; i < structs::BLOCKED_BUFF_COUNT; ++i)
eq->SpellID[i] = -1;
OUT(Count);
OUT(Pet);
OUT(Initialise);
OUT(Flags);
FINISH_ENCODE();
}
ENCODE(OP_RemoveBlockedBuffs) { ENCODE_FORWARD(OP_BlockedBuffs); }
// DECODE methods // DECODE methods
DECODE(OP_EnterWorld) DECODE(OP_EnterWorld)
@ -3415,6 +3436,24 @@ namespace Laurion
FINISH_DIRECT_DECODE(); FINISH_DIRECT_DECODE();
} }
DECODE(OP_BlockedBuffs)
{
DECODE_LENGTH_EXACT(structs::BlockedBuffs_Struct);
SETUP_DIRECT_DECODE(BlockedBuffs_Struct, structs::BlockedBuffs_Struct);
for (uint32 i = 0; i < BLOCKED_BUFF_COUNT; ++i)
emu->SpellID[i] = eq->SpellID[i];
IN(Count);
IN(Pet);
IN(Initialise);
IN(Flags);
FINISH_DIRECT_DECODE();
}
DECODE(OP_RemoveBlockedBuffs) { DECODE_FORWARD(OP_BlockedBuffs); }
//Naive version but should work well enough for now //Naive version but should work well enough for now
int ExtractIDFile(const std::string& input) { int ExtractIDFile(const std::string& input) {
std::string number; std::string number;

5
common/patches/laurion_ops.h
View File

@ -44,6 +44,9 @@ E(OP_GMTraining)
E(OP_GMTrainSkillConfirm) E(OP_GMTrainSkillConfirm)
E(OP_SkillUpdate) E(OP_SkillUpdate)
E(OP_RespondAA) E(OP_RespondAA)
E(OP_BlockedBuffs)
E(OP_RemoveBlockedBuffs)
//list of packets we need to decode on the way in: //list of packets we need to decode on the way in:
D(OP_EnterWorld) D(OP_EnterWorld)
D(OP_ZoneEntry) D(OP_ZoneEntry)
@ -60,6 +63,8 @@ D(OP_MoveItem)
D(OP_ShopRequest) D(OP_ShopRequest)
D(OP_CastSpell) D(OP_CastSpell)
D(OP_GMTraining) D(OP_GMTraining)
D(OP_BlockedBuffs)
D(OP_RemoveBlockedBuffs)
#undef E #undef E
#undef D #undef D

10
common/patches/laurion_structs.h
View File

@ -12,6 +12,7 @@ namespace Laurion {
static const uint32 MAX_PP_UNKNOWN_ABILITIES = 25; static const uint32 MAX_PP_UNKNOWN_ABILITIES = 25;
static const uint32 MAX_RECAST_TYPES = 25; static const uint32 MAX_RECAST_TYPES = 25;
static const uint32 MAX_ITEM_RECAST_TYPES = 100; static const uint32 MAX_ITEM_RECAST_TYPES = 100;
static const uint32 BLOCKED_BUFF_COUNT = 40;
static const uint32 BUFF_COUNT = 62; static const uint32 BUFF_COUNT = 62;
static const uint32 MAX_PP_LANGUAGE = 32; static const uint32 MAX_PP_LANGUAGE = 32;
#pragma pack(1) #pragma pack(1)
@ -785,6 +786,15 @@ namespace Laurion {
/*008*/ uint8 percentage; /*008*/ uint8 percentage;
/*009*/ uint8 unknown009[3]; /*009*/ uint8 unknown009[3];
}; };
struct BlockedBuffs_Struct
{
/*000*/ int32 SpellID[BLOCKED_BUFF_COUNT];
/*120*/ uint32 Count;
/*124*/ uint8 Pet;
/*125*/ uint8 Initialise;
/*126*/ uint16 Flags;
};
#pragma pack() #pragma pack()
}; //end namespace structs }; //end namespace structs

16
utils/patches/patch_Laurion.conf
View File

@ -19,7 +19,6 @@ OP_ApproveWorld=0x0000
OP_LogServer=0x6d4d OP_LogServer=0x6d4d
OP_SendCharInfo=0x832 OP_SendCharInfo=0x832
OP_ExpansionInfo=0x066d OP_ExpansionInfo=0x066d
OP_GuildsList=0x0000
OP_EnterWorld=0x6691 OP_EnterWorld=0x6691
OP_PostEnterWorld=0x2062 OP_PostEnterWorld=0x2062
OP_World_Client_CRC1=0x74c8 OP_World_Client_CRC1=0x74c8
@ -89,9 +88,9 @@ OP_ReqClientSpawn=0x6732
OP_SpawnDoor=0x4273 OP_SpawnDoor=0x4273
OP_GroundSpawn=0x49c5 OP_GroundSpawn=0x49c5
OP_SendZonepoints=0x279f OP_SendZonepoints=0x279f
OP_BlockedBuffs=0x0000 OP_BlockedBuffs=0x4fdb
OP_RemoveBlockedBuffs=0x0000 OP_RemoveBlockedBuffs=0x53cd
OP_ClearBlockedBuffs=0x0000 OP_ClearBlockedBuffs=0x5752
OP_WorldObjectsSent=0x2879 OP_WorldObjectsSent=0x2879
OP_SendExpZonein=0x02b4 OP_SendExpZonein=0x02b4
OP_SendAATable=0x5f30 OP_SendAATable=0x5f30
@ -106,8 +105,6 @@ OP_HPUpdate=0x775c
OP_ManaChange=0x700f OP_ManaChange=0x700f
OP_TGB=0x0000 #removed; tgb is baked in and always on OP_TGB=0x0000 #removed; tgb is baked in and always on
OP_SpecialMesg=0x7d93 OP_SpecialMesg=0x7d93
OP_GuildMemberList=0x0000
OP_GuildMOTD=0x0000
OP_CharInventory=0x21d6 OP_CharInventory=0x21d6
OP_WearChange=0x44c0 OP_WearChange=0x44c0
OP_ClientUpdate=0x3a4b OP_ClientUpdate=0x3a4b
@ -115,6 +112,9 @@ OP_ClientReady=0x0831
OP_SetServerFilter=0x6b7f OP_SetServerFilter=0x6b7f
# Guild Opcodes # Guild Opcodes
OP_GuildsList=0x0000
OP_GuildMemberList=0x0000
OP_GuildMOTD=0x0000
OP_GetGuildMOTD=0x0000 OP_GetGuildMOTD=0x0000
OP_GetGuildMOTDReply=0x0000 OP_GetGuildMOTDReply=0x0000
OP_GuildMemberUpdate=0x0000 OP_GuildMemberUpdate=0x0000
@ -174,9 +174,9 @@ OP_InspectRequest=0x0000
OP_InspectAnswer=0x0000 OP_InspectAnswer=0x0000
OP_InspectMessageUpdate=0x0000 OP_InspectMessageUpdate=0x0000
OP_BeginCast=0x31f9 OP_BeginCast=0x31f9
OP_ColoredText=0x0000 OP_ColoredText=0x0f3c
OP_ConsentResponse=0x0000 OP_ConsentResponse=0x0000
OP_MemorizeSpell=0x0000 OP_MemorizeSpell=0x1d31
OP_LinkedReuse=0x0000 OP_LinkedReuse=0x0000
OP_SwapSpell=0x0000 OP_SwapSpell=0x0000
OP_CastSpell=0x325b OP_CastSpell=0x325b