diff options
author | Haru <haru@dotalux.com> | 2018-05-27 03:03:16 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-27 03:03:16 +0200 |
commit | 6d50cfd839d45cb2c224d180c11a80324dc4a6f2 (patch) | |
tree | ecf0f6bd79bae1214e09555717b1a42e60487b43 /src/map | |
parent | 7bee81954a6ee741abbd87aa9ea2a6116c053811 (diff) | |
parent | 5dfd713984fbfde98182da9fe23dcebefce7210d (diff) | |
download | hercules-6d50cfd839d45cb2c224d180c11a80324dc4a6f2.tar.gz hercules-6d50cfd839d45cb2c224d180c11a80324dc4a6f2.tar.bz2 hercules-6d50cfd839d45cb2c224d180c11a80324dc4a6f2.tar.xz hercules-6d50cfd839d45cb2c224d180c11a80324dc4a6f2.zip |
Merge pull request #2043 from 4144/updatepackets
Update packets
Diffstat (limited to 'src/map')
-rw-r--r-- | src/map/packets.h | 18 | ||||
-rw-r--r-- | src/map/packets_keys_main.h | 7 | ||||
-rw-r--r-- | src/map/packets_keys_zero.h | 11 | ||||
-rw-r--r-- | src/map/packets_shuffle_main.h | 7 | ||||
-rw-r--r-- | src/map/packets_shuffle_zero.h | 39 |
5 files changed, 74 insertions, 8 deletions
diff --git a/src/map/packets.h b/src/map/packets.h index 29a0e0090..ce93ef36c 100644 --- a/src/map/packets.h +++ b/src/map/packets.h @@ -4109,4 +4109,22 @@ packet(0x96e,-1,clif->ackmergeitems); #endif #endif // PACKETVER_ZERO +#ifndef PACKETVER_ZERO +// 2018-05-16cRagexe, 2018-05-16cRagexeRE +#if PACKETVER >= 20180516 +// new packets + packet(0x0afc,16,clif->pDull/*,XXX*/); +// changed packet sizes +#endif +#endif // PACKETVER_ZERO + +#ifdef PACKETVER_ZERO +// 2018-05-23aRagexe_zero +#if PACKETVER >= 20180523 +// new packets + packet(0x0afc,16,clif->pDull/*,XXX*/); +// changed packet sizes +#endif +#endif // PACKETVER_ZERO + #endif /* MAP_PACKETS_H */ diff --git a/src/map/packets_keys_main.h b/src/map/packets_keys_main.h index 5890377d6..a9ded1f1f 100644 --- a/src/map/packets_keys_main.h +++ b/src/map/packets_keys_main.h @@ -874,7 +874,7 @@ packetKeys(0x6A596301,0x76866D0E,0x32294A45); #endif -// 2013-12-23aRagexeRE, 2014-05-08aRagexe, 2014-05-08aRagexeRE, 2014-06-11eRagexe, 2015-02-25hRagexe, 2018-03-15aRagexe, 2018-03-21aRagexe, 2018-03-21aRagexeRE, 2018-03-28bRagexe, 2018-03-28bRagexeRE, 2018-04-04bRagexe, 2018-04-04cRagexeRE, 2018-04-18aRagexe, 2018-04-18bRagexeRE, 2018-04-25cRagexe, 2018-04-25cRagexeRE, 2018-05-02bRagexe, 2018-05-02bRagexeRE +// 2013-12-23aRagexeRE, 2014-05-08aRagexe, 2014-05-08aRagexeRE, 2014-06-11eRagexe, 2015-02-25hRagexe, 2018-03-15aRagexe, 2018-03-21aRagexe, 2018-03-21aRagexeRE, 2018-03-28bRagexe, 2018-03-28bRagexeRE, 2018-04-04bRagexe, 2018-04-04cRagexeRE, 2018-04-18aRagexe, 2018-04-18bRagexeRE, 2018-04-25cRagexe, 2018-04-25cRagexeRE, 2018-05-02bRagexe, 2018-05-02bRagexeRE, 2018-05-02dRagexeRE, 2018-05-09aRagexe, 2018-05-16cRagexe, 2018-05-16cRagexeRE, 2018-05-23aRagexe, 2018-05-23aRagexeRE #if PACKETVER == 20131223 || \ PACKETVER == 20140508 || \ PACKETVER == 20140611 || \ @@ -885,7 +885,10 @@ PACKETVER == 20180404 || \ PACKETVER == 20180418 || \ PACKETVER == 20180425 || \ - PACKETVER >= 20180502 + PACKETVER == 20180502 || \ + PACKETVER == 20180509 || \ + PACKETVER == 20180516 || \ + PACKETVER >= 20180523 packetKeys(0x00000000,0x00000000,0x00000000); #endif diff --git a/src/map/packets_keys_zero.h b/src/map/packets_keys_zero.h index 8540ff5a5..f1249a236 100644 --- a/src/map/packets_keys_zero.h +++ b/src/map/packets_keys_zero.h @@ -29,7 +29,7 @@ /* This file is autogenerated, please do not commit manual changes */ -// 2017-10-19aRagexe_zero, 2017-10-23aRagexe_zero, 2017-10-23bRagexe_zero, 2017-10-23cRagexe_zero, 2017-10-24aRagexe_2_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, 2018-03-15aRagexe_zero, 2018-03-21aRagexe_zero, 2018-03-21bRagexe_zero, 2018-03-28_1aRagexe_zero, 2018-03-28cRagexe_zero, 2018-04-11aRagexe_zero, 2018-04-25_3aRagexe_zero +// 2017-10-19aRagexe_zero, 2017-10-23aRagexe_zero, 2017-10-23bRagexe_zero, 2017-10-23cRagexe_zero, 2017-10-24aRagexe_2_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, 2018-03-15aRagexe_zero, 2018-03-21aRagexe_zero, 2018-03-21bRagexe_zero, 2018-03-28_1aRagexe_zero, 2018-03-28cRagexe_zero, 2018-04-11aRagexe_zero, 2018-04-25_3aRagexe_zero, 2018-05-09_3aRagexe_zero, 2018-05-23aRagexe_zero #if PACKETVER == 20171019 || \ PACKETVER == 20171023 || \ PACKETVER == 20171024 || \ @@ -43,7 +43,9 @@ PACKETVER == 20180321 || \ PACKETVER == 20180328 || \ PACKETVER == 20180411 || \ - PACKETVER >= 20180425 + PACKETVER == 20180425 || \ + PACKETVER == 20180509 || \ + PACKETVER >= 20180523 packetKeys(0x00000000,0x00000000,0x00000000); #endif @@ -151,5 +153,10 @@ packetKeys(0x2FC330DD,0x01C04E1F,0x4D914DE2); #endif +// 2018-05-11aRagexe_zero, 2018-05-11bRagexe_zero +#if PACKETVER == 20180511 + packetKeys(0x1C055B65,0x68CE748D,0x32AF761D); +#endif + #endif /* MAP_PACKETS_ZERO_KEYS_H */ diff --git a/src/map/packets_shuffle_main.h b/src/map/packets_shuffle_main.h index 6ef63aae9..82c9c5d74 100644 --- a/src/map/packets_shuffle_main.h +++ b/src/map/packets_shuffle_main.h @@ -3345,7 +3345,7 @@ packet(0x0969,2,clif->pSearchStoreInfoNextPage,0); // CZ_SEARCH_STORE_INFO_NEXT_PAGE #endif -// 2014-06-11eRagexe, 2015-02-25hRagexe, 2018-03-15aRagexe, 2018-03-21aRagexe, 2018-03-21aRagexeRE, 2018-03-28bRagexe, 2018-03-28bRagexeRE, 2018-04-04bRagexe, 2018-04-04cRagexeRE, 2018-04-18aRagexe, 2018-04-18bRagexeRE, 2018-04-25cRagexe, 2018-04-25cRagexeRE, 2018-05-02bRagexe, 2018-05-02bRagexeRE +// 2014-06-11eRagexe, 2015-02-25hRagexe, 2018-03-15aRagexe, 2018-03-21aRagexe, 2018-03-21aRagexeRE, 2018-03-28bRagexe, 2018-03-28bRagexeRE, 2018-04-04bRagexe, 2018-04-04cRagexeRE, 2018-04-18aRagexe, 2018-04-18bRagexeRE, 2018-04-25cRagexe, 2018-04-25cRagexeRE, 2018-05-02bRagexe, 2018-05-02bRagexeRE, 2018-05-02dRagexeRE, 2018-05-09aRagexe, 2018-05-16cRagexe, 2018-05-16cRagexeRE, 2018-05-23aRagexe, 2018-05-23aRagexeRE #if PACKETVER == 20140611 || \ PACKETVER == 20150225 || \ PACKETVER == 20180315 || \ @@ -3354,7 +3354,10 @@ PACKETVER == 20180404 || \ PACKETVER == 20180418 || \ PACKETVER == 20180425 || \ - PACKETVER >= 20180502 + PACKETVER == 20180502 || \ + PACKETVER == 20180509 || \ + PACKETVER == 20180516 || \ + PACKETVER >= 20180523 packet(0x0202,26,clif->pFriendsListAdd,2); // CZ_ADD_FRIENDS packet(0x022d,5,clif->pHomMenu,2,4); // CZ_COMMAND_MER packet(0x023b,36,clif->pStoragePassword,0); // CZ_ACK_STORE_PASSWORD diff --git a/src/map/packets_shuffle_zero.h b/src/map/packets_shuffle_zero.h index e7083e200..578e5431d 100644 --- a/src/map/packets_shuffle_zero.h +++ b/src/map/packets_shuffle_zero.h @@ -36,7 +36,7 @@ /* This file is autogenerated, please do not commit manual changes */ -// 2017-10-19aRagexe_zero, 2017-10-23aRagexe_zero, 2017-10-23bRagexe_zero, 2017-10-23cRagexe_zero, 2017-10-24aRagexe_2_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, 2018-03-15aRagexe_zero, 2018-03-21aRagexe_zero, 2018-03-21bRagexe_zero, 2018-03-28_1aRagexe_zero, 2018-03-28cRagexe_zero, 2018-04-11aRagexe_zero, 2018-04-25_3aRagexe_zero +// 2017-10-19aRagexe_zero, 2017-10-23aRagexe_zero, 2017-10-23bRagexe_zero, 2017-10-23cRagexe_zero, 2017-10-24aRagexe_2_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, 2018-03-15aRagexe_zero, 2018-03-21aRagexe_zero, 2018-03-21bRagexe_zero, 2018-03-28_1aRagexe_zero, 2018-03-28cRagexe_zero, 2018-04-11aRagexe_zero, 2018-04-25_3aRagexe_zero, 2018-05-09_3aRagexe_zero, 2018-05-23aRagexe_zero #if PACKETVER == 20171019 || \ PACKETVER == 20171023 || \ PACKETVER == 20171024 || \ @@ -50,7 +50,9 @@ PACKETVER == 20180321 || \ PACKETVER == 20180328 || \ PACKETVER == 20180411 || \ - PACKETVER >= 20180425 + PACKETVER == 20180425 || \ + PACKETVER == 20180509 || \ + PACKETVER >= 20180523 packet(0x0202,26,clif->pFriendsListAdd,2); // CZ_ADD_FRIENDS packet(0x022d,5,clif->pHomMenu,2,4); // CZ_COMMAND_MER packet(0x023b,36,clif->pStoragePassword,0); // CZ_ACK_STORE_PASSWORD @@ -690,5 +692,38 @@ packet(0x0958,-1,clif->pReqTradeBuyingStore,2,4,8,12); // CZ_REQ_TRADE_BUYING_STORE #endif +// 2018-05-11aRagexe_zero, 2018-05-11bRagexe_zero +#if PACKETVER == 20180511 + packet(0x0817,6,clif->pSolveCharName,2); // CZ_REQNAME_BYGID + packet(0x085f,6,clif->pDropItem,2,4); // CZ_ITEM_THROW + packet(0x0863,6,clif->pReqClickBuyingStore,2); // CZ_REQ_CLICK_TO_BUYING_STORE + packet(0x086c,7,clif->pActionRequest,2,6); // CZ_REQUEST_ACT + packet(0x0877,8,clif->pMoveFromKafra,2,4); // CZ_MOVE_ITEM_FROM_STORE_TO_BODY + packet(0x087e,-1,clif->pSearchStoreInfo,2,4,5,9,13,14,15); // CZ_SEARCH_STORE_INFO + packet(0x0880,6,clif->pGetCharNameRequest,2); // CZ_REQNAME + packet(0x0889,8,clif->pMoveToKafra,2,4); // CZ_MOVE_ITEM_FROM_BODY_TO_STORE + packet(0x0893,18,clif->pPartyBookingRegisterReq,2,4); // CZ_PARTY_BOOKING_REQ_REGISTER + packet(0x0896,19,clif->pWantToConnection,2,6,10,14,18); // CZ_ENTER + packet(0x0899,12,clif->pSearchStoreInfoListItemClick,2,6,10); // CZ_SSILIST_ITEM_CLICK + packet(0x08a2,6,clif->pTakeItem,2); // CZ_ITEM_PICKUP + packet(0x08a4,2,clif->pReqCloseBuyingStore,0); // CZ_REQ_CLOSE_BUYING_STORE + packet(0x08a5,6,clif->pTickSend,2); // CZ_REQUEST_TIME + packet(0x0919,5,clif->pWalkToXY,2); // CZ_REQUEST_MOVE + packet(0x091a,-1,clif->pItemListWindowSelected,2,4,8); // CZ_ITEMLISTWIN_RES + packet(0x091d,-1,clif->pReqOpenBuyingStore,2,4,8,9,89); // CZ_REQ_OPEN_BUYING_STORE + packet(0x0920,4,clif->pDull/*,XXX*/); // CZ_GANGSI_RANK + packet(0x092c,10,clif->pUseSkillToId,2,4,6); // CZ_USE_SKILL + packet(0x092d,26,clif->pPartyInvite2,2); // CZ_PARTY_JOIN_REQ + packet(0x092e,-1,clif->pReqTradeBuyingStore,2,4,8,12); // CZ_REQ_TRADE_BUYING_STORE + packet(0x0941,2,clif->pSearchStoreInfoNextPage,0); // CZ_SEARCH_STORE_INFO_NEXT_PAGE + packet(0x0942,5,clif->pChangeDir,2,4); // CZ_CHANGE_DIRECTION + packet(0x094a,90,clif->pUseSkillToPosMoreInfo,2,4,6,8,10); // CZ_USE_SKILL_TOGROUND_WITHTALKBOX + packet(0x0955,26,clif->pFriendsListAdd,2); // CZ_ADD_FRIENDS + packet(0x0956,8,clif->pDull/*,XXX*/); // CZ_JOIN_BATTLE_FIELD + packet(0x095c,10,clif->pUseSkillToPos,2,4,6,8); // CZ_USE_SKILL_TOGROUND + packet(0x0961,5,clif->pHomMenu,2,4); // CZ_COMMAND_MER + packet(0x0968,36,clif->pStoragePassword,0); // CZ_ACK_STORE_PASSWORD +#endif + #endif /* MAP_PACKETS_SHUFFLE_ZERO_H */ |