From 243f4ca3be3fc7bf8a4ca17ebb0b795910cdae99 Mon Sep 17 00:00:00 2001 From: Lemongrass3110 Date: Mon, 13 Nov 2017 20:51:31 +0100 Subject: [PATCH] Support for 2017-10-25 and 2017-11-01 Merges HerculesWS/Hercules@3e03556 Thanks to @4144 --- src/map/clif_obfuscation.hpp | 6 +++- src/map/clif_shuffle.hpp | 62 ++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 1 deletion(-) diff --git a/src/map/clif_obfuscation.hpp b/src/map/clif_obfuscation.hpp index 878c62b5ca..e5d568efa7 100644 --- a/src/map/clif_obfuscation.hpp +++ b/src/map/clif_obfuscation.hpp @@ -380,10 +380,14 @@ packet_keys(0x15624100,0x0CE1463E,0x0E5D6534); #elif PACKETVER == 20171002 // 2017-10-02cRagexeRE packet_keys(0x15E1716C,0x4E765B63,0x357D2370); - #elif PACKETVER == 20171011 // 2017-10-11aRagexeREor 2017-10-11bRagexeRE + #elif PACKETVER == 20171011 // 2017-10-11aRagexeRE or 2017-10-11bRagexeRE packet_keys(0x4F121B3E,0x12670E17,0x19896C11); #elif PACKETVER == 20171018 // 2017-10-18aRagexeRE packet_keys(0x2CAA109C,0x158C1EC2,0x7A5E58F3); + #elif PACKETVER == 20171025 // 2017-10-25bRagexeRE or 2017-10-25cRagexeRE or 2017-10-25dRagexeRE or 2017-10-25eRagexeRE + packet_keys(0x165C565C,0x565C565C,0x565C565C); + #if PACKETVER == 20171101 // 2017-11-01bRagexeRE + packet_keys(0x7056317F,0x7EEE0589,0x02672373); #elif PACKETVER > 20110817 #error Unsupported packet version. #endif diff --git a/src/map/clif_shuffle.hpp b/src/map/clif_shuffle.hpp index a2a22cbbcc..1b95263f18 100644 --- a/src/map/clif_shuffle.hpp +++ b/src/map/clif_shuffle.hpp @@ -4191,6 +4191,68 @@ parseable_packet(0x094A,26,clif_parse_FriendsListAdd,2); parseable_packet(0x094F,18,clif_parse_PartyBookingRegisterReq,2,4); parseable_packet(0x096A,6,clif_parse_GetCharNameRequest,2); +// 2017-10-25bRagexeRE or 2017-10-25cRagexeRE or 2017-10-25dRagexeRE or 2017-10-25eRagexeRE +#elif PACKETVER == 20171025 + parseable_packet(0x0202,5,clif_parse_ChangeDir,2,4); + parseable_packet(0x022D,19,clif_parse_WantToConnection,2,6,10,14,18); + parseable_packet(0x023B,26,clif_parse_FriendsListAdd,2); + parseable_packet(0x0281,-1,clif_parse_ItemListWindowSelected,2,4,8,12); + parseable_packet(0x035F,6,clif_parse_TickSend,2); + parseable_packet(0x0360,6,clif_parse_ReqClickBuyingStore,2); + parseable_packet(0x0361,5,clif_parse_HomMenu,2,4); + parseable_packet(0x0362,6,clif_parse_DropItem,2,4); + //parseable_packet(0x0363,8,NULL,0); // CZ_JOIN_BATTLE_FIELD + parseable_packet(0x0364,8,clif_parse_MoveFromKafra,2,4); + parseable_packet(0x0365,18,clif_parse_PartyBookingRegisterReq,2,4); + parseable_packet(0x0366,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10); + parseable_packet(0x0368,6,clif_parse_SolveCharName,2); + parseable_packet(0x0369,7,clif_parse_ActionRequest,2,6); + //parseable_packet(0x0436,4,NULL,0); // CZ_GANGSI_RANK + parseable_packet(0x0437,5,clif_parse_WalkToXY,2); + parseable_packet(0x0438,10,clif_parse_UseSkillToPos,2,4,6,8); + parseable_packet(0x07E4,6,clif_parse_TakeItem,2); + parseable_packet(0x07EC,8,clif_parse_MoveToKafra,2,4); + parseable_packet(0x0802,26,clif_parse_PartyInvite2,2); + parseable_packet(0x0811,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12); + parseable_packet(0x0815,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89); + parseable_packet(0x0817,2,clif_parse_ReqCloseBuyingStore,0); + parseable_packet(0x0819,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15); + parseable_packet(0x0835,2,clif_parse_SearchStoreInfoNextPage,0); + parseable_packet(0x0838,12,clif_parse_SearchStoreInfoListItemClick,2,6,10); + parseable_packet(0x083C,10,clif_parse_UseSkillToId,2,4,6); + parseable_packet(0x08A2,36,clif_parse_StoragePassword,0); + parseable_packet(0x096A,6,clif_parse_GetCharNameRequest,2); +// 2017-11-01bRagexeRE +#elif PACKETVER == 20171101 + parseable_packet(0x022D,36,clif_parse_StoragePassword,0); + parseable_packet(0x0368,19,clif_parse_WantToConnection,2,6,10,14,18); + parseable_packet(0x0369,-1,clif_parse_SearchStoreInfo,2,4,5,9,13,14,15); + parseable_packet(0x0438,6,clif_parse_TickSend,2); + parseable_packet(0x0835,6,clif_parse_DropItem,2,4); + parseable_packet(0x085B,5,clif_parse_HomMenu,2,4); + parseable_packet(0x0860,6,clif_parse_GetCharNameRequest,2); + parseable_packet(0x086C,10,clif_parse_UseSkillToId,2,4,6); + parseable_packet(0x0872,26,clif_parse_FriendsListAdd,2); + parseable_packet(0x0876,5,clif_parse_ChangeDir,2,4); + //parseable_packet(0x0886,8,NULL,0); // CZ_JOIN_BATTLE_FIELD + parseable_packet(0x088E,6,clif_parse_ReqClickBuyingStore,2); + parseable_packet(0x0890,2,clif_parse_SearchStoreInfoNextPage,0); + //parseable_packet(0x0895,4,NULL,0); // CZ_GANGSI_RANK + parseable_packet(0x0899,26,clif_parse_PartyInvite2,2); + parseable_packet(0x089B,-1,clif_parse_ReqOpenBuyingStore,2,4,8,9,89); + parseable_packet(0x089C,18,clif_parse_PartyBookingRegisterReq,2,4); + parseable_packet(0x08A0,8,clif_parse_MoveFromKafra,2,4); + parseable_packet(0x08AB,-1,clif_parse_ItemListWindowSelected,2,4,8,12); + parseable_packet(0x08AD,12,clif_parse_SearchStoreInfoListItemClick,2,6,10); + parseable_packet(0x091B,8,clif_parse_MoveToKafra,2,4); + parseable_packet(0x0939,5,clif_parse_WalkToXY,2); + parseable_packet(0x094A,2,clif_parse_ReqCloseBuyingStore,0); + parseable_packet(0x094D,6,clif_parse_SolveCharName,2); + parseable_packet(0x0952,90,clif_parse_UseSkillToPosMoreInfo,2,4,6,8,10); + parseable_packet(0x0957,7,clif_parse_ActionRequest,2,6); + parseable_packet(0x095A,-1,clif_parse_ReqTradeBuyingStore,2,4,8,12); + parseable_packet(0x0962,6,clif_parse_TakeItem,2); + parseable_packet(0x0966,10,clif_parse_UseSkillToPos,2,4,6,8); #endif #endif /* _CLIF_SHUFFLE_HPP_ */