Update packets up to 2019-03-06

.travis.yml

@@ -39,7 +39,7 @@ matrix:
   - compiler: false
   include:
   - compiler: gcc
-    env: LDFLAGS="-fuse-ld=gold" CONFIGURE_FLAGS="--enable-debug CC=gcc-6 --disable-manager --enable-Werror --enable-packetver=20190123 --enable-packetver-re --enable-buildbot" HPM="1"
+    env: LDFLAGS="-fuse-ld=gold" CONFIGURE_FLAGS="--enable-debug CC=gcc-6 --disable-manager --enable-Werror --enable-packetver=20190306 --enable-packetver-re --enable-buildbot" HPM="1"
     addons:
       apt:
         sources:
@@ -52,7 +52,7 @@ matrix:
         - libxml-sax-perl
         - libxml-parser-perl
   - compiler: clang
-    env: CONFIGURE_FLAGS="--enable-debug CC=clang-5.0 --enable-Werror --enable-packetver=20190123 --enable-packetver-re --enable-buildbot"
+    env: CONFIGURE_FLAGS="--enable-debug CC=clang-5.0 --enable-Werror --enable-packetver=20190306 --enable-packetver-re --enable-buildbot"
     addons:
       apt:
         sources:
@@ -72,7 +72,7 @@ matrix:
         - gdb
         - clang-5.0
   - compiler: clang
-    env: CONFIGURE_FLAGS="--enable-debug CC=clang-4.0 --enable-Werror --enable-packetver=20190123 --enable-packetver-re --enable-buildbot"
+    env: CONFIGURE_FLAGS="--enable-debug CC=clang-4.0 --enable-Werror --enable-packetver=20190306 --enable-packetver-re --enable-buildbot"
     addons:
       apt:
         sources:
@@ -106,11 +106,11 @@ matrix:
   - compiler: clang
     env: CONFIGURE_FLAGS="--enable-debug --disable-renewal --enable-Werror --enable-buildbot"
   - compiler: gcc
-    env: CONFIGURE_FLAGS="--enable-debug --enable-Werror --enable-packetver=20190123 --enable-packetver-re --enable-buildbot"
+    env: CONFIGURE_FLAGS="--enable-debug --enable-Werror --enable-packetver=20190306 --enable-packetver-re --enable-buildbot"
   - compiler: gcc
     env: CONFIGURE_FLAGS="--enable-debug --disable-renewal --enable-Werror --enable-buildbot"
   - compiler: gcc
-    env: LDFLAGS="-fuse-ld=gold" CONFIGURE_FLAGS="--enable-debug --enable-sanitize=full CC=gcc-5 --disable-manager --enable-Werror --enable-packetver=20190123 --enable-packetver-re --enable-buildbot"
+    env: LDFLAGS="-fuse-ld=gold" CONFIGURE_FLAGS="--enable-debug --enable-sanitize=full CC=gcc-5 --disable-manager --enable-Werror --enable-packetver=20190306 --enable-packetver-re --enable-buildbot"
     addons:
       apt:
         sources:
@@ -128,7 +128,7 @@ matrix:
         - gdb
         - gcc-5
   - compiler: gcc
-    env: LDFLAGS="-fuse-ld=gold" CONFIGURE_FLAGS="--enable-debug --enable-sanitize=full CC=gcc-6 --disable-manager --enable-Werror --enable-packetver=20190123 --enable-packetver-re --enable-buildbot"
+    env: LDFLAGS="-fuse-ld=gold" CONFIGURE_FLAGS="--enable-debug --enable-sanitize=full CC=gcc-6 --disable-manager --enable-Werror --enable-packetver=20190306 --enable-packetver-re --enable-buildbot"
     addons:
       apt:
         sources:
@@ -146,7 +146,7 @@ matrix:
         - gdb
         - gcc-6
   - compiler: gcc
-    env: LDFLAGS="-fuse-ld=gold" CONFIGURE_FLAGS="--enable-debug CC=gcc-7 --disable-manager --enable-Werror --enable-packetver=20190123 --enable-packetver-re --enable-buildbot"
+    env: LDFLAGS="-fuse-ld=gold" CONFIGURE_FLAGS="--enable-debug CC=gcc-7 --disable-manager --enable-Werror --enable-packetver=20190306 --enable-packetver-re --enable-buildbot"
     addons:
       apt:
         sources:
@@ -164,7 +164,7 @@ matrix:
         - gdb
         - gcc-7
   - compiler: gcc
-    env: LDFLAGS="-fuse-ld=gold" CONFIGURE_FLAGS="--enable-debug --enable-sanitize=full CC=gcc-8 --disable-manager --enable-Werror --enable-packetver=20190123 --enable-packetver-re --enable-buildbot"
+    env: LDFLAGS="-fuse-ld=gold" CONFIGURE_FLAGS="--enable-debug --enable-sanitize=full CC=gcc-8 --disable-manager --enable-Werror --enable-packetver=20190306 --enable-packetver-re --enable-buildbot"
     addons:
       apt:
         sources:

src/common/packets/packets2019_len_main.h

@@ -2,8 +2,8 @@
  * This file is part of Hercules.
  * http://herc.ws - http://github.com/HerculesWS/Hercules
  *
- * Copyright (C) 2019  Hercules Dev Team
- * Copyright (C) 2019  Andrei Karas (4144)
+ * Copyright (C) 2018-2019  Hercules Dev Team
+ * Copyright (C) 2018-2019  Andrei Karas (4144)
  *
  * Hercules is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -3994,13 +3994,13 @@ packetLen(0x0a95, 4)
 packetLen(0x0a96, 61)  // ZC_ADD_EXCHANGE_ITEM4
 
 // Packet: 0x0a97
-packetLen(0x0a97, 8)  // CZ_ALT_EQUIPMENT_EQUIP
+packetLen(0x0a97, 8)  // CZ_ALT_EQUIPMENT_ADD
 
 // Packet: 0x0a98
 packetLen(0x0a98, 10)  // ZC_ALT_EQUIPMENT_EQUIP
 
 // Packet: 0x0a99
-packetLen(0x0a99, 4)
+packetLen(0x0a99, 4)  // CZ_ALT_EQUIPMENT_REMOVE
 
 // Packet: 0x0a9a
 packetLen(0x0a9a, 10)  // ZC_ALT_EQUIPMENT_REMOVE
@@ -4009,10 +4009,10 @@ packetLen(0x0a9a, 10)  // ZC_ALT_EQUIPMENT_REMOVE
 packetLen(0x0a9b, -1)  // ZC_ALT_EQUIPMENT_ITEMS
 
 // Packet: 0x0a9c
-packetLen(0x0a9c, 2)
+packetLen(0x0a9c, 2)  // CZ_ALT_EQUIPMENT_SWITCH
 
 // Packet: 0x0a9d
-packetLen(0x0a9d, 4)
+packetLen(0x0a9d, 4)  // ZC_ALT_EQUIPMENT_SWITCH_ACK
 
 // Packet: 0x0a9e
 packetLen(0x0a9e, 2)
@@ -4168,7 +4168,7 @@ packetLen(0x0acf, 68)  // CA_LOGIN_OTP
 packetLen(0x0ad0, 11)  // CA_OTP_CODE
 
 // Packet: 0x0ad1
-packetLen(0x0ad1, -1)
+packetLen(0x0ad1, -1)  // AC_LOGIN_OTP
 
 // Packet: 0x0ad2
 packetLen(0x0ad2, 30)
@@ -4375,7 +4375,53 @@ packetLen(0x0b18, 4)  // ZC_INVENTORY_EXPANSION_INFO
 packetLen(0x0b19, 2)  // CZ_INVENTORY_EXPAND_REJECTED
 
 // Packet: 0x0b1a
-packetLen(0x0b1a, 29)
+packetLen(0x0b1a, 29)  // ZC_USESKILL_ACK3
+
+// Packet: 0x0b1b
+#if PACKETVER >= 20190213
+packetLen(0x0b1b, 2)
+#endif
+
+// Packet: 0x0b1c
+#if PACKETVER >= 20190227
+packetLen(0x0b1c, 2)
+#endif
+
+// Packet: 0x0b1d
+#if PACKETVER >= 20190227
+packetLen(0x0b1d, 2)
+#endif
+
+// Packet: 0x0b1e
+#if PACKETVER >= 20190227
+packetLen(0x0b1e, 10)
+#endif
+
+// Packet: 0x0b1f
+#if PACKETVER >= 20190306
+packetLen(0x0b1f, 10)
+#endif
+
+// Packet: 0x0b21
+#if PACKETVER >= 20190306
+// removed
+#elif PACKETVER >= 20190227
+packetLen(0x0b21, 10)
+#endif
+
+// Packet: 0x0b22
+#if PACKETVER >= 20190306
+// removed
+#elif PACKETVER >= 20190227
+packetLen(0x0b22, 6)
+#endif
+
+// Packet: 0x0b23
+#if PACKETVER >= 20190306
+// removed
+#elif PACKETVER >= 20190227
+packetLen(0x0b23, 10)
+#endif
 
 
 #endif /* COMMON_PACKETS2019_LEN_MAIN_H */

src/common/packets/packets2019_len_re.h

@@ -2,8 +2,8 @@
  * This file is part of Hercules.
  * http://herc.ws - http://github.com/HerculesWS/Hercules
  *
- * Copyright (C) 2019  Hercules Dev Team
- * Copyright (C) 2019  Andrei Karas (4144)
+ * Copyright (C) 2018-2019  Hercules Dev Team
+ * Copyright (C) 2018-2019  Andrei Karas (4144)
  *
  * Hercules is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -4000,13 +4000,13 @@ packetLen(0x0a95, 4)
 packetLen(0x0a96, 61)  // ZC_ADD_EXCHANGE_ITEM4
 
 // Packet: 0x0a97
-packetLen(0x0a97, 8)  // CZ_ALT_EQUIPMENT_EQUIP
+packetLen(0x0a97, 8)  // CZ_ALT_EQUIPMENT_ADD
 
 // Packet: 0x0a98
 packetLen(0x0a98, 10)  // ZC_ALT_EQUIPMENT_EQUIP
 
 // Packet: 0x0a99
-packetLen(0x0a99, 4)
+packetLen(0x0a99, 4)  // CZ_ALT_EQUIPMENT_REMOVE
 
 // Packet: 0x0a9a
 packetLen(0x0a9a, 10)  // ZC_ALT_EQUIPMENT_REMOVE
@@ -4015,10 +4015,10 @@ packetLen(0x0a9a, 10)  // ZC_ALT_EQUIPMENT_REMOVE
 packetLen(0x0a9b, -1)  // ZC_ALT_EQUIPMENT_ITEMS
 
 // Packet: 0x0a9c
-packetLen(0x0a9c, 2)
+packetLen(0x0a9c, 2)  // CZ_ALT_EQUIPMENT_SWITCH
 
 // Packet: 0x0a9d
-packetLen(0x0a9d, 4)
+packetLen(0x0a9d, 4)  // ZC_ALT_EQUIPMENT_SWITCH_ACK
 
 // Packet: 0x0a9e
 packetLen(0x0a9e, 2)
@@ -4174,7 +4174,7 @@ packetLen(0x0acf, 68)  // CA_LOGIN_OTP
 packetLen(0x0ad0, 11)  // CA_OTP_CODE
 
 // Packet: 0x0ad1
-packetLen(0x0ad1, -1)
+packetLen(0x0ad1, -1)  // AC_LOGIN_OTP
 
 // Packet: 0x0ad2
 packetLen(0x0ad2, 30)
@@ -4381,7 +4381,53 @@ packetLen(0x0b18, 4)  // ZC_INVENTORY_EXPANSION_INFO
 packetLen(0x0b19, 2)  // CZ_INVENTORY_EXPAND_REJECTED
 
 // Packet: 0x0b1a
-packetLen(0x0b1a, 29)
+packetLen(0x0b1a, 29)  // ZC_USESKILL_ACK3
+
+// Packet: 0x0b1b
+#if PACKETVER >= 20190213
+packetLen(0x0b1b, 2)
+#endif
+
+// Packet: 0x0b1c
+#if PACKETVER >= 20190220
+packetLen(0x0b1c, 2)
+#endif
+
+// Packet: 0x0b1d
+#if PACKETVER >= 20190220
+packetLen(0x0b1d, 2)
+#endif
+
+// Packet: 0x0b1e
+#if PACKETVER >= 20190227
+packetLen(0x0b1e, 10)
+#endif
+
+// Packet: 0x0b1f
+#if PACKETVER >= 20190306
+packetLen(0x0b1f, 10)
+#endif
+
+// Packet: 0x0b21
+#if PACKETVER >= 20190306
+// removed
+#elif PACKETVER >= 20190227
+packetLen(0x0b21, 10)
+#endif
+
+// Packet: 0x0b22
+#if PACKETVER >= 20190306
+// removed
+#elif PACKETVER >= 20190227
+packetLen(0x0b22, 6)
+#endif
+
+// Packet: 0x0b23
+#if PACKETVER >= 20190306
+// removed
+#elif PACKETVER >= 20190227
+packetLen(0x0b23, 10)
+#endif
 
 
 #endif /* COMMON_PACKETS2019_LEN_RE_H */

src/common/packets/packets2019_len_zero.h

@@ -4168,7 +4168,7 @@ packetLen(0x0acf, 68)  // CA_LOGIN_OTP
 packetLen(0x0ad0, 11)  // CA_OTP_CODE
 
 // Packet: 0x0ad1
-packetLen(0x0ad1, -1)
+packetLen(0x0ad1, -1)  // AC_LOGIN_OTP
 
 // Packet: 0x0ad2
 packetLen(0x0ad2, 30)
@@ -4375,12 +4375,22 @@ packetLen(0x0b18, 4)  // ZC_INVENTORY_EXPANSION_INFO
 packetLen(0x0b19, 2)  // CZ_INVENTORY_EXPAND_REJECTED
 
 // Packet: 0x0b1a
-packetLen(0x0b1a, 29)
+packetLen(0x0b1a, 29)  // ZC_USESKILL_ACK3
 
 // Packet: 0x0b1b
 #if PACKETVER >= 20190130
 packetLen(0x0b1b, 2)
 #endif
 
+// Packet: 0x0b1c
+#if PACKETVER >= 20190220
+packetLen(0x0b1c, 2)
+#endif
+
+// Packet: 0x0b1d
+#if PACKETVER >= 20190220
+packetLen(0x0b1d, 2)
+#endif
+
 
 #endif /* COMMON_PACKETS2019_LEN_ZERO_H */

src/map/clif.c

@@ -5432,7 +5432,7 @@ static void clif_useskill(struct block_list *bl, int src_id, int dst_id, int dst
 #if PACKETVER_MAIN_NUM >= 20091124 || PACKETVER_RE_NUM >= 20091124 || defined(PACKETVER_ZERO)
 	p.disposable = 0;
 #endif
-#if PACKETVER_ZERO_NUM >= 20190130
+#if PACKETVER_MAIN_NUM >= 20181212 || PACKETVER_RE_NUM >= 20181212 || PACKETVER_ZERO_NUM >= 20190130
 	p.unknown = 0;
 #endif
 
@@ -18580,6 +18580,7 @@ static void clif_search_store_info_ack(struct map_session_data *sd)
 ///     2 = "You cannot search anymore." (0x706)
 ///     3 = "You cannot search yet." (0x708)
 ///     4 = "No sale (purchase) information available." (0x705)
+///     362 = silent error
 static void clif_search_store_info_failed(struct map_session_data *sd, unsigned char reason)
 {
 #if PACKETVER >= 20100601

src/map/clif.h

@@ -412,20 +412,22 @@ enum CASH_SHOP_BUY_RESULT {
 };
 
 enum BATTLEGROUNDS_QUEUE_ACK {
-	BGQA_SUCCESS = 1,
-	BGQA_FAIL_QUEUING_FINISHED,
-	BGQA_FAIL_BGNAME_INVALID,
-	BGQA_FAIL_TYPE_INVALID,
-	BGQA_FAIL_PPL_OVERAMOUNT,
-	BGQA_FAIL_LEVEL_INCORRECT,
-	BGQA_DUPLICATE_REQUEST,
-	BGQA_PLEASE_RELOGIN,
-	BGQA_NOT_PARTY_GUILD_LEADER,
-	BGQA_FAIL_CLASS_INVALID,
+	BGQA_SUCCESS                 = 1,
+	BGQA_FAIL_QUEUING_FINISHED   = 2,
+	BGQA_FAIL_BGNAME_INVALID     = 3,
+	BGQA_FAIL_TYPE_INVALID       = 4,
+	BGQA_FAIL_PPL_OVERAMOUNT     = 5,
+	BGQA_FAIL_LEVEL_INCORRECT    = 6,
+	BGQA_DUPLICATE_REQUEST       = 7,
+	BGQA_PLEASE_RELOGIN          = 8,
+	BGQA_NOT_PARTY_GUILD_LEADER  = 9,
+	BGQA_FAIL_CLASS_INVALID      = 10,
 	/* not official way to respond (gotta find packet?) */
-	BGQA_FAIL_DESERTER,
-	BGQA_FAIL_COOLDOWN,
-	BGQA_FAIL_TEAM_COUNT,
+	BGQA_FAIL_DESERTER           = 11,
+	BGQA_FAIL_COOLDOWN           = 12,
+	BGQA_FAIL_TEAM_COUNT         = 13,
+	// official continue
+	BGQA_FAIL_TEAM_IN_BG_ALREADY = 15
 };
 
 enum BATTLEGROUNDS_QUEUE_NOTICE_DELETED {

src/map/intif.c

@@ -1507,7 +1507,7 @@ static void intif_parse_GuildMemberWithdraw(int fd)
 // ACK guild member basic info
 static void intif_parse_GuildMemberInfoShort(int fd)
 {
-	guild->recv_memberinfoshort(RFIFOL(fd,2),RFIFOL(fd,6),RFIFOL(fd,10),RFIFOB(fd,14),RFIFOW(fd,15),RFIFOL(fd,17),RFIFOL(fd,19));
+	guild->recv_memberinfoshort(RFIFOL(fd,2),RFIFOL(fd,6),RFIFOL(fd,10),RFIFOB(fd,14),RFIFOW(fd,15),RFIFOL(fd,17),RFIFOL(fd,21));
 }
 
 // ACK guild break