From 34ffeed92dcd6738dc1944a06857faab03ae93d9 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 4 Dec 2017 19:05:57 +0300 Subject: Add packets for Zero and normal clients for 20171204 - 20171214 versions. --- src/map/packets.h | 30 +++++++- src/map/packets_keys.h | 32 ++++++++- src/map/packets_shuffle.h | 177 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 237 insertions(+), 2 deletions(-) diff --git a/src/map/packets.h b/src/map/packets.h index 5673af679..8aafc400a 100644 --- a/src/map/packets.h +++ b/src/map/packets.h @@ -3874,7 +3874,7 @@ packet(0x96e,-1,clif->ackmergeitems); // 2017-11-23dRagexe #if PACKETVER >= 20171123 // new packets - packet(0x0ae3,-1); + packet(0x0ae3,-1); // AC_LOGIN_OTP #endif // 2017-11-30bRagexe @@ -3886,4 +3886,32 @@ packet(0x96e,-1,clif->ackmergeitems); #endif #endif // PACKETVER_ZERO +// 2017-12-06aRagexeRE +#if PACKETVER >= 20171206 +// new packets + packet(0x0ae4,89); + packet(0x0ae5,-1); +// changed packet sizes +#endif + +#ifndef PACKETVER_ZERO +#if PACKETVER >= 20171213 +// new packets + packet(0x0ae3,-1); // AC_LOGIN_OTP + packet(0x0ae6,30); + packet(0x0ae7,30); +// changed packet sizes +#endif +#endif // PACKETVER_ZERO + +#ifdef PACKETVER_ZERO +#if PACKETVER >= 20171214 +// new packets + packet(0x0ae6,30); + packet(0x0ae7,30); + packet(0x0ae8,2); +// changed packet sizes +#endif +#endif // PACKETVER_ZERO + #endif /* MAP_PACKETS_H */ diff --git a/src/map/packets_keys.h b/src/map/packets_keys.h index 79cd4293b..61b1ac2b5 100644 --- a/src/map/packets_keys.h +++ b/src/map/packets_keys.h @@ -1562,7 +1562,7 @@ packetKeys(0x76725C17,0x72FE4EC1,0x07A91BFD); #endif -// 2016-11-09aRagexe, 2016-11-09bRagexeRE, 2016-11-09cRagexeRE, 2016-11-09dRagexeRE +// 2016-11-09aRagexe, 2016-11-09aRagexeRE, 2016-11-09bRagexeRE, 2016-11-09cRagexeRE, 2016-11-09dRagexeRE #if PACKETVER == 20161109 packetKeys(0x0A5277C0,0x2DB17506,0x0E8F26DA); #endif @@ -1752,6 +1752,11 @@ packetKeys(0x26B52A7F,0x5377619D,0x4F580AC4); #endif +// 2017-08-09cRagexeRE +#if PACKETVER == 20170809 + packetKeys(0x452156CB,0x71442624,0x2EE66D1C); +#endif + // 2017-08-16cRagexeRE, 2017-08-16dRagexeRE #if PACKETVER == 20170816 packetKeys(0x78914673,0x3F8B7634,0x55B814BC); @@ -1832,6 +1837,16 @@ packetKeys(0x581B77A7,0x62F74D7A,0x4F102173); #endif +// 2017-12-06aRagexeRE, 2017-12-06cRagexe +#if PACKETVER == 20171206 + packetKeys(0x39D54BD3,0x577A0C21,0x4C1C316E); +#endif + +// 2017-12-13bRagexe, 2017-12-13bRagexeRE +#if PACKETVER == 20171213 + packetKeys(0x44E41107,0x3B126921,0x00E06AAC); +#endif + // keys for zero clients #ifdef PACKETVER_ZERO // 2017-10-18aRagexe_zero, 2017-10-19aRagexe_zero, 2017-10-23aRagexe_zero, 2017-10-23bRagexe_zero, 2017-10-23cRagexe_zero, 2017-10-24aRagexe_zero, 2017-10-25bRagexe_zero, 2017-10-27aRagexe_zero, 2017-10-27bRagexe_zero, 2017-10-30aRagexe_zero, 2017-10-31aRagexe_zero, 2017-11-09aRagexe_zero, 2017-11-13aRagexe_zero, 2017-11-13bRagexe_zero @@ -1864,6 +1879,21 @@ packetKeys(0x31A04B32,0x3AC96B76,0x1742085D); #endif +// 2017-12-04bRagexe_zero +#if PACKETVER == 20171204 + packetKeys(0x06A109F1,0x6A953256,0x0A6040A3); +#endif + +// 2017-12-06aRagexe_zero, 2017-12-06bRagexe_zero, 2017-12-06cRagexe_zero, 2017-12-06dRagexe_zero, 2017-12-08aRagexe_zero, 2017-12-08cRagexe_zero, 2017-12-08dRagexe_zero, 2017-12-09bRagexe_zero, 2017-12-09cRagexe_zero, 2017-12-10aRagexe_zero, 2017-12-11bRagexe_zero, 2017-12-12aRagexe_zero, 2017-12-13aRagexe_zero, 2017-12-13bRagexe_zero, 2017-12-13cRagexe_zero +#if PACKETVER == 20171206 || PACKETVER == 20171208 || PACKETVER == 20171209 || PACKETVER == 20171210 || PACKETVER == 20171211 || PACKETVER == 20171212 || PACKETVER == 20171213 + packetKeys(0x718D0388,0x56A11525,0x20042F67); +#endif + +// 2017-12-14cRagexe_zero +#if PACKETVER == 20171214 + packetKeys(0x6CE1021D,0x77703B04,0x4E722232); +#endif + #endif // PACKETVER_ZERO #if defined(OBFUSCATIONKEY1) && defined(OBFUSCATIONKEY2) && defined(OBFUSCATIONKEY3) diff --git a/src/map/packets_shuffle.h b/src/map/packets_shuffle.h index 2b8ec94a4..36745ffd6 100644 --- a/src/map/packets_shuffle.h +++ b/src/map/packets_shuffle.h @@ -7073,6 +7073,75 @@ packet(0x096a,6,clif->pGetCharNameRequest,2); // CZ_REQNAME #endif +// 2017-12-06aRagexeRE +#if PACKETVER == 20171206 +// shuffle packets + packet(0x0360,6,clif->pReqClickBuyingStore,2); // CZ_REQ_CLICK_TO_BUYING_STORE + packet(0x0366,90,clif->pUseSkillToPosMoreInfo,2,4,6,8,10); // CZ_USE_SKILL_TOGROUND_WITHTALKBOX + packet(0x0368,6,clif->pSolveCharName,2); // CZ_REQNAME_BYGID + packet(0x0369,7,clif->pActionRequest,2,6); // CZ_REQUEST_ACT + packet(0x0437,5,clif->pWalkToXY,2); // CZ_REQUEST_MOVE + packet(0x0438,10,clif->pUseSkillToPos,2,4,6,8); // CZ_USE_SKILL_TOGROUND + packet(0x0811,-1,clif->pReqTradeBuyingStore,2,4,8,12); // CZ_REQ_TRADE_BUYING_STORE + packet(0x0815,-1,clif->pReqOpenBuyingStore,2,4,8,9,89); // CZ_REQ_OPEN_BUYING_STORE + packet(0x0817,2,clif->pReqCloseBuyingStore,0); // CZ_REQ_CLOSE_BUYING_STORE + packet(0x0819,-1,clif->pSearchStoreInfo,2,4,5,9,13,14,15); // CZ_SEARCH_STORE_INFO + packet(0x0838,12,clif->pSearchStoreInfoListItemClick,2,6,10); // CZ_SSILIST_ITEM_CLICK + packet(0x083c,10,clif->pUseSkillToId,2,4,6); // CZ_USE_SKILL + packet(0x0867,6,clif->pDropItem,2,4); // CZ_ITEM_THROW + packet(0x086a,4,clif->pDull/*,XXX*/); // CZ_GANGSI_RANK + packet(0x086e,18,clif->pPartyBookingRegisterReq,2,4); // CZ_PARTY_BOOKING_REQ_REGISTER + packet(0x0885,6,clif->pTickSend,2); // CZ_REQUEST_TIME + packet(0x0888,2,clif->pSearchStoreInfoNextPage,0); // CZ_SEARCH_STORE_INFO_NEXT_PAGE + packet(0x0897,19,clif->pWantToConnection,2,6,10,14,18); // CZ_ENTER + packet(0x089d,36,clif->pStoragePassword,0); // CZ_ACK_STORE_PASSWORD + packet(0x08a2,26,clif->pPartyInvite2,2); // CZ_PARTY_JOIN_REQ + packet(0x08a4,8,clif->pMoveFromKafra,2,4); // CZ_MOVE_ITEM_FROM_STORE_TO_BODY + packet(0x091d,26,clif->pFriendsListAdd,2); // CZ_ADD_FRIENDS + packet(0x0923,8,clif->pMoveToKafra,2,4); // CZ_MOVE_ITEM_FROM_BODY_TO_STORE + packet(0x092e,8,clif->pDull/*,XXX*/); // CZ_JOIN_BATTLE_FIELD + packet(0x0936,5,clif->pChangeDir,2,4); // CZ_CHANGE_DIRECTION + packet(0x0942,5,clif->pHomMenu,2,4); // CZ_COMMAND_MER + packet(0x0958,-1,clif->pItemListWindowSelected,2,4,8); // CZ_ITEMLISTWIN_RES + packet(0x0961,6,clif->pTakeItem,2); // CZ_ITEM_PICKUP + packet(0x096a,6,clif->pGetCharNameRequest,2); // CZ_REQNAME +#endif + +// 2017-12-13bRagexeRE +#if PACKETVER == 20171213 +// shuffle packets + packet(0x0202,26,clif->pPartyInvite2,2); // CZ_PARTY_JOIN_REQ + packet(0x0281,-1,clif->pItemListWindowSelected,2,4,8); // CZ_ITEMLISTWIN_RES + packet(0x035f,6,clif->pTickSend,2); // CZ_REQUEST_TIME + packet(0x0360,6,clif->pReqClickBuyingStore,2); // CZ_REQ_CLICK_TO_BUYING_STORE + packet(0x0362,6,clif->pDropItem,2,4); // CZ_ITEM_THROW + packet(0x0363,8,clif->pDull/*,XXX*/); // CZ_JOIN_BATTLE_FIELD + packet(0x0364,8,clif->pMoveFromKafra,2,4); // CZ_MOVE_ITEM_FROM_STORE_TO_BODY + packet(0x0365,18,clif->pPartyBookingRegisterReq,2,4); // CZ_PARTY_BOOKING_REQ_REGISTER + packet(0x0366,90,clif->pUseSkillToPosMoreInfo,2,4,6,8,10); // CZ_USE_SKILL_TOGROUND_WITHTALKBOX + packet(0x0368,6,clif->pSolveCharName,2); // CZ_REQNAME_BYGID + packet(0x0369,7,clif->pActionRequest,2,6); // CZ_REQUEST_ACT + packet(0x0437,5,clif->pWalkToXY,2); // CZ_REQUEST_MOVE + packet(0x0438,10,clif->pUseSkillToPos,2,4,6,8); // CZ_USE_SKILL_TOGROUND + packet(0x07e4,6,clif->pTakeItem,2); // CZ_ITEM_PICKUP + packet(0x07ec,8,clif->pMoveToKafra,2,4); // CZ_MOVE_ITEM_FROM_BODY_TO_STORE + packet(0x0802,26,clif->pFriendsListAdd,2); // CZ_ADD_FRIENDS + packet(0x0811,-1,clif->pReqTradeBuyingStore,2,4,8,12); // CZ_REQ_TRADE_BUYING_STORE + packet(0x0815,-1,clif->pReqOpenBuyingStore,2,4,8,9,89); // CZ_REQ_OPEN_BUYING_STORE + packet(0x0817,2,clif->pReqCloseBuyingStore,0); // CZ_REQ_CLOSE_BUYING_STORE + packet(0x0819,-1,clif->pSearchStoreInfo,2,4,5,9,13,14,15); // CZ_SEARCH_STORE_INFO + packet(0x0835,2,clif->pSearchStoreInfoNextPage,0); // CZ_SEARCH_STORE_INFO_NEXT_PAGE + packet(0x0838,12,clif->pSearchStoreInfoListItemClick,2,6,10); // CZ_SSILIST_ITEM_CLICK + packet(0x083c,10,clif->pUseSkillToId,2,4,6); // CZ_USE_SKILL + packet(0x0860,19,clif->pWantToConnection,2,6,10,14,18); // CZ_ENTER + packet(0x0881,4,clif->pDull/*,XXX*/); // CZ_GANGSI_RANK + packet(0x0890,36,clif->pStoragePassword,0); // CZ_ACK_STORE_PASSWORD + packet(0x091a,5,clif->pChangeDir,2,4); // CZ_CHANGE_DIRECTION + packet(0x0957,5,clif->pHomMenu,2,4); // CZ_COMMAND_MER + packet(0x096a,6,clif->pGetCharNameRequest,2); // CZ_REQNAME +#endif + + // kro zero clients #ifdef PACKETVER_ZERO @@ -7292,6 +7361,114 @@ packet(0x0965,10,clif->pUseSkillToId,2,4,6); // CZ_USE_SKILL #endif +// 2017-12-04bRagexe_zero +#if PACKETVER == 20171204 +// shuffle packets + packet(0x0281,6,clif->pTakeItem,2); // CZ_ITEM_PICKUP + packet(0x035f,6,clif->pTickSend,2); // CZ_REQUEST_TIME + packet(0x0360,6,clif->pReqClickBuyingStore,2); // CZ_REQ_CLICK_TO_BUYING_STORE + packet(0x0368,6,clif->pSolveCharName,2); // CZ_REQNAME_BYGID + packet(0x0369,7,clif->pActionRequest,2,6); // CZ_REQUEST_ACT + packet(0x0437,5,clif->pWalkToXY,2); // CZ_REQUEST_MOVE + packet(0x0438,10,clif->pUseSkillToPos,2,4,6,8); // CZ_USE_SKILL_TOGROUND + packet(0x0811,-1,clif->pReqTradeBuyingStore,2,4,8,12); // CZ_REQ_TRADE_BUYING_STORE + packet(0x0815,-1,clif->pReqOpenBuyingStore,2,4,8,9,89); // CZ_REQ_OPEN_BUYING_STORE + packet(0x0817,2,clif->pReqCloseBuyingStore,0); // CZ_REQ_CLOSE_BUYING_STORE + packet(0x0819,-1,clif->pSearchStoreInfo,2,4,5,9,13,14,15); // CZ_SEARCH_STORE_INFO + packet(0x0835,2,clif->pSearchStoreInfoNextPage,0); // CZ_SEARCH_STORE_INFO_NEXT_PAGE + packet(0x0838,12,clif->pSearchStoreInfoListItemClick,2,6,10); // CZ_SSILIST_ITEM_CLICK + packet(0x083c,10,clif->pUseSkillToId,2,4,6); // CZ_USE_SKILL + packet(0x085b,8,clif->pDull/*,XXX*/); // CZ_JOIN_BATTLE_FIELD + packet(0x086f,19,clif->pWantToConnection,2,6,10,14,18); // CZ_ENTER + packet(0x087d,-1,clif->pItemListWindowSelected,2,4,8); // CZ_ITEMLISTWIN_RES + packet(0x0885,90,clif->pUseSkillToPosMoreInfo,2,4,6,8,10); // CZ_USE_SKILL_TOGROUND_WITHTALKBOX + packet(0x0887,5,clif->pChangeDir,2,4); // CZ_CHANGE_DIRECTION + packet(0x0892,4,clif->pDull/*,XXX*/); // CZ_GANGSI_RANK + packet(0x0896,36,clif->pStoragePassword,0); // CZ_ACK_STORE_PASSWORD + packet(0x08aa,26,clif->pPartyInvite2,2); // CZ_PARTY_JOIN_REQ + packet(0x0917,8,clif->pMoveFromKafra,2,4); // CZ_MOVE_ITEM_FROM_STORE_TO_BODY + packet(0x091b,26,clif->pFriendsListAdd,2); // CZ_ADD_FRIENDS + packet(0x0921,18,clif->pPartyBookingRegisterReq,2,4); // CZ_PARTY_BOOKING_REQ_REGISTER + packet(0x0924,5,clif->pHomMenu,2,4); // CZ_COMMAND_MER + packet(0x0937,8,clif->pMoveToKafra,2,4); // CZ_MOVE_ITEM_FROM_BODY_TO_STORE + packet(0x0960,6,clif->pDropItem,2,4); // CZ_ITEM_THROW + packet(0x096a,6,clif->pGetCharNameRequest,2); // CZ_REQNAME +#endif + +// 2017-12-06dRagexe_zero, 2017-12-08dRagexe_zero, 2017-12-08cRagexe_zero, 2017-12-09bRagexe_zero +#if PACKETVER == 20171206 || \ + PACKETVER == 20171208 || \ + PACKETVER == 20171209 || \ + PACKETVER == 20171210 || \ + PACKETVER == 20171211 || \ + PACKETVER == 20171212 || \ + PACKETVER == 20171213 +// shuffle packets + packet(0x0281,10,clif->pUseSkillToId,2,4,6); // CZ_USE_SKILL + packet(0x0366,6,clif->pDropItem,2,4); // CZ_ITEM_THROW + packet(0x0436,6,clif->pReqClickBuyingStore,2); // CZ_REQ_CLICK_TO_BUYING_STORE + packet(0x0835,6,clif->pTakeItem,2); // CZ_ITEM_PICKUP + packet(0x083c,8,clif->pDull/*,XXX*/); // CZ_JOIN_BATTLE_FIELD + packet(0x0860,4,clif->pDull/*,XXX*/); // CZ_GANGSI_RANK + packet(0x0862,5,clif->pChangeDir,2,4); // CZ_CHANGE_DIRECTION + packet(0x0864,5,clif->pWalkToXY,2); // CZ_REQUEST_MOVE + packet(0x0870,8,clif->pMoveToKafra,2,4); // CZ_MOVE_ITEM_FROM_BODY_TO_STORE + packet(0x0878,10,clif->pUseSkillToPos,2,4,6,8); // CZ_USE_SKILL_TOGROUND + packet(0x087a,18,clif->pPartyBookingRegisterReq,2,4); // CZ_PARTY_BOOKING_REQ_REGISTER + packet(0x087b,-1,clif->pReqTradeBuyingStore,2,4,8,12); // CZ_REQ_TRADE_BUYING_STORE + packet(0x0885,6,clif->pSolveCharName,2); // CZ_REQNAME_BYGID + packet(0x088d,26,clif->pPartyInvite2,2); // CZ_PARTY_JOIN_REQ + packet(0x0893,26,clif->pFriendsListAdd,2); // CZ_ADD_FRIENDS + packet(0x0897,5,clif->pHomMenu,2,4); // CZ_COMMAND_MER + packet(0x089e,12,clif->pSearchStoreInfoListItemClick,2,6,10); // CZ_SSILIST_ITEM_CLICK + packet(0x08a4,-1,clif->pReqOpenBuyingStore,2,4,8,9,89); // CZ_REQ_OPEN_BUYING_STORE + packet(0x08ac,7,clif->pActionRequest,2,6); // CZ_REQUEST_ACT + packet(0x0920,19,clif->pWantToConnection,2,6,10,14,18); // CZ_ENTER + packet(0x0934,2,clif->pReqCloseBuyingStore,0); // CZ_REQ_CLOSE_BUYING_STORE + packet(0x0936,8,clif->pMoveFromKafra,2,4); // CZ_MOVE_ITEM_FROM_STORE_TO_BODY + packet(0x093a,-1,clif->pItemListWindowSelected,2,4,8); // CZ_ITEMLISTWIN_RES + packet(0x0940,90,clif->pUseSkillToPosMoreInfo,2,4,6,8,10); // CZ_USE_SKILL_TOGROUND_WITHTALKBOX + packet(0x0941,6,clif->pGetCharNameRequest,2); // CZ_REQNAME + packet(0x0959,36,clif->pStoragePassword,0); // CZ_ACK_STORE_PASSWORD + packet(0x095b,2,clif->pSearchStoreInfoNextPage,0); // CZ_SEARCH_STORE_INFO_NEXT_PAGE + packet(0x095c,-1,clif->pSearchStoreInfo,2,4,5,9,13,14,15); // CZ_SEARCH_STORE_INFO + packet(0x095f,6,clif->pTickSend,2); // CZ_REQUEST_TIME +#endif + +// 2017-12-14cRagexe_zero +#if PACKETVER == 20171214 +// shuffle packets + packet(0x023b,2,clif->pSearchStoreInfoNextPage,0); // CZ_SEARCH_STORE_INFO_NEXT_PAGE + packet(0x02c4,6,clif->pDropItem,2,4); // CZ_ITEM_THROW + packet(0x0438,6,clif->pGetCharNameRequest,2); // CZ_REQNAME + packet(0x085b,36,clif->pStoragePassword,0); // CZ_ACK_STORE_PASSWORD + packet(0x085e,18,clif->pPartyBookingRegisterReq,2,4); // CZ_PARTY_BOOKING_REQ_REGISTER + packet(0x0862,6,clif->pSolveCharName,2); // CZ_REQNAME_BYGID + packet(0x0864,8,clif->pDull/*,XXX*/); // CZ_JOIN_BATTLE_FIELD + packet(0x086a,5,clif->pWalkToXY,2); // CZ_REQUEST_MOVE + packet(0x0871,19,clif->pWantToConnection,2,6,10,14,18); // CZ_ENTER + packet(0x0873,-1,clif->pItemListWindowSelected,2,4,8); // CZ_ITEMLISTWIN_RES + packet(0x0886,6,clif->pReqClickBuyingStore,2); // CZ_REQ_CLICK_TO_BUYING_STORE + packet(0x088b,4,clif->pDull/*,XXX*/); // CZ_GANGSI_RANK + packet(0x088c,8,clif->pMoveToKafra,2,4); // CZ_MOVE_ITEM_FROM_BODY_TO_STORE + packet(0x0892,10,clif->pUseSkillToId,2,4,6); // CZ_USE_SKILL + packet(0x0894,6,clif->pTakeItem,2); // CZ_ITEM_PICKUP + packet(0x0897,-1,clif->pReqTradeBuyingStore,2,4,8,12); // CZ_REQ_TRADE_BUYING_STORE + packet(0x08a3,26,clif->pFriendsListAdd,2); // CZ_ADD_FRIENDS + packet(0x08a5,90,clif->pUseSkillToPosMoreInfo,2,4,6,8,10); // CZ_USE_SKILL_TOGROUND_WITHTALKBOX + packet(0x08ac,2,clif->pReqCloseBuyingStore,0); // CZ_REQ_CLOSE_BUYING_STORE + packet(0x0933,7,clif->pActionRequest,2,6); // CZ_REQUEST_ACT + packet(0x094a,5,clif->pChangeDir,2,4); // CZ_CHANGE_DIRECTION + packet(0x094d,5,clif->pHomMenu,2,4); // CZ_COMMAND_MER + packet(0x094f,-1,clif->pSearchStoreInfo,2,4,5,9,13,14,15); // CZ_SEARCH_STORE_INFO + packet(0x0951,26,clif->pPartyInvite2,2); // CZ_PARTY_JOIN_REQ + packet(0x095a,8,clif->pMoveFromKafra,2,4); // CZ_MOVE_ITEM_FROM_STORE_TO_BODY + packet(0x095b,12,clif->pSearchStoreInfoListItemClick,2,6,10); // CZ_SSILIST_ITEM_CLICK + packet(0x0960,6,clif->pTickSend,2); // CZ_REQUEST_TIME + packet(0x0969,-1,clif->pReqOpenBuyingStore,2,4,8,9,89); // CZ_REQ_OPEN_BUYING_STORE + packet(0x096a,10,clif->pUseSkillToPos,2,4,6,8); // CZ_USE_SKILL_TOGROUND +#endif + #endif // PACKETVER_ZERO #endif /* MAP_PACKETS_SHUFFLE_H */ -- cgit v1.2.3-60-g2f50