Merge pull request #1994 from 4144/updatepackets

Update shuffle packets and keys up to 2018-03-28. Add new defines with packet versions.

8 files changed, 140 insertions, 15 deletions

diff --git a/src/char/char.c b/src/char/char.c
index 0069e7f1d..93fb1be75 100644
--- a/src/char/char.c
+++ b/src/char/char.c
@@ -3328,7 +3328,7 @@ void char_char_name_ack(int fd, int char_id)
 	WFIFOHEAD(fd,30);
 	WFIFOW(fd,0) = 0x2b09;
 	WFIFOL(fd,2) = char_id;
-#if !defined(PACKETVER_ZERO) && (PACKETVER >= 20180307 || (defined(PACKETVER_RE) && PACKETVER >= 20180221))
+#if PACKETVER_MAIN_NUM >= 20180307 || PACKETVER_RE_NUM >= 20180221
 	if (chr->loadName(char_id, WFIFOP(fd,6)) == 0)
 		WFIFOL(fd, 6) = 0;
 #else
diff --git a/src/common/mmo.h b/src/common/mmo.h
index f9cbc57de..5e7f22e6e 100644
--- a/src/common/mmo.h
+++ b/src/common/mmo.h
@@ -81,6 +81,22 @@
 	#undef ENABLE_PACKETVER_ZERO
 #endif // DISABLE_PACKETVER_ZERO
 
+#if !defined(PACKETVER_RE) && !defined(PACKETVER_ZERO)
+	#define PACKETVER_MAIN_NUM PACKETVER
+#else
+	#define PACKETVER_MAIN_NUM 0
+#endif
+#ifdef PACKETVER_RE
+	#define PACKETVER_RE_NUM PACKETVER
+#else
+	#define PACKETVER_RE_NUM 0
+#endif
+#ifdef PACKETVER_ZERO
+	#define PACKETVER_ZERO_NUM PACKETVER
+#else
+	#define PACKETVER_ZERO_NUM 0
+#endif
+
 // Client support for experimental RagexeRE UI present in 2012-04-10 and 2012-04-18
 #if defined(PACKETVER_RE) && ( PACKETVER == 20120410 || PACKETVER == 20120418 )
 #define PARTY_RECRUIT
diff --git a/src/map/clif.c b/src/map/clif.c
index cf5edd0e0..f5adde873 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -6092,7 +6092,7 @@ void clif_wis_end(int fd, int flag) {
 void clif_solved_charname(int fd, int charid, const char* name)
 {
 	nullpo_retv(name);
-#if !defined(PACKETVER_ZERO) && (PACKETVER >= 20180307 || (defined(PACKETVER_RE) && PACKETVER >= 20180221))
+#if PACKETVER_MAIN_NUM >= 20180307 || PACKETVER_RE_NUM >= 20180221
 	WFIFOHEAD(fd, packet_len(0x0af7));
 	WFIFOW(fd, 0) = 0xaf7;
 	if (*name == 0) {
@@ -14218,10 +14218,8 @@ void clif_friendslist_toggle(struct map_session_data *sd,int account_id, int cha
 	WFIFOL(fd, 2) = sd->status.friends[i].account_id;
 	WFIFOL(fd, 6) = sd->status.friends[i].char_id;
 	WFIFOB(fd, 10) = !online; //Yeah, a 1 here means "logged off", go figure...
-#ifndef PACKETVER_ZERO
-#if PACKETVER >= 20180307 || (defined(PACKETVER_RE) && PACKETVER >= 20180221)
+#if PACKETVER_MAIN_NUM >= 20180307 || PACKETVER_RE_NUM >= 20180221
 	memcpy(WFIFOP(fd, 11), sd->status.friends[i].name, NAME_LENGTH);
-#endif
 #endif  // PACKETVER_ZERO
 
 	WFIFOSET(fd, packet_len(0x206));
@@ -14245,7 +14243,7 @@ void clif_friendslist_send(struct map_session_data *sd)
 {
 	int i = 0, n, fd = sd->fd;
 
-#if !defined(PACKETVER_ZERO) && (PACKETVER >= 20180307 || (defined(PACKETVER_RE) && PACKETVER >= 20180221))
+#if PACKETVER_MAIN_NUM >= 20180307 || PACKETVER_RE_NUM >= 20180221
 	const int offset = 8;
 #else
 	const int offset = 32;
@@ -14257,7 +14255,7 @@ void clif_friendslist_send(struct map_session_data *sd)
 	for(i = 0; i < MAX_FRIENDS && sd->status.friends[i].char_id; i++) {
 		WFIFOL(fd, 4 + offset * i + 0) = sd->status.friends[i].account_id;
 		WFIFOL(fd, 4 + offset * i + 4) = sd->status.friends[i].char_id;
-#if !(!defined(PACKETVER_ZERO) && (PACKETVER >= 20180307 || (defined(PACKETVER_RE) && PACKETVER >= 20180221)))
+#if !(PACKETVER_MAIN_NUM >= 20180307 || PACKETVER_RE_NUM >= 20180221)
 		memcpy(WFIFOP(fd, 4 + offset * i + 8), &sd->status.friends[i].name, NAME_LENGTH);
 #endif
 	}
diff --git a/src/map/packets.h b/src/map/packets.h
index 462efd31b..d18abf4da 100644
--- a/src/map/packets.h
+++ b/src/map/packets.h
@@ -4044,4 +4044,27 @@ packet(0x96e,-1,clif->ackmergeitems);
 #endif
 #endif  // PACKETVER_ZERO
 
+#ifndef PACKETVER_ZERO
+// 2018-03-21aRagexe, 2018-03-21aRagexeRE
+#if PACKETVER >= 20180321
+// new packets
+	packet(0x0af8,11,clif->pDull/*,XXX*/);
+// changed packet sizes
+	packet(0x0ae7,34,clif->pDull/*,XXX*/);
+#endif
+#endif  // PACKETVER_ZERO
+
+#ifdef PACKETVER_ZERO
+// 2018-03-28_1aRagexe_zero
+#if PACKETVER >= 20180328
+// new packets
+	packet(0x0af8,11,clif->pDull/*,XXX*/);
+	packet(0x0af9,6,clif->pDull/*,XXX*/);
+	packet(0x0afa,54,clif->pDull/*,XXX*/);
+// changed packet sizes
+	packet(0x0206,35); // ZC_FRIENDS_STATE
+	packet(0x0ae7,38,clif->pDull/*,XXX*/);
+#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 066e7d2c3..8d20780d4 100644
--- a/src/map/packets_keys_main.h
+++ b/src/map/packets_keys_main.h
@@ -874,11 +874,14 @@
 	packetKeys(0x6A596301,0x76866D0E,0x32294A45);
 #endif
 
-// 2013-12-23aRagexeRE, 2014-05-08aRagexe, 2014-05-08aRagexeRE, 2014-06-11eRagexe, 2015-02-25hRagexe
+// 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
 #if PACKETVER == 20131223 || \
     PACKETVER == 20140508 || \
     PACKETVER == 20140611 || \
-    PACKETVER == 20150225
+    PACKETVER == 20150225 || \
+    PACKETVER == 20180315 || \
+    PACKETVER == 20180321 || \
+    PACKETVER == 20180328
 	packetKeys(0x00000000,0x00000000,0x00000000);
 #endif
 
@@ -1976,5 +1979,10 @@
 	packetKeys(0x47DA10EB,0x4B922CCF,0x765C5055);
 #endif
 
+// 2018-03-14nRagexe
+#if PACKETVER == 20180314
+	packetKeys(0x2FF07149,0x00596EA3,0x2B853026);
+#endif
+
 
 #endif /* MAP_PACKETS_MAIN_KEYS_H */
diff --git a/src/map/packets_keys_zero.h b/src/map/packets_keys_zero.h
index 75196e6b4..2bd6f1604 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
+// 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
 #if PACKETVER == 20171019 || \
     PACKETVER == 20171023 || \
     PACKETVER == 20171024 || \
@@ -38,7 +38,10 @@
     PACKETVER == 20171030 || \
     PACKETVER == 20171031 || \
     PACKETVER == 20171109 || \
-    PACKETVER == 20171113
+    PACKETVER == 20171113 || \
+    PACKETVER == 20180315 || \
+    PACKETVER == 20180321 || \
+    PACKETVER == 20180328
 	packetKeys(0x00000000,0x00000000,0x00000000);
 #endif
 
@@ -141,5 +144,10 @@
 	packetKeys(0x56C82ABE,0x61AE2B2E,0x472E272E);
 #endif
 
+// 2018-03-14nRagexe_zero
+#if PACKETVER == 20180314
+	packetKeys(0x2FC330DD,0x01C04E1F,0x4D914DE2);
+#endif
+
 
 #endif /* MAP_PACKETS_ZERO_KEYS_H */
diff --git a/src/map/packets_shuffle_main.h b/src/map/packets_shuffle_main.h
index aabf9c3f3..d1f9a2062 100644
--- a/src/map/packets_shuffle_main.h
+++ b/src/map/packets_shuffle_main.h
@@ -3178,10 +3178,13 @@
 	packet(0x096a,18,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER
 #endif
 
-// 2014-05-08aRagexe, 2014-05-08aRagexeRE, 2014-06-11eRagexe, 2015-02-25hRagexe
+// 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
 #if PACKETVER == 20140508 || \
     PACKETVER == 20140611 || \
-    PACKETVER == 20150225
+    PACKETVER == 20150225 || \
+    PACKETVER == 20180315 || \
+    PACKETVER == 20180321 || \
+    PACKETVER == 20180328
 	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
@@ -9667,5 +9670,38 @@
 	packet(0x0969,7,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT
 #endif
 
+// 2018-03-14nRagexe
+#if PACKETVER == 20180314
+	packet(0x0361,12,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK
+	packet(0x0366,10,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL
+	packet(0x0369,5,clif->pHomMenu,2,4);  // CZ_COMMAND_MER
+	packet(0x0436,6,clif->pDropItem,2,4);  // CZ_ITEM_THROW
+	packet(0x085a,6,clif->pGetCharNameRequest,2);  // CZ_REQNAME
+	packet(0x0862,6,clif->pTakeItem,2);  // CZ_ITEM_PICKUP
+	packet(0x0863,-1,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES
+	packet(0x0868,8,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD
+	packet(0x086e,8,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY
+	packet(0x0874,-1,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE
+	packet(0x087a,19,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER
+	packet(0x0888,5,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION
+	packet(0x088a,10,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND
+	packet(0x088d,36,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD
+	packet(0x0894,2,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE
+	packet(0x089b,90,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX
+	packet(0x0921,7,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT
+	packet(0x0927,2,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE
+	packet(0x092f,5,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE
+	packet(0x0933,8,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE
+	packet(0x0935,26,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ
+	packet(0x0945,18,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER
+	packet(0x094d,-1,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE
+	packet(0x094e,26,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS
+	packet(0x0956,4,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK
+	packet(0x0959,6,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE
+	packet(0x095f,6,clif->pTickSend,2);  // CZ_REQUEST_TIME
+	packet(0x0962,-1,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO
+	packet(0x0967,6,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID
+#endif
+
 
 #endif /* MAP_PACKETS_SHUFFLE_MAIN_H */
diff --git a/src/map/packets_shuffle_zero.h b/src/map/packets_shuffle_zero.h
index 463ab1679..7cd52d971 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
+// 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
 #if PACKETVER == 20171019 || \
     PACKETVER == 20171023 || \
     PACKETVER == 20171024 || \
@@ -45,7 +45,10 @@
     PACKETVER == 20171030 || \
     PACKETVER == 20171031 || \
     PACKETVER == 20171109 || \
-    PACKETVER == 20171113
+    PACKETVER == 20171113 || \
+    PACKETVER == 20180315 || \
+    PACKETVER == 20180321 || \
+    PACKETVER == 20180328
 	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
@@ -652,5 +655,38 @@
 	packet(0x096a,6,clif->pGetCharNameRequest,2);  // CZ_REQNAME
 #endif
 
+// 2018-03-14nRagexe_zero
+#if PACKETVER == 20180314
+	packet(0x023b,26,clif->pPartyInvite2,2);  // CZ_PARTY_JOIN_REQ
+	packet(0x0438,2,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE
+	packet(0x07ec,19,clif->pWantToConnection,2,6,10,14,18);  // CZ_ENTER
+	packet(0x0817,2,clif->pReqCloseBuyingStore,0);  // CZ_REQ_CLOSE_BUYING_STORE
+	packet(0x083c,5,clif->pChangeDir,2,4);  // CZ_CHANGE_DIRECTION
+	packet(0x085d,26,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS
+	packet(0x085f,-1,clif->pReqOpenBuyingStore,2,4,8,9,89);  // CZ_REQ_OPEN_BUYING_STORE
+	packet(0x0866,5,clif->pHomMenu,2,4);  // CZ_COMMAND_MER
+	packet(0x0878,8,clif->pDull/*,XXX*/);  // CZ_JOIN_BATTLE_FIELD
+	packet(0x088d,36,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD
+	packet(0x0891,8,clif->pMoveFromKafra,2,4);  // CZ_MOVE_ITEM_FROM_STORE_TO_BODY
+	packet(0x0897,6,clif->pTakeItem,2);  // CZ_ITEM_PICKUP
+	packet(0x0899,8,clif->pMoveToKafra,2,4);  // CZ_MOVE_ITEM_FROM_BODY_TO_STORE
+	packet(0x089e,-1,clif->pItemListWindowSelected,2,4,8);  // CZ_ITEMLISTWIN_RES
+	packet(0x08a1,4,clif->pDull/*,XXX*/);  // CZ_GANGSI_RANK
+	packet(0x0917,-1,clif->pSearchStoreInfo,2,4,5,9,13,14,15);  // CZ_SEARCH_STORE_INFO
+	packet(0x0918,7,clif->pActionRequest,2,6);  // CZ_REQUEST_ACT
+	packet(0x091f,10,clif->pUseSkillToPos,2,4,6,8);  // CZ_USE_SKILL_TOGROUND
+	packet(0x0920,6,clif->pTickSend,2);  // CZ_REQUEST_TIME
+	packet(0x0923,12,clif->pSearchStoreInfoListItemClick,2,6,10);  // CZ_SSILIST_ITEM_CLICK
+	packet(0x0930,6,clif->pDropItem,2,4);  // CZ_ITEM_THROW
+	packet(0x0931,6,clif->pReqClickBuyingStore,2);  // CZ_REQ_CLICK_TO_BUYING_STORE
+	packet(0x093f,6,clif->pSolveCharName,2);  // CZ_REQNAME_BYGID
+	packet(0x0946,90,clif->pUseSkillToPosMoreInfo,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND_WITHTALKBOX
+	packet(0x094a,10,clif->pUseSkillToId,2,4,6);  // CZ_USE_SKILL
+	packet(0x094e,5,clif->pWalkToXY,2);  // CZ_REQUEST_MOVE
+	packet(0x0954,18,clif->pPartyBookingRegisterReq,2,4);  // CZ_PARTY_BOOKING_REQ_REGISTER
+	packet(0x0956,6,clif->pGetCharNameRequest,2);  // CZ_REQNAME
+	packet(0x0958,-1,clif->pReqTradeBuyingStore,2,4,8,12);  // CZ_REQ_TRADE_BUYING_STORE
+#endif
+
 
 #endif /* MAP_PACKETS_SHUFFLE_ZERO_H */