Merge pull request #2491 from 4144/updatepackets

Update packets up to 2019-06-05
HerculesWS · Jun 30, 2019 · 1bda260 · 1bda260
2 parents abc127d + 72ee8cf
commit 1bda260
Show file tree

Hide file tree

Showing 17 changed files with 279 additions and 105 deletions.
diff --git a/.travis.yml b/.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=20190530 --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=20190619 --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=20190530 --enable-packetver-re --enable-buildbot"
+    env: CONFIGURE_FLAGS="--enable-debug CC=clang-5.0 --enable-Werror --enable-packetver=20190619 --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=20190530 --enable-packetver-re --enable-buildbot"
+    env: CONFIGURE_FLAGS="--enable-debug CC=clang-4.0 --enable-Werror --enable-packetver=20190619 --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=20190530 --enable-packetver-re --enable-buildbot"
+    env: CONFIGURE_FLAGS="--enable-debug --enable-Werror --enable-packetver=20190619 --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=20190530 --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=20190619 --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=20190530 --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=20190619 --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=20190530 --enable-packetver-re --enable-buildbot"
+    env: LDFLAGS="-fuse-ld=gold" CONFIGURE_FLAGS="--enable-debug CC=gcc-7 --disable-manager --enable-Werror --enable-packetver=20190619 --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=20190530 --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=20190619 --enable-packetver-re --enable-buildbot"
     addons:
       apt:
         sources:

diff --git a/configure b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac 5b2340b4d.
+# From configure.ac cdc66ce0e.
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.69.
 #

diff --git a/src/common/mmo.h b/src/common/mmo.h
@@ -139,7 +139,7 @@
 // Note that newer clients no longer save hotkeys in the registry!
 #define HOTKEY_SAVING
 
-#if PACKETVER_MAIN_NUM >= 20190522 || PACKETVER_RE_NUM >= 20190508
+#if PACKETVER_MAIN_NUM >= 20190522 || PACKETVER_RE_NUM >= 20190508 || PACKETVER_ZERO_NUM >= 20190605
 #define MAX_HOTKEYS 38
 #elif PACKETVER_MAIN_NUM >= 20141022 || PACKETVER_RE_NUM >= 20141015 || defined(PACKETVER_ZERO)
 // (38 = 9 skills x 4 bars & 2 Quickslots)(0x07d9,268)
@@ -156,7 +156,7 @@
 #endif
 #endif  // PACKETVER_MAIN_NUM >= 20070711 || PACKETVER_RE_NUM >= 20080827 || PACKETVER_AD_NUM >= 20070711 || PACKETVER_SAK_NUM >= 20070628 || defined(PACKETVER_ZERO)
 
-#if PACKETVER_MAIN_NUM >= 20190522 || PACKETVER_RE_NUM >= 20190508
+#if PACKETVER_MAIN_NUM >= 20190522 || PACKETVER_RE_NUM >= 20190508 || PACKETVER_ZERO_NUM >= 20190605
 #define MAX_HOTKEYS_DB ((MAX_HOTKEYS) * 2)
 #else
 #define MAX_HOTKEYS_DB MAX_HOTKEYS

diff --git a/src/common/packets/packets2019_len_main.h b/src/common/packets/packets2019_len_main.h
@@ -4312,7 +4312,11 @@ packetLen(0x0b02, 26)  // AC_REFUSE_LOGIN4
 packetLen(0x0b03, -1)  // ZC_EQUIPWIN_MICROSCOPE_V7
 
 // Packet: 0x0b04
+#if PACKETVER >= 20190605
+packetLen(0x0b04, 72)
+#elif PACKETVER >= 20190109
 packetLen(0x0b04, 80)
+#endif
 
 // Packet: 0x0b05
 packetLen(0x0b05, 63)  // ZC_OFFLINE_STORE_VISIBLE
@@ -4393,12 +4397,16 @@ packetLen(0x0b1d, 2)  // ZC_PING
 #endif
 
 // Packet: 0x0b1e
-#if PACKETVER >= 20190227
+#if PACKETVER >= 20190619
+packetLen(0x0b1e, 14)
+#elif PACKETVER >= 20190227
 packetLen(0x0b1e, 10)
 #endif
 
 // Packet: 0x0b1f
-#if PACKETVER >= 20190306
+#if PACKETVER >= 20190619
+packetLen(0x0b1f, 14)
+#elif PACKETVER >= 20190306
 packetLen(0x0b1f, 10)
 #endif
 
@@ -4466,12 +4474,16 @@ packetLen(0x0b28, 22)
 #endif
 
 // Packet: 0x0b29
-#if PACKETVER >= 20190508
+#if PACKETVER >= 20190605
+// removed
+#elif PACKETVER >= 20190508
 packetLen(0x0b29, 6)
 #endif
 
 // Packet: 0x0b2a
-#if PACKETVER >= 20190522
+#if PACKETVER >= 20190605
+// removed
+#elif PACKETVER >= 20190522
 packetLen(0x0b2a, 40)
 #elif PACKETVER >= 20190508
 packetLen(0x0b2a, 6)
@@ -4499,13 +4511,28 @@ packetLen(0x0b2e, 4)
 
 // Packet: 0x0b2f
 #if PACKETVER >= 20190529
-packetLen(0x0b2f, 73)
+packetLen(0x0b2f, 73)  // ZC_PROPERTY_HOMUN_3
 #endif
 
 // Packet: 0x0b30
 #if PACKETVER >= 20190529
 packetLen(0x0b30, -1)
 #endif
 
+// Packet: 0x0b31
+#if PACKETVER >= 20190619
+packetLen(0x0b31, 17)
+#endif
+
+// Packet: 0x0b32
+#if PACKETVER >= 20190619
+packetLen(0x0b32, -1)
+#endif
+
+// Packet: 0x0b33
+#if PACKETVER >= 20190619
+packetLen(0x0b33, 17)
+#endif
+
 
 #endif /* COMMON_PACKETS2019_LEN_MAIN_H */
diff --git a/src/common/packets/packets2019_len_re.h b/src/common/packets/packets2019_len_re.h
@@ -4318,7 +4318,11 @@ packetLen(0x0b02, 26)  // AC_REFUSE_LOGIN4
 packetLen(0x0b03, -1)  // ZC_EQUIPWIN_MICROSCOPE_V7
 
 // Packet: 0x0b04
+#if PACKETVER >= 20190605
+packetLen(0x0b04, 72)
+#elif PACKETVER >= 20190109
 packetLen(0x0b04, 80)
+#endif
 
 // Packet: 0x0b05
 packetLen(0x0b05, 63)  // ZC_OFFLINE_STORE_VISIBLE
@@ -4399,12 +4403,22 @@ packetLen(0x0b1d, 2)  // ZC_PING
 #endif
 
 // Packet: 0x0b1e
-#if PACKETVER >= 20190227
+#if PACKETVER >= 20190619
+packetLen(0x0b1e, 14)
+#elif PACKETVER >= 20190605
+packetLen(0x0b1e, 14)
+// ignored packet from 2019-06-05hRagexeRE
+#elif PACKETVER >= 20190227
 packetLen(0x0b1e, 10)
 #endif
 
 // Packet: 0x0b1f
-#if PACKETVER >= 20190306
+#if PACKETVER >= 20190619
+packetLen(0x0b1f, 14)
+#elif PACKETVER >= 20190605
+packetLen(0x0b1f, 14)
+// ignored packet from 2019-06-05hRagexeRE
+#elif PACKETVER >= 20190306
 packetLen(0x0b1f, 10)
 #endif
 
@@ -4472,12 +4486,16 @@ packetLen(0x0b28, 22)
 #endif
 
 // Packet: 0x0b29
-#if PACKETVER >= 20190508
+#if PACKETVER >= 20190605
+// removed
+#elif PACKETVER >= 20190508
 packetLen(0x0b29, 6)
 #endif
 
 // Packet: 0x0b2a
-#if PACKETVER >= 20190522
+#if PACKETVER >= 20190605
+// removed
+#elif PACKETVER >= 20190522
 packetLen(0x0b2a, 40)
 #elif PACKETVER >= 20190508
 packetLen(0x0b2a, 6)
@@ -4505,13 +4523,28 @@ packetLen(0x0b2e, 4)
 
 // Packet: 0x0b2f
 #if PACKETVER >= 20190529
-packetLen(0x0b2f, 73)
+packetLen(0x0b2f, 73)  // ZC_PROPERTY_HOMUN_3
 #endif
 
 // Packet: 0x0b30
 #if PACKETVER >= 20190529
 packetLen(0x0b30, -1)
 #endif
 
+// Packet: 0x0b31
+#if PACKETVER >= 20190619
+packetLen(0x0b31, 17)
+#endif
+
+// Packet: 0x0b32
+#if PACKETVER >= 20190619
+packetLen(0x0b32, -1)
+#endif
+
+// Packet: 0x0b33
+#if PACKETVER >= 20190619
+packetLen(0x0b33, 17)
+#endif
+
 
 #endif /* COMMON_PACKETS2019_LEN_RE_H */
diff --git a/src/common/packets/packets2019_len_zero.h b/src/common/packets/packets2019_len_zero.h
@@ -4312,7 +4312,11 @@ packetLen(0x0b02, 26)  // AC_REFUSE_LOGIN4
 packetLen(0x0b03, -1)  // ZC_EQUIPWIN_MICROSCOPE_V7
 
 // Packet: 0x0b04
+#if PACKETVER >= 20190605
+packetLen(0x0b04, 72)
+#elif PACKETVER >= 20190116
 packetLen(0x0b04, 80)
+#endif
 
 // Packet: 0x0b05
 packetLen(0x0b05, 63)  // ZC_OFFLINE_STORE_VISIBLE
@@ -4393,12 +4397,16 @@ packetLen(0x0b1d, 2)  // ZC_PING
 #endif
 
 // Packet: 0x0b1e
-#if PACKETVER >= 20190313
+#if PACKETVER >= 20190626
+packetLen(0x0b1e, 14)
+#elif PACKETVER >= 20190313
 packetLen(0x0b1e, 10)
 #endif
 
 // Packet: 0x0b1f
-#if PACKETVER >= 20190313
+#if PACKETVER >= 20190626
+packetLen(0x0b1f, 14)
+#elif PACKETVER >= 20190313
 packetLen(0x0b1f, 10)
 #endif
 
@@ -4456,14 +4464,18 @@ packetLen(0x0b28, -1)
 #endif
 
 // Packet: 0x0b29
-#if PACKETVER >= 20190502
+#if PACKETVER >= 20190605
+// removed
+#elif PACKETVER >= 20190502
 packetLen(0x0b29, 6)
 #elif PACKETVER >= 20190424
 packetLen(0x0b29, 3)
 #endif
 
 // Packet: 0x0b2a
-#if PACKETVER >= 20190529
+#if PACKETVER >= 20190605
+// removed
+#elif PACKETVER >= 20190529
 packetLen(0x0b2a, 40)
 #elif PACKETVER >= 20190502
 packetLen(0x0b2a, 6)
@@ -4491,13 +4503,33 @@ packetLen(0x0b2e, 4)
 
 // Packet: 0x0b2f
 #if PACKETVER >= 20190529
-packetLen(0x0b2f, 73)
+packetLen(0x0b2f, 73)  // ZC_PROPERTY_HOMUN_3
 #endif
 
 // Packet: 0x0b30
 #if PACKETVER >= 20190529
 packetLen(0x0b30, -1)
 #endif
 
+// Packet: 0x0b31
+#if PACKETVER >= 20190626
+packetLen(0x0b31, 17)
+#endif
+
+// Packet: 0x0b32
+#if PACKETVER >= 20190626
+packetLen(0x0b32, -1)
+#endif
+
+// Packet: 0x0b33
+#if PACKETVER >= 20190626
+packetLen(0x0b33, 17)
+#endif
+
+// Packet: 0x0b34
+#if PACKETVER >= 20190626
+packetLen(0x0b34, 26)
+#endif
+
 
 #endif /* COMMON_PACKETS2019_LEN_ZERO_H */