Update shuffle packets for new packet versions.

Split main and re shuffle files.

1 files changed, 442 insertions, 102 deletions

diff --git a/src/net/eathena/packetsout_shuffle_main.inc b/src/net/eathena/packetsout_shuffle_main.inc
index 55b8ddde8..89bacda5f 100644
--- a/src/net/eathena/packetsout_shuffle_main.inc
+++ b/src/net/eathena/packetsout_shuffle_main.inc
@@ -535,40 +535,6 @@ if (packetVersion == 20121010)
 //  packet(UNKNOWN,                       0x0969,  18, clif->pPartyBookingRegisterReq);
 }
 
-// 20121011
-if (packetVersion == 20121011)
-{
-    packet(CMSG_ITEM_LIST_WINDOW_SELECT,  0x0202,  -1, clif->pItemListWindowSelected);
-    packet(CMSG_NAME_REQUEST,             0x0817,   6, clif->pGetCharNameRequest);
-    packet(CMSG_BUYINGSTORE_CLOSE,        0x085a,   2, clif->pReqCloseBuyingStore);
-    packet(CMSG_ITEM_PICKUP,              0x0869,   6, clif->pTakeItem);
-//  packet(UNKNOWN,                       0x086c,   8, clif->pDull);
-    packet(CMSG_MOVE_FROM_STORAGE,        0x0874,   8, clif->pMoveFromKafra);
-    packet(CMSG_SKILL_USE_POSITION_MORE,  0x087d,  90, clif->pUseSkillToPosMoreInfo);
-    packet(CMSG_PLAYER_CHANGE_DEST,       0x0883,   5, clif->pWalkToXY);
-//  packet(UNKNOWN,                       0x0888,   4, clif->pDull);
-    packet(CMSG_PARTY_INVITE2,            0x088f,  26, clif->pPartyInvite2);
-    packet(CMSG_SKILL_USE_BEING,          0x0891,  10, clif->pUseSkillToId);
-    packet(CMSG_BUYINGSTORE_CREATE,       0x0896,  -1, clif->pReqOpenBuyingStore);
-    packet(CMSG_STORAGE_PASSWORD,         0x0898,  36, clif->pStoragePassword);
-    packet(CMSG_PLAYER_CHANGE_ACT,        0x08a1,   7, clif->pActionRequest);
-    packet(CMSG_SOLVE_CHAR_NAME,          0x08a6,   6, clif->pSolveCharName);
-    packet(CMSG_SEARCHSTORE_SEARCH,       0x08a9,  -1, clif->pSearchStoreInfo);
-    packet(CMSG_SEARCHSTORE_CLICK,        0x0925,  12, clif->pSearchStoreInfoListItemClick);
-    packet(CMSG_MAP_PING,                 0x0934,   6, clif->pTickSend);
-    packet(CMSG_MOVE_TO_STORAGE,          0x093c,   8, clif->pMoveToKafra);
-    packet(CMSG_BUYINGSTORE_OPEN,         0x0942,   6, clif->pReqClickBuyingStore);
-    packet(CMSG_MAP_SERVER_CONNECT,       0x0946,  19, clif->pWantToConnection);
-    packet(CMSG_SKILL_USE_POSITION,       0x0947,  10, clif->pUseSkillToPos);
-    packet(CMSG_PLAYER_INVENTORY_DROP,    0x094c,   6, clif->pDropItem);
-    packet(CMSG_PLAYER_CHANGE_DIR,        0x0957,   5, clif->pChangeDir);
-    packet(CMSG_SEARCHSTORE_NEXT_PAGE,    0x0958,   2, clif->pSearchStoreInfoNextPage);
-    packet(CMSG_BUYINGSTORE_SELL,         0x0959,  -1, clif->pReqTradeBuyingStore);
-    packet(CMSG_HOMUNCULUS_MENU,          0x095c,   5, clif->pHomMenu);
-    packet(CMSG_FRIENDS_ADD_PLAYER,       0x0964,  26, clif->pFriendsListAdd);
-//  packet(UNKNOWN,                       0x0969,  18, clif->pPartyBookingRegisterReq);
-}
-
 // 20121017
 if (packetVersion == 20121017)
 {
@@ -2816,40 +2782,6 @@ if (packetVersion == 20131218)
 // 20131223
 if (packetVersion == 20131223)
 {
-    packet(CMSG_FRIENDS_ADD_PLAYER,       0x0202,  26, clif->pFriendsListAdd);
-    packet(CMSG_HOMUNCULUS_MENU,          0x022d,   5, clif->pHomMenu);
-    packet(CMSG_STORAGE_PASSWORD,         0x023b,  36, clif->pStoragePassword);
-//  packet(UNKNOWN,                       0x0281,   4, clif->pDull);
-    packet(CMSG_PARTY_INVITE2,            0x02c4,  26, clif->pPartyInvite2);
-    packet(CMSG_PLAYER_CHANGE_DEST,       0x035f,   5, clif->pWalkToXY);
-    packet(CMSG_MAP_PING,                 0x0360,   6, clif->pTickSend);
-    packet(CMSG_PLAYER_CHANGE_DIR,        0x0361,   5, clif->pChangeDir);
-    packet(CMSG_ITEM_PICKUP,              0x0362,   6, clif->pTakeItem);
-    packet(CMSG_PLAYER_INVENTORY_DROP,    0x0363,   6, clif->pDropItem);
-    packet(CMSG_MOVE_TO_STORAGE,          0x0364,   8, clif->pMoveToKafra);
-    packet(CMSG_MOVE_FROM_STORAGE,        0x0365,   8, clif->pMoveFromKafra);
-    packet(CMSG_SKILL_USE_POSITION,       0x0366,  10, clif->pUseSkillToPos);
-    packet(CMSG_SKILL_USE_POSITION_MORE,  0x0367,  90, clif->pUseSkillToPosMoreInfo);
-    packet(CMSG_NAME_REQUEST,             0x0368,   6, clif->pGetCharNameRequest);
-    packet(CMSG_SOLVE_CHAR_NAME,          0x0369,   6, clif->pSolveCharName);
-    packet(CMSG_MAP_SERVER_CONNECT,       0x0436,  19, clif->pWantToConnection);
-    packet(CMSG_PLAYER_CHANGE_ACT,        0x0437,   7, clif->pActionRequest);
-    packet(CMSG_SKILL_USE_BEING,          0x0438,  10, clif->pUseSkillToId);
-    packet(CMSG_ITEM_LIST_WINDOW_SELECT,  0x07e4,  -1, clif->pItemListWindowSelected);
-//  packet(UNKNOWN,                       0x07ec,   8, clif->pDull);
-//  packet(UNKNOWN,                       0x0802,  18, clif->pPartyBookingRegisterReq);
-    packet(CMSG_BUYINGSTORE_CREATE,       0x0811,  -1, clif->pReqOpenBuyingStore);
-    packet(CMSG_BUYINGSTORE_CLOSE,        0x0815,   2, clif->pReqCloseBuyingStore);
-    packet(CMSG_BUYINGSTORE_OPEN,         0x0817,   6, clif->pReqClickBuyingStore);
-    packet(CMSG_BUYINGSTORE_SELL,         0x0819,  -1, clif->pReqTradeBuyingStore);
-    packet(CMSG_SEARCHSTORE_SEARCH,       0x0835,  -1, clif->pSearchStoreInfo);
-    packet(CMSG_SEARCHSTORE_NEXT_PAGE,    0x0838,   2, clif->pSearchStoreInfoNextPage);
-    packet(CMSG_SEARCHSTORE_CLICK,        0x083c,  12, clif->pSearchStoreInfoListItemClick);
-}
-
-// 20131223
-if (packetVersion == 20131223)
-{
     packet(CMSG_PLAYER_CHANGE_DIR,        0x0202,   5, clif->pChangeDir);
     packet(CMSG_MAP_SERVER_CONNECT,       0x022d,  19, clif->pWantToConnection);
     packet(CMSG_FRIENDS_ADD_PLAYER,       0x023b,  26, clif->pFriendsListAdd);
@@ -4785,40 +4717,6 @@ if (packetVersion == 20141217)
 //  packet(UNKNOWN,                       0x0960,   4, clif->pDull);
 }
 
-// 20141223
-if (packetVersion == 20141223)
-{
-    packet(CMSG_MOVE_TO_STORAGE,          0x0361,   8, clif->pMoveToKafra);
-    packet(CMSG_FRIENDS_ADD_PLAYER,       0x0438,  26, clif->pFriendsListAdd);
-    packet(CMSG_ITEM_LIST_WINDOW_SELECT,  0x0835,  -1, clif->pItemListWindowSelected);
-    packet(CMSG_SEARCHSTORE_SEARCH,       0x085a,  -1, clif->pSearchStoreInfo);
-    packet(CMSG_BUYINGSTORE_CLOSE,        0x085e,   2, clif->pReqCloseBuyingStore);
-    packet(CMSG_SKILL_USE_POSITION_MORE,  0x0865,  90, clif->pUseSkillToPosMoreInfo);
-    packet(CMSG_HOMUNCULUS_MENU,          0x0867,   5, clif->pHomMenu);
-    packet(CMSG_BUYINGSTORE_OPEN,         0x086c,   6, clif->pReqClickBuyingStore);
-    packet(CMSG_PLAYER_CHANGE_DIR,        0x0870,   5, clif->pChangeDir);
-    packet(CMSG_ITEM_PICKUP,              0x087a,   6, clif->pTakeItem);
-//  packet(UNKNOWN,                       0x087b,   4, clif->pDull);
-    packet(CMSG_PLAYER_CHANGE_DEST,       0x089a,   5, clif->pWalkToXY);
-//  packet(UNKNOWN,                       0x089b,  18, clif->pPartyBookingRegisterReq);
-    packet(CMSG_PARTY_INVITE2,            0x08a3,  26, clif->pPartyInvite2);
-    packet(CMSG_STORAGE_PASSWORD,         0x08a4,  36, clif->pStoragePassword);
-    packet(CMSG_BUYINGSTORE_SELL,         0x08a8,  -1, clif->pReqTradeBuyingStore);
-    packet(CMSG_BUYINGSTORE_CREATE,       0x08ac,  -1, clif->pReqOpenBuyingStore);
-    packet(CMSG_PLAYER_INVENTORY_DROP,    0x0930,   6, clif->pDropItem);
-//  packet(UNKNOWN,                       0x0932,   8, clif->pDull);
-    packet(CMSG_SEARCHSTORE_NEXT_PAGE,    0x093a,   2, clif->pSearchStoreInfoNextPage);
-    packet(CMSG_MAP_PING,                 0x0945,   6, clif->pTickSend);
-    packet(CMSG_NAME_REQUEST,             0x0946,   6, clif->pGetCharNameRequest);
-    packet(CMSG_SEARCHSTORE_CLICK,        0x0949,  12, clif->pSearchStoreInfoListItemClick);
-    packet(CMSG_MAP_SERVER_CONNECT,       0x094f,  19, clif->pWantToConnection);
-    packet(CMSG_SOLVE_CHAR_NAME,          0x0950,   6, clif->pSolveCharName);
-    packet(CMSG_MOVE_FROM_STORAGE,        0x0953,   8, clif->pMoveFromKafra);
-    packet(CMSG_SKILL_USE_POSITION,       0x0956,  10, clif->pUseSkillToPos);
-    packet(CMSG_SKILL_USE_BEING,          0x095b,  10, clif->pUseSkillToId);
-    packet(CMSG_PLAYER_CHANGE_ACT,        0x095f,   7, clif->pActionRequest);
-}
-
 // 20141224
 if (packetVersion == 20141224)
 {
@@ -11041,4 +10939,446 @@ if (packetVersion == 20180328)
     packet(CMSG_SEARCHSTORE_CLICK,        0x083c,  12, clif->pSearchStoreInfoListItemClick);
 }
 
+// 20180404
+if (packetVersion == 20180404)
+{
+    packet(CMSG_FRIENDS_ADD_PLAYER,       0x0202,  26, clif->pFriendsListAdd);
+    packet(CMSG_HOMUNCULUS_MENU,          0x022d,   5, clif->pHomMenu);
+    packet(CMSG_STORAGE_PASSWORD,         0x023b,  36, clif->pStoragePassword);
+//  packet(UNKNOWN,                       0x0281,   4, clif->pDull);
+    packet(CMSG_PARTY_INVITE2,            0x02c4,  26, clif->pPartyInvite2);
+    packet(CMSG_PLAYER_CHANGE_DEST,       0x035f,   5, clif->pWalkToXY);
+    packet(CMSG_MAP_PING,                 0x0360,   6, clif->pTickSend);
+    packet(CMSG_PLAYER_CHANGE_DIR,        0x0361,   5, clif->pChangeDir);
+    packet(CMSG_ITEM_PICKUP,              0x0362,   6, clif->pTakeItem);
+    packet(CMSG_PLAYER_INVENTORY_DROP,    0x0363,   6, clif->pDropItem);
+    packet(CMSG_MOVE_TO_STORAGE,          0x0364,   8, clif->pMoveToKafra);
+    packet(CMSG_MOVE_FROM_STORAGE,        0x0365,   8, clif->pMoveFromKafra);
+    packet(CMSG_SKILL_USE_POSITION,       0x0366,  10, clif->pUseSkillToPos);
+    packet(CMSG_SKILL_USE_POSITION_MORE,  0x0367,  90, clif->pUseSkillToPosMoreInfo);
+    packet(CMSG_NAME_REQUEST,             0x0368,   6, clif->pGetCharNameRequest);
+    packet(CMSG_SOLVE_CHAR_NAME,          0x0369,   6, clif->pSolveCharName);
+    packet(CMSG_MAP_SERVER_CONNECT,       0x0436,  19, clif->pWantToConnection);
+    packet(CMSG_PLAYER_CHANGE_ACT,        0x0437,   7, clif->pActionRequest);
+    packet(CMSG_SKILL_USE_BEING,          0x0438,  10, clif->pUseSkillToId);
+    packet(CMSG_ITEM_LIST_WINDOW_SELECT,  0x07e4,  -1, clif->pItemListWindowSelected);
+//  packet(UNKNOWN,                       0x07ec,   8, clif->pDull);
+//  packet(UNKNOWN,                       0x0802,  18, clif->pPartyBookingRegisterReq);
+    packet(CMSG_BUYINGSTORE_CREATE,       0x0811,  -1, clif->pReqOpenBuyingStore);
+    packet(CMSG_BUYINGSTORE_CLOSE,        0x0815,   2, clif->pReqCloseBuyingStore);
+    packet(CMSG_BUYINGSTORE_OPEN,         0x0817,   6, clif->pReqClickBuyingStore);
+    packet(CMSG_BUYINGSTORE_SELL,         0x0819,  -1, clif->pReqTradeBuyingStore);
+    packet(CMSG_SEARCHSTORE_SEARCH,       0x0835,  -1, clif->pSearchStoreInfo);
+    packet(CMSG_SEARCHSTORE_NEXT_PAGE,    0x0838,   2, clif->pSearchStoreInfoNextPage);
+    packet(CMSG_SEARCHSTORE_CLICK,        0x083c,  12, clif->pSearchStoreInfoListItemClick);
+}
+
+// 20180418
+if (packetVersion == 20180418)
+{
+    packet(CMSG_FRIENDS_ADD_PLAYER,       0x0202,  26, clif->pFriendsListAdd);
+    packet(CMSG_HOMUNCULUS_MENU,          0x022d,   5, clif->pHomMenu);
+    packet(CMSG_STORAGE_PASSWORD,         0x023b,  36, clif->pStoragePassword);
+//  packet(UNKNOWN,                       0x0281,   4, clif->pDull);
+    packet(CMSG_PARTY_INVITE2,            0x02c4,  26, clif->pPartyInvite2);
+    packet(CMSG_PLAYER_CHANGE_DEST,       0x035f,   5, clif->pWalkToXY);
+    packet(CMSG_MAP_PING,                 0x0360,   6, clif->pTickSend);
+    packet(CMSG_PLAYER_CHANGE_DIR,        0x0361,   5, clif->pChangeDir);
+    packet(CMSG_ITEM_PICKUP,              0x0362,   6, clif->pTakeItem);
+    packet(CMSG_PLAYER_INVENTORY_DROP,    0x0363,   6, clif->pDropItem);
+    packet(CMSG_MOVE_TO_STORAGE,          0x0364,   8, clif->pMoveToKafra);
+    packet(CMSG_MOVE_FROM_STORAGE,        0x0365,   8, clif->pMoveFromKafra);
+    packet(CMSG_SKILL_USE_POSITION,       0x0366,  10, clif->pUseSkillToPos);
+    packet(CMSG_SKILL_USE_POSITION_MORE,  0x0367,  90, clif->pUseSkillToPosMoreInfo);
+    packet(CMSG_NAME_REQUEST,             0x0368,   6, clif->pGetCharNameRequest);
+    packet(CMSG_SOLVE_CHAR_NAME,          0x0369,   6, clif->pSolveCharName);
+    packet(CMSG_MAP_SERVER_CONNECT,       0x0436,  19, clif->pWantToConnection);
+    packet(CMSG_PLAYER_CHANGE_ACT,        0x0437,   7, clif->pActionRequest);
+    packet(CMSG_SKILL_USE_BEING,          0x0438,  10, clif->pUseSkillToId);
+    packet(CMSG_ITEM_LIST_WINDOW_SELECT,  0x07e4,  -1, clif->pItemListWindowSelected);
+//  packet(UNKNOWN,                       0x07ec,   8, clif->pDull);
+//  packet(UNKNOWN,                       0x0802,  18, clif->pPartyBookingRegisterReq);
+    packet(CMSG_BUYINGSTORE_CREATE,       0x0811,  -1, clif->pReqOpenBuyingStore);
+    packet(CMSG_BUYINGSTORE_CLOSE,        0x0815,   2, clif->pReqCloseBuyingStore);
+    packet(CMSG_BUYINGSTORE_OPEN,         0x0817,   6, clif->pReqClickBuyingStore);
+    packet(CMSG_BUYINGSTORE_SELL,         0x0819,  -1, clif->pReqTradeBuyingStore);
+    packet(CMSG_SEARCHSTORE_SEARCH,       0x0835,  -1, clif->pSearchStoreInfo);
+    packet(CMSG_SEARCHSTORE_NEXT_PAGE,    0x0838,   2, clif->pSearchStoreInfoNextPage);
+    packet(CMSG_SEARCHSTORE_CLICK,        0x083c,  12, clif->pSearchStoreInfoListItemClick);
+}
+
+// 20180425
+if (packetVersion == 20180425)
+{
+    packet(CMSG_FRIENDS_ADD_PLAYER,       0x0202,  26, clif->pFriendsListAdd);
+    packet(CMSG_HOMUNCULUS_MENU,          0x022d,   5, clif->pHomMenu);
+    packet(CMSG_STORAGE_PASSWORD,         0x023b,  36, clif->pStoragePassword);
+//  packet(UNKNOWN,                       0x0281,   4, clif->pDull);
+    packet(CMSG_PARTY_INVITE2,            0x02c4,  26, clif->pPartyInvite2);
+    packet(CMSG_PLAYER_CHANGE_DEST,       0x035f,   5, clif->pWalkToXY);
+    packet(CMSG_MAP_PING,                 0x0360,   6, clif->pTickSend);
+    packet(CMSG_PLAYER_CHANGE_DIR,        0x0361,   5, clif->pChangeDir);
+    packet(CMSG_ITEM_PICKUP,              0x0362,   6, clif->pTakeItem);
+    packet(CMSG_PLAYER_INVENTORY_DROP,    0x0363,   6, clif->pDropItem);
+    packet(CMSG_MOVE_TO_STORAGE,          0x0364,   8, clif->pMoveToKafra);
+    packet(CMSG_MOVE_FROM_STORAGE,        0x0365,   8, clif->pMoveFromKafra);
+    packet(CMSG_SKILL_USE_POSITION,       0x0366,  10, clif->pUseSkillToPos);
+    packet(CMSG_SKILL_USE_POSITION_MORE,  0x0367,  90, clif->pUseSkillToPosMoreInfo);
+    packet(CMSG_NAME_REQUEST,             0x0368,   6, clif->pGetCharNameRequest);
+    packet(CMSG_SOLVE_CHAR_NAME,          0x0369,   6, clif->pSolveCharName);
+    packet(CMSG_MAP_SERVER_CONNECT,       0x0436,  19, clif->pWantToConnection);
+    packet(CMSG_PLAYER_CHANGE_ACT,        0x0437,   7, clif->pActionRequest);
+    packet(CMSG_SKILL_USE_BEING,          0x0438,  10, clif->pUseSkillToId);
+    packet(CMSG_ITEM_LIST_WINDOW_SELECT,  0x07e4,  -1, clif->pItemListWindowSelected);
+//  packet(UNKNOWN,                       0x07ec,   8, clif->pDull);
+//  packet(UNKNOWN,                       0x0802,  18, clif->pPartyBookingRegisterReq);
+    packet(CMSG_BUYINGSTORE_CREATE,       0x0811,  -1, clif->pReqOpenBuyingStore);
+    packet(CMSG_BUYINGSTORE_CLOSE,        0x0815,   2, clif->pReqCloseBuyingStore);
+    packet(CMSG_BUYINGSTORE_OPEN,         0x0817,   6, clif->pReqClickBuyingStore);
+    packet(CMSG_BUYINGSTORE_SELL,         0x0819,  -1, clif->pReqTradeBuyingStore);
+    packet(CMSG_SEARCHSTORE_SEARCH,       0x0835,  -1, clif->pSearchStoreInfo);
+    packet(CMSG_SEARCHSTORE_NEXT_PAGE,    0x0838,   2, clif->pSearchStoreInfoNextPage);
+    packet(CMSG_SEARCHSTORE_CLICK,        0x083c,  12, clif->pSearchStoreInfoListItemClick);
+}
+
+// 20180502
+if (packetVersion == 20180502)
+{
+    packet(CMSG_FRIENDS_ADD_PLAYER,       0x0202,  26, clif->pFriendsListAdd);
+    packet(CMSG_HOMUNCULUS_MENU,          0x022d,   5, clif->pHomMenu);
+    packet(CMSG_STORAGE_PASSWORD,         0x023b,  36, clif->pStoragePassword);
+//  packet(UNKNOWN,                       0x0281,   4, clif->pDull);
+    packet(CMSG_PARTY_INVITE2,            0x02c4,  26, clif->pPartyInvite2);
+    packet(CMSG_PLAYER_CHANGE_DEST,       0x035f,   5, clif->pWalkToXY);
+    packet(CMSG_MAP_PING,                 0x0360,   6, clif->pTickSend);
+    packet(CMSG_PLAYER_CHANGE_DIR,        0x0361,   5, clif->pChangeDir);
+    packet(CMSG_ITEM_PICKUP,              0x0362,   6, clif->pTakeItem);
+    packet(CMSG_PLAYER_INVENTORY_DROP,    0x0363,   6, clif->pDropItem);
+    packet(CMSG_MOVE_TO_STORAGE,          0x0364,   8, clif->pMoveToKafra);
+    packet(CMSG_MOVE_FROM_STORAGE,        0x0365,   8, clif->pMoveFromKafra);
+    packet(CMSG_SKILL_USE_POSITION,       0x0366,  10, clif->pUseSkillToPos);
+    packet(CMSG_SKILL_USE_POSITION_MORE,  0x0367,  90, clif->pUseSkillToPosMoreInfo);
+    packet(CMSG_NAME_REQUEST,             0x0368,   6, clif->pGetCharNameRequest);
+    packet(CMSG_SOLVE_CHAR_NAME,          0x0369,   6, clif->pSolveCharName);
+    packet(CMSG_MAP_SERVER_CONNECT,       0x0436,  19, clif->pWantToConnection);
+    packet(CMSG_PLAYER_CHANGE_ACT,        0x0437,   7, clif->pActionRequest);
+    packet(CMSG_SKILL_USE_BEING,          0x0438,  10, clif->pUseSkillToId);
+    packet(CMSG_ITEM_LIST_WINDOW_SELECT,  0x07e4,  -1, clif->pItemListWindowSelected);
+//  packet(UNKNOWN,                       0x07ec,   8, clif->pDull);
+//  packet(UNKNOWN,                       0x0802,  18, clif->pPartyBookingRegisterReq);
+    packet(CMSG_BUYINGSTORE_CREATE,       0x0811,  -1, clif->pReqOpenBuyingStore);
+    packet(CMSG_BUYINGSTORE_CLOSE,        0x0815,   2, clif->pReqCloseBuyingStore);
+    packet(CMSG_BUYINGSTORE_OPEN,         0x0817,   6, clif->pReqClickBuyingStore);
+    packet(CMSG_BUYINGSTORE_SELL,         0x0819,  -1, clif->pReqTradeBuyingStore);
+    packet(CMSG_SEARCHSTORE_SEARCH,       0x0835,  -1, clif->pSearchStoreInfo);
+    packet(CMSG_SEARCHSTORE_NEXT_PAGE,    0x0838,   2, clif->pSearchStoreInfoNextPage);
+    packet(CMSG_SEARCHSTORE_CLICK,        0x083c,  12, clif->pSearchStoreInfoListItemClick);
+}
+
+// 20180509
+if (packetVersion == 20180509)
+{
+    packet(CMSG_FRIENDS_ADD_PLAYER,       0x0202,  26, clif->pFriendsListAdd);
+    packet(CMSG_HOMUNCULUS_MENU,          0x022d,   5, clif->pHomMenu);
+    packet(CMSG_STORAGE_PASSWORD,         0x023b,  36, clif->pStoragePassword);
+//  packet(UNKNOWN,                       0x0281,   4, clif->pDull);
+    packet(CMSG_PARTY_INVITE2,            0x02c4,  26, clif->pPartyInvite2);
+    packet(CMSG_PLAYER_CHANGE_DEST,       0x035f,   5, clif->pWalkToXY);
+    packet(CMSG_MAP_PING,                 0x0360,   6, clif->pTickSend);
+    packet(CMSG_PLAYER_CHANGE_DIR,        0x0361,   5, clif->pChangeDir);
+    packet(CMSG_ITEM_PICKUP,              0x0362,   6, clif->pTakeItem);
+    packet(CMSG_PLAYER_INVENTORY_DROP,    0x0363,   6, clif->pDropItem);
+    packet(CMSG_MOVE_TO_STORAGE,          0x0364,   8, clif->pMoveToKafra);
+    packet(CMSG_MOVE_FROM_STORAGE,        0x0365,   8, clif->pMoveFromKafra);
+    packet(CMSG_SKILL_USE_POSITION,       0x0366,  10, clif->pUseSkillToPos);
+    packet(CMSG_SKILL_USE_POSITION_MORE,  0x0367,  90, clif->pUseSkillToPosMoreInfo);
+    packet(CMSG_NAME_REQUEST,             0x0368,   6, clif->pGetCharNameRequest);
+    packet(CMSG_SOLVE_CHAR_NAME,          0x0369,   6, clif->pSolveCharName);
+    packet(CMSG_MAP_SERVER_CONNECT,       0x0436,  19, clif->pWantToConnection);
+    packet(CMSG_PLAYER_CHANGE_ACT,        0x0437,   7, clif->pActionRequest);
+    packet(CMSG_SKILL_USE_BEING,          0x0438,  10, clif->pUseSkillToId);
+    packet(CMSG_ITEM_LIST_WINDOW_SELECT,  0x07e4,  -1, clif->pItemListWindowSelected);
+//  packet(UNKNOWN,                       0x07ec,   8, clif->pDull);
+//  packet(UNKNOWN,                       0x0802,  18, clif->pPartyBookingRegisterReq);
+    packet(CMSG_BUYINGSTORE_CREATE,       0x0811,  -1, clif->pReqOpenBuyingStore);
+    packet(CMSG_BUYINGSTORE_CLOSE,        0x0815,   2, clif->pReqCloseBuyingStore);
+    packet(CMSG_BUYINGSTORE_OPEN,         0x0817,   6, clif->pReqClickBuyingStore);
+    packet(CMSG_BUYINGSTORE_SELL,         0x0819,  -1, clif->pReqTradeBuyingStore);
+    packet(CMSG_SEARCHSTORE_SEARCH,       0x0835,  -1, clif->pSearchStoreInfo);
+    packet(CMSG_SEARCHSTORE_NEXT_PAGE,    0x0838,   2, clif->pSearchStoreInfoNextPage);
+    packet(CMSG_SEARCHSTORE_CLICK,        0x083c,  12, clif->pSearchStoreInfoListItemClick);
+}
+
+// 20180516
+if (packetVersion == 20180516)
+{
+    packet(CMSG_FRIENDS_ADD_PLAYER,       0x0202,  26, clif->pFriendsListAdd);
+    packet(CMSG_HOMUNCULUS_MENU,          0x022d,   5, clif->pHomMenu);
+    packet(CMSG_STORAGE_PASSWORD,         0x023b,  36, clif->pStoragePassword);
+//  packet(UNKNOWN,                       0x0281,   4, clif->pDull);
+    packet(CMSG_PARTY_INVITE2,            0x02c4,  26, clif->pPartyInvite2);
+    packet(CMSG_PLAYER_CHANGE_DEST,       0x035f,   5, clif->pWalkToXY);
+    packet(CMSG_MAP_PING,                 0x0360,   6, clif->pTickSend);
+    packet(CMSG_PLAYER_CHANGE_DIR,        0x0361,   5, clif->pChangeDir);
+    packet(CMSG_ITEM_PICKUP,              0x0362,   6, clif->pTakeItem);
+    packet(CMSG_PLAYER_INVENTORY_DROP,    0x0363,   6, clif->pDropItem);
+    packet(CMSG_MOVE_TO_STORAGE,          0x0364,   8, clif->pMoveToKafra);
+    packet(CMSG_MOVE_FROM_STORAGE,        0x0365,   8, clif->pMoveFromKafra);
+    packet(CMSG_SKILL_USE_POSITION,       0x0366,  10, clif->pUseSkillToPos);
+    packet(CMSG_SKILL_USE_POSITION_MORE,  0x0367,  90, clif->pUseSkillToPosMoreInfo);
+    packet(CMSG_NAME_REQUEST,             0x0368,   6, clif->pGetCharNameRequest);
+    packet(CMSG_SOLVE_CHAR_NAME,          0x0369,   6, clif->pSolveCharName);
+    packet(CMSG_MAP_SERVER_CONNECT,       0x0436,  19, clif->pWantToConnection);
+    packet(CMSG_PLAYER_CHANGE_ACT,        0x0437,   7, clif->pActionRequest);
+    packet(CMSG_SKILL_USE_BEING,          0x0438,  10, clif->pUseSkillToId);
+    packet(CMSG_ITEM_LIST_WINDOW_SELECT,  0x07e4,  -1, clif->pItemListWindowSelected);
+//  packet(UNKNOWN,                       0x07ec,   8, clif->pDull);
+//  packet(UNKNOWN,                       0x0802,  18, clif->pPartyBookingRegisterReq);
+    packet(CMSG_BUYINGSTORE_CREATE,       0x0811,  -1, clif->pReqOpenBuyingStore);
+    packet(CMSG_BUYINGSTORE_CLOSE,        0x0815,   2, clif->pReqCloseBuyingStore);
+    packet(CMSG_BUYINGSTORE_OPEN,         0x0817,   6, clif->pReqClickBuyingStore);
+    packet(CMSG_BUYINGSTORE_SELL,         0x0819,  -1, clif->pReqTradeBuyingStore);
+    packet(CMSG_SEARCHSTORE_SEARCH,       0x0835,  -1, clif->pSearchStoreInfo);
+    packet(CMSG_SEARCHSTORE_NEXT_PAGE,    0x0838,   2, clif->pSearchStoreInfoNextPage);
+    packet(CMSG_SEARCHSTORE_CLICK,        0x083c,  12, clif->pSearchStoreInfoListItemClick);
+}
+
+// 20180523
+if (packetVersion == 20180523)
+{
+    packet(CMSG_FRIENDS_ADD_PLAYER,       0x0202,  26, clif->pFriendsListAdd);
+    packet(CMSG_HOMUNCULUS_MENU,          0x022d,   5, clif->pHomMenu);
+    packet(CMSG_STORAGE_PASSWORD,         0x023b,  36, clif->pStoragePassword);
+//  packet(UNKNOWN,                       0x0281,   4, clif->pDull);
+    packet(CMSG_PARTY_INVITE2,            0x02c4,  26, clif->pPartyInvite2);
+    packet(CMSG_PLAYER_CHANGE_DEST,       0x035f,   5, clif->pWalkToXY);
+    packet(CMSG_MAP_PING,                 0x0360,   6, clif->pTickSend);
+    packet(CMSG_PLAYER_CHANGE_DIR,        0x0361,   5, clif->pChangeDir);
+    packet(CMSG_ITEM_PICKUP,              0x0362,   6, clif->pTakeItem);
+    packet(CMSG_PLAYER_INVENTORY_DROP,    0x0363,   6, clif->pDropItem);
+    packet(CMSG_MOVE_TO_STORAGE,          0x0364,   8, clif->pMoveToKafra);
+    packet(CMSG_MOVE_FROM_STORAGE,        0x0365,   8, clif->pMoveFromKafra);
+    packet(CMSG_SKILL_USE_POSITION,       0x0366,  10, clif->pUseSkillToPos);
+    packet(CMSG_SKILL_USE_POSITION_MORE,  0x0367,  90, clif->pUseSkillToPosMoreInfo);
+    packet(CMSG_NAME_REQUEST,             0x0368,   6, clif->pGetCharNameRequest);
+    packet(CMSG_SOLVE_CHAR_NAME,          0x0369,   6, clif->pSolveCharName);
+    packet(CMSG_MAP_SERVER_CONNECT,       0x0436,  19, clif->pWantToConnection);
+    packet(CMSG_PLAYER_CHANGE_ACT,        0x0437,   7, clif->pActionRequest);
+    packet(CMSG_SKILL_USE_BEING,          0x0438,  10, clif->pUseSkillToId);
+    packet(CMSG_ITEM_LIST_WINDOW_SELECT,  0x07e4,  -1, clif->pItemListWindowSelected);
+//  packet(UNKNOWN,                       0x07ec,   8, clif->pDull);
+//  packet(UNKNOWN,                       0x0802,  18, clif->pPartyBookingRegisterReq);
+    packet(CMSG_BUYINGSTORE_CREATE,       0x0811,  -1, clif->pReqOpenBuyingStore);
+    packet(CMSG_BUYINGSTORE_CLOSE,        0x0815,   2, clif->pReqCloseBuyingStore);
+    packet(CMSG_BUYINGSTORE_OPEN,         0x0817,   6, clif->pReqClickBuyingStore);
+    packet(CMSG_BUYINGSTORE_SELL,         0x0819,  -1, clif->pReqTradeBuyingStore);
+    packet(CMSG_SEARCHSTORE_SEARCH,       0x0835,  -1, clif->pSearchStoreInfo);
+    packet(CMSG_SEARCHSTORE_NEXT_PAGE,    0x0838,   2, clif->pSearchStoreInfoNextPage);
+    packet(CMSG_SEARCHSTORE_CLICK,        0x083c,  12, clif->pSearchStoreInfoListItemClick);
+}
+
+// 20180530
+if (packetVersion == 20180530)
+{
+    packet(CMSG_FRIENDS_ADD_PLAYER,       0x0202,  26, clif->pFriendsListAdd);
+    packet(CMSG_HOMUNCULUS_MENU,          0x022d,   5, clif->pHomMenu);
+    packet(CMSG_STORAGE_PASSWORD,         0x023b,  36, clif->pStoragePassword);
+//  packet(UNKNOWN,                       0x0281,   4, clif->pDull);
+    packet(CMSG_PARTY_INVITE2,            0x02c4,  26, clif->pPartyInvite2);
+    packet(CMSG_PLAYER_CHANGE_DEST,       0x035f,   5, clif->pWalkToXY);
+    packet(CMSG_MAP_PING,                 0x0360,   6, clif->pTickSend);
+    packet(CMSG_PLAYER_CHANGE_DIR,        0x0361,   5, clif->pChangeDir);
+    packet(CMSG_ITEM_PICKUP,              0x0362,   6, clif->pTakeItem);
+    packet(CMSG_PLAYER_INVENTORY_DROP,    0x0363,   6, clif->pDropItem);
+    packet(CMSG_MOVE_TO_STORAGE,          0x0364,   8, clif->pMoveToKafra);
+    packet(CMSG_MOVE_FROM_STORAGE,        0x0365,   8, clif->pMoveFromKafra);
+    packet(CMSG_SKILL_USE_POSITION,       0x0366,  10, clif->pUseSkillToPos);
+    packet(CMSG_SKILL_USE_POSITION_MORE,  0x0367,  90, clif->pUseSkillToPosMoreInfo);
+    packet(CMSG_NAME_REQUEST,             0x0368,   6, clif->pGetCharNameRequest);
+    packet(CMSG_SOLVE_CHAR_NAME,          0x0369,   6, clif->pSolveCharName);
+    packet(CMSG_MAP_SERVER_CONNECT,       0x0436,  19, clif->pWantToConnection);
+    packet(CMSG_PLAYER_CHANGE_ACT,        0x0437,   7, clif->pActionRequest);
+    packet(CMSG_SKILL_USE_BEING,          0x0438,  10, clif->pUseSkillToId);
+    packet(CMSG_ITEM_LIST_WINDOW_SELECT,  0x07e4,  -1, clif->pItemListWindowSelected);
+//  packet(UNKNOWN,                       0x07ec,   8, clif->pDull);
+//  packet(UNKNOWN,                       0x0802,  18, clif->pPartyBookingRegisterReq);
+    packet(CMSG_BUYINGSTORE_CREATE,       0x0811,  -1, clif->pReqOpenBuyingStore);
+    packet(CMSG_BUYINGSTORE_CLOSE,        0x0815,   2, clif->pReqCloseBuyingStore);
+    packet(CMSG_BUYINGSTORE_OPEN,         0x0817,   6, clif->pReqClickBuyingStore);
+    packet(CMSG_BUYINGSTORE_SELL,         0x0819,  -1, clif->pReqTradeBuyingStore);
+    packet(CMSG_SEARCHSTORE_SEARCH,       0x0835,  -1, clif->pSearchStoreInfo);
+    packet(CMSG_SEARCHSTORE_NEXT_PAGE,    0x0838,   2, clif->pSearchStoreInfoNextPage);
+    packet(CMSG_SEARCHSTORE_CLICK,        0x083c,  12, clif->pSearchStoreInfoListItemClick);
+}
+
+// 20180605
+if (packetVersion == 20180605)
+{
+    packet(CMSG_FRIENDS_ADD_PLAYER,       0x0202,  26, clif->pFriendsListAdd);
+    packet(CMSG_HOMUNCULUS_MENU,          0x022d,   5, clif->pHomMenu);
+    packet(CMSG_STORAGE_PASSWORD,         0x023b,  36, clif->pStoragePassword);
+//  packet(UNKNOWN,                       0x0281,   4, clif->pDull);
+    packet(CMSG_PARTY_INVITE2,            0x02c4,  26, clif->pPartyInvite2);
+    packet(CMSG_PLAYER_CHANGE_DEST,       0x035f,   5, clif->pWalkToXY);
+    packet(CMSG_MAP_PING,                 0x0360,   6, clif->pTickSend);
+    packet(CMSG_PLAYER_CHANGE_DIR,        0x0361,   5, clif->pChangeDir);
+    packet(CMSG_ITEM_PICKUP,              0x0362,   6, clif->pTakeItem);
+    packet(CMSG_PLAYER_INVENTORY_DROP,    0x0363,   6, clif->pDropItem);
+    packet(CMSG_MOVE_TO_STORAGE,          0x0364,   8, clif->pMoveToKafra);
+    packet(CMSG_MOVE_FROM_STORAGE,        0x0365,   8, clif->pMoveFromKafra);
+    packet(CMSG_SKILL_USE_POSITION,       0x0366,  10, clif->pUseSkillToPos);
+    packet(CMSG_SKILL_USE_POSITION_MORE,  0x0367,  90, clif->pUseSkillToPosMoreInfo);
+    packet(CMSG_NAME_REQUEST,             0x0368,   6, clif->pGetCharNameRequest);
+    packet(CMSG_SOLVE_CHAR_NAME,          0x0369,   6, clif->pSolveCharName);
+    packet(CMSG_MAP_SERVER_CONNECT,       0x0436,  19, clif->pWantToConnection);
+    packet(CMSG_PLAYER_CHANGE_ACT,        0x0437,   7, clif->pActionRequest);
+    packet(CMSG_SKILL_USE_BEING,          0x0438,  10, clif->pUseSkillToId);
+    packet(CMSG_ITEM_LIST_WINDOW_SELECT,  0x07e4,  -1, clif->pItemListWindowSelected);
+//  packet(UNKNOWN,                       0x07ec,   8, clif->pDull);
+//  packet(UNKNOWN,                       0x0802,  18, clif->pPartyBookingRegisterReq);
+    packet(CMSG_BUYINGSTORE_CREATE,       0x0811,  -1, clif->pReqOpenBuyingStore);
+    packet(CMSG_BUYINGSTORE_CLOSE,        0x0815,   2, clif->pReqCloseBuyingStore);
+    packet(CMSG_BUYINGSTORE_OPEN,         0x0817,   6, clif->pReqClickBuyingStore);
+    packet(CMSG_BUYINGSTORE_SELL,         0x0819,  -1, clif->pReqTradeBuyingStore);
+    packet(CMSG_SEARCHSTORE_SEARCH,       0x0835,  -1, clif->pSearchStoreInfo);
+    packet(CMSG_SEARCHSTORE_NEXT_PAGE,    0x0838,   2, clif->pSearchStoreInfoNextPage);
+    packet(CMSG_SEARCHSTORE_CLICK,        0x083c,  12, clif->pSearchStoreInfoListItemClick);
+}
+
+// 20180620
+if (packetVersion == 20180620)
+{
+    packet(CMSG_FRIENDS_ADD_PLAYER,       0x0202,  26, clif->pFriendsListAdd);
+    packet(CMSG_HOMUNCULUS_MENU,          0x022d,   5, clif->pHomMenu);
+    packet(CMSG_STORAGE_PASSWORD,         0x023b,  36, clif->pStoragePassword);
+//  packet(UNKNOWN,                       0x0281,   4, clif->pDull);
+    packet(CMSG_PARTY_INVITE2,            0x02c4,  26, clif->pPartyInvite2);
+    packet(CMSG_PLAYER_CHANGE_DEST,       0x035f,   5, clif->pWalkToXY);
+    packet(CMSG_MAP_PING,                 0x0360,   6, clif->pTickSend);
+    packet(CMSG_PLAYER_CHANGE_DIR,        0x0361,   5, clif->pChangeDir);
+    packet(CMSG_ITEM_PICKUP,              0x0362,   6, clif->pTakeItem);
+    packet(CMSG_PLAYER_INVENTORY_DROP,    0x0363,   6, clif->pDropItem);
+    packet(CMSG_MOVE_TO_STORAGE,          0x0364,   8, clif->pMoveToKafra);
+    packet(CMSG_MOVE_FROM_STORAGE,        0x0365,   8, clif->pMoveFromKafra);
+    packet(CMSG_SKILL_USE_POSITION,       0x0366,  10, clif->pUseSkillToPos);
+    packet(CMSG_SKILL_USE_POSITION_MORE,  0x0367,  90, clif->pUseSkillToPosMoreInfo);
+    packet(CMSG_NAME_REQUEST,             0x0368,   6, clif->pGetCharNameRequest);
+    packet(CMSG_SOLVE_CHAR_NAME,          0x0369,   6, clif->pSolveCharName);
+    packet(CMSG_MAP_SERVER_CONNECT,       0x0436,  19, clif->pWantToConnection);
+    packet(CMSG_PLAYER_CHANGE_ACT,        0x0437,   7, clif->pActionRequest);
+    packet(CMSG_SKILL_USE_BEING,          0x0438,  10, clif->pUseSkillToId);
+    packet(CMSG_ITEM_LIST_WINDOW_SELECT,  0x07e4,  -1, clif->pItemListWindowSelected);
+//  packet(UNKNOWN,                       0x07ec,   8, clif->pDull);
+//  packet(UNKNOWN,                       0x0802,  18, clif->pPartyBookingRegisterReq);
+    packet(CMSG_BUYINGSTORE_CREATE,       0x0811,  -1, clif->pReqOpenBuyingStore);
+    packet(CMSG_BUYINGSTORE_CLOSE,        0x0815,   2, clif->pReqCloseBuyingStore);
+    packet(CMSG_BUYINGSTORE_OPEN,         0x0817,   6, clif->pReqClickBuyingStore);
+    packet(CMSG_BUYINGSTORE_SELL,         0x0819,  -1, clif->pReqTradeBuyingStore);
+    packet(CMSG_SEARCHSTORE_SEARCH,       0x0835,  -1, clif->pSearchStoreInfo);
+    packet(CMSG_SEARCHSTORE_NEXT_PAGE,    0x0838,   2, clif->pSearchStoreInfoNextPage);
+    packet(CMSG_SEARCHSTORE_CLICK,        0x083c,  12, clif->pSearchStoreInfoListItemClick);
+}
+
+// 20180621
+if (packetVersion == 20180621)
+{
+    packet(CMSG_FRIENDS_ADD_PLAYER,       0x0202,  26, clif->pFriendsListAdd);
+    packet(CMSG_HOMUNCULUS_MENU,          0x022d,   5, clif->pHomMenu);
+    packet(CMSG_STORAGE_PASSWORD,         0x023b,  36, clif->pStoragePassword);
+//  packet(UNKNOWN,                       0x0281,   4, clif->pDull);
+    packet(CMSG_PARTY_INVITE2,            0x02c4,  26, clif->pPartyInvite2);
+    packet(CMSG_PLAYER_CHANGE_DEST,       0x035f,   5, clif->pWalkToXY);
+    packet(CMSG_MAP_PING,                 0x0360,   6, clif->pTickSend);
+    packet(CMSG_PLAYER_CHANGE_DIR,        0x0361,   5, clif->pChangeDir);
+    packet(CMSG_ITEM_PICKUP,              0x0362,   6, clif->pTakeItem);
+    packet(CMSG_PLAYER_INVENTORY_DROP,    0x0363,   6, clif->pDropItem);
+    packet(CMSG_MOVE_TO_STORAGE,          0x0364,   8, clif->pMoveToKafra);
+    packet(CMSG_MOVE_FROM_STORAGE,        0x0365,   8, clif->pMoveFromKafra);
+    packet(CMSG_SKILL_USE_POSITION,       0x0366,  10, clif->pUseSkillToPos);
+    packet(CMSG_SKILL_USE_POSITION_MORE,  0x0367,  90, clif->pUseSkillToPosMoreInfo);
+    packet(CMSG_NAME_REQUEST,             0x0368,   6, clif->pGetCharNameRequest);
+    packet(CMSG_SOLVE_CHAR_NAME,          0x0369,   6, clif->pSolveCharName);
+    packet(CMSG_MAP_SERVER_CONNECT,       0x0436,  19, clif->pWantToConnection);
+    packet(CMSG_PLAYER_CHANGE_ACT,        0x0437,   7, clif->pActionRequest);
+    packet(CMSG_SKILL_USE_BEING,          0x0438,  10, clif->pUseSkillToId);
+    packet(CMSG_ITEM_LIST_WINDOW_SELECT,  0x07e4,  -1, clif->pItemListWindowSelected);
+//  packet(UNKNOWN,                       0x07ec,   8, clif->pDull);
+//  packet(UNKNOWN,                       0x0802,  18, clif->pPartyBookingRegisterReq);
+    packet(CMSG_BUYINGSTORE_CREATE,       0x0811,  -1, clif->pReqOpenBuyingStore);
+    packet(CMSG_BUYINGSTORE_CLOSE,        0x0815,   2, clif->pReqCloseBuyingStore);
+    packet(CMSG_BUYINGSTORE_OPEN,         0x0817,   6, clif->pReqClickBuyingStore);
+    packet(CMSG_BUYINGSTORE_SELL,         0x0819,  -1, clif->pReqTradeBuyingStore);
+    packet(CMSG_SEARCHSTORE_SEARCH,       0x0835,  -1, clif->pSearchStoreInfo);
+    packet(CMSG_SEARCHSTORE_NEXT_PAGE,    0x0838,   2, clif->pSearchStoreInfoNextPage);
+    packet(CMSG_SEARCHSTORE_CLICK,        0x083c,  12, clif->pSearchStoreInfoListItemClick);
+}
+
+// 20180704
+if (packetVersion == 20180704)
+{
+    packet(CMSG_FRIENDS_ADD_PLAYER,       0x0202,  26, clif->pFriendsListAdd);
+    packet(CMSG_HOMUNCULUS_MENU,          0x022d,   5, clif->pHomMenu);
+    packet(CMSG_STORAGE_PASSWORD,         0x023b,  36, clif->pStoragePassword);
+//  packet(UNKNOWN,                       0x0281,   4, clif->pDull);
+    packet(CMSG_PARTY_INVITE2,            0x02c4,  26, clif->pPartyInvite2);
+    packet(CMSG_PLAYER_CHANGE_DEST,       0x035f,   5, clif->pWalkToXY);
+    packet(CMSG_MAP_PING,                 0x0360,   6, clif->pTickSend);
+    packet(CMSG_PLAYER_CHANGE_DIR,        0x0361,   5, clif->pChangeDir);
+    packet(CMSG_ITEM_PICKUP,              0x0362,   6, clif->pTakeItem);
+    packet(CMSG_PLAYER_INVENTORY_DROP,    0x0363,   6, clif->pDropItem);
+    packet(CMSG_MOVE_TO_STORAGE,          0x0364,   8, clif->pMoveToKafra);
+    packet(CMSG_MOVE_FROM_STORAGE,        0x0365,   8, clif->pMoveFromKafra);
+    packet(CMSG_SKILL_USE_POSITION,       0x0366,  10, clif->pUseSkillToPos);
+    packet(CMSG_SKILL_USE_POSITION_MORE,  0x0367,  90, clif->pUseSkillToPosMoreInfo);
+    packet(CMSG_NAME_REQUEST,             0x0368,   6, clif->pGetCharNameRequest);
+    packet(CMSG_SOLVE_CHAR_NAME,          0x0369,   6, clif->pSolveCharName);
+    packet(CMSG_MAP_SERVER_CONNECT,       0x0436,  19, clif->pWantToConnection);
+    packet(CMSG_PLAYER_CHANGE_ACT,        0x0437,   7, clif->pActionRequest);
+    packet(CMSG_SKILL_USE_BEING,          0x0438,  10, clif->pUseSkillToId);
+    packet(CMSG_ITEM_LIST_WINDOW_SELECT,  0x07e4,  -1, clif->pItemListWindowSelected);
+//  packet(UNKNOWN,                       0x07ec,   8, clif->pDull);
+//  packet(UNKNOWN,                       0x0802,  18, clif->pPartyBookingRegisterReq);
+    packet(CMSG_BUYINGSTORE_CREATE,       0x0811,  -1, clif->pReqOpenBuyingStore);
+    packet(CMSG_BUYINGSTORE_CLOSE,        0x0815,   2, clif->pReqCloseBuyingStore);
+    packet(CMSG_BUYINGSTORE_OPEN,         0x0817,   6, clif->pReqClickBuyingStore);
+    packet(CMSG_BUYINGSTORE_SELL,         0x0819,  -1, clif->pReqTradeBuyingStore);
+    packet(CMSG_SEARCHSTORE_SEARCH,       0x0835,  -1, clif->pSearchStoreInfo);
+    packet(CMSG_SEARCHSTORE_NEXT_PAGE,    0x0838,   2, clif->pSearchStoreInfoNextPage);
+    packet(CMSG_SEARCHSTORE_CLICK,        0x083c,  12, clif->pSearchStoreInfoListItemClick);
+}
+
+// 20180718
+if (packetVersion == 20180718)
+{
+    packet(CMSG_FRIENDS_ADD_PLAYER,       0x0202,  26, clif->pFriendsListAdd);
+    packet(CMSG_HOMUNCULUS_MENU,          0x022d,   5, clif->pHomMenu);
+    packet(CMSG_STORAGE_PASSWORD,         0x023b,  36, clif->pStoragePassword);
+//  packet(UNKNOWN,                       0x0281,   4, clif->pDull);
+    packet(CMSG_PARTY_INVITE2,            0x02c4,  26, clif->pPartyInvite2);
+    packet(CMSG_PLAYER_CHANGE_DEST,       0x035f,   5, clif->pWalkToXY);
+    packet(CMSG_MAP_PING,                 0x0360,   6, clif->pTickSend);
+    packet(CMSG_PLAYER_CHANGE_DIR,        0x0361,   5, clif->pChangeDir);
+    packet(CMSG_ITEM_PICKUP,              0x0362,   6, clif->pTakeItem);
+    packet(CMSG_PLAYER_INVENTORY_DROP,    0x0363,   6, clif->pDropItem);
+    packet(CMSG_MOVE_TO_STORAGE,          0x0364,   8, clif->pMoveToKafra);
+    packet(CMSG_MOVE_FROM_STORAGE,        0x0365,   8, clif->pMoveFromKafra);
+    packet(CMSG_SKILL_USE_POSITION,       0x0366,  10, clif->pUseSkillToPos);
+    packet(CMSG_SKILL_USE_POSITION_MORE,  0x0367,  90, clif->pUseSkillToPosMoreInfo);
+    packet(CMSG_NAME_REQUEST,             0x0368,   6, clif->pGetCharNameRequest);
+    packet(CMSG_SOLVE_CHAR_NAME,          0x0369,   6, clif->pSolveCharName);
+    packet(CMSG_MAP_SERVER_CONNECT,       0x0436,  19, clif->pWantToConnection);
+    packet(CMSG_PLAYER_CHANGE_ACT,        0x0437,   7, clif->pActionRequest);
+    packet(CMSG_SKILL_USE_BEING,          0x0438,  10, clif->pUseSkillToId);
+    packet(CMSG_ITEM_LIST_WINDOW_SELECT,  0x07e4,  -1, clif->pItemListWindowSelected);
+//  packet(UNKNOWN,                       0x07ec,   8, clif->pDull);
+//  packet(UNKNOWN,                       0x0802,  18, clif->pPartyBookingRegisterReq);
+    packet(CMSG_BUYINGSTORE_CREATE,       0x0811,  -1, clif->pReqOpenBuyingStore);
+    packet(CMSG_BUYINGSTORE_CLOSE,        0x0815,   2, clif->pReqCloseBuyingStore);
+    packet(CMSG_BUYINGSTORE_OPEN,         0x0817,   6, clif->pReqClickBuyingStore);
+    packet(CMSG_BUYINGSTORE_SELL,         0x0819,  -1, clif->pReqTradeBuyingStore);
+    packet(CMSG_SEARCHSTORE_SEARCH,       0x0835,  -1, clif->pSearchStoreInfo);
+    packet(CMSG_SEARCHSTORE_NEXT_PAGE,    0x0838,   2, clif->pSearchStoreInfoNextPage);
+    packet(CMSG_SEARCHSTORE_CLICK,        0x083c,  12, clif->pSearchStoreInfoListItemClick);
+}
+
 }