[Quest API] Add Adventure methods to Perl and Lua.

* Add a separate FindLuaJit.cmake

* Remove LuaJit from our modified FindLua51.cmake

* Make use of the new FindLuaJit

The reason for splitting them up like this is so we can have a
preference for LuaJIT that's not determined by the search order in
FindLua51.cmake as well as giving the server operators the choice to
prefer normal Lua with the EQEMU_PREFER_LUA cmake option

.drone.yml

@@ -0,0 +1,16 @@
+---
+kind: pipeline
+type: docker
+name: EQEmulator Server Linux CI
+
+# Limits how many of these builds can run on the drone runner at a time, this isn't about cores
+concurrency:
+  limit: 1
+
+steps:
+  - name: server-build
+    # Source build script https://github.com/Akkadius/akk-stack/blob/master/containers/eqemu-server/Dockerfile#L20
+    image: akkadius/eqemu-server:latest
+    commands:
+      - sudo chown eqemu:eqemu /drone/src/ * -R
+      - git submodule init && git submodule update && mkdir -p build && cd build && cmake -DEQEMU_BUILD_LOGIN=ON -DEQEMU_BUILD_BOTS=ON -DEQEMU_BUILD_LUA=ON -G 'Unix Makefiles' .. && make -j$((`nproc`-4))

.gitignore

@@ -37,4 +37,20 @@ perl/
 submodules/*
 cmake-build-debug/
 
-.nfs.*
+.nfs.*
+
+# Visual Studio and CMAKE Generated Files
+/.vs/
+*.vcxproj
+*.vcxproj.filters
+*.vcxproj.user
+*.cmake
+*.ilk
+*.pdb
+*.sln
+*.dir/
+libs/
+bin/
+/Win32
+/x64
+/client_files/**/CMakeFiles/

.vscode/tasks.json

@@ -6,7 +6,7 @@
         {
             "label": "make",
             "type": "shell",
-            "command": "cd build && make",
+            "command": "cd bin && make",
             "group": {
                 "kind": "build",
                 "isDefault": true
@@ -18,7 +18,7 @@
         {
             "label": "make clean",
             "type": "shell",
-            "command": "cd build && make clean",
+            "command": "cd bin && make clean",
             "group": {
                 "kind": "build",
                 "isDefault": true
@@ -30,7 +30,7 @@
         {
             "label": "cmake",
             "type": "shell",
-            "command": "mkdir -p build && cd build && rm CMakeCache.txt && cmake -DEQEMU_BUILD_LOGIN=ON -DEQEMU_BUILD_LUA=ON -G 'Unix Makefiles' ..",
+            "command": "mkdir -p bin && cd bin && rm CMakeCache.txt && cmake -DEQEMU_BUILD_LOGIN=ON -DEQEMU_BUILD_LUA=ON -G 'Unix Makefiles' ..",
             "group": {
                 "kind": "build",
                 "isDefault": true
@@ -52,7 +52,7 @@
         {
             "label": "download maps",
             "type": "shell",
-            "command": "mkdir -p build/bin && cd build/bin && wget https://codeload.github.com/Akkadius/EQEmuMaps/zip/master -O maps.zip && unzip -o maps.zip && rm ./maps -rf && mv EQEmuMaps-master maps && rm maps.zip",
+            "command": "mkdir -p bin && cd bin && wget https://codeload.github.com/Akkadius/EQEmuMaps/zip/master -O maps.zip && unzip -o maps.zip && rm ./maps -rf && mv EQEmuMaps-master maps && rm maps.zip",
             "group": {
                 "kind": "build",
                 "isDefault": true
@@ -64,7 +64,7 @@
         {
             "label": "download quests",
             "type": "shell",
-            "command": "mkdir -p build/bin && cd build/bin && cd server && git -C ./quests pull 2> /dev/null || git clone https://github.com/ProjectEQ/projecteqquests.git quests",
+            "command": "mkdir -p bin && cd bin && cd server && git -C ./quests pull 2> /dev/null || git clone https://github.com/ProjectEQ/projecteqquests.git quests",
             "group": {
                 "kind": "build",
                 "isDefault": true
@@ -76,7 +76,7 @@
         {
             "label": "download eqemu_config",
             "type": "shell",
-            "command": "mkdir -p build/bin && cd build/bin && wget --no-check-certificate https://raw.githubusercontent.com/Akkadius/EQEmuInstall/master/eqemu_config_docker.json -O eqemu_config.json",
+            "command": "mkdir -p bin && cd bin && wget --no-check-certificate https://raw.githubusercontent.com/Akkadius/EQEmuInstall/master/eqemu_config_docker.json -O eqemu_config.json",
             "group": {
                 "kind": "build",
                 "isDefault": true
@@ -88,7 +88,7 @@
         {
             "label": "rebuild database (mariadb must be started)",
             "type": "shell",
-            "command": "mkdir -p build/bin && cd build/bin && docker run -i --rm --privileged -v ${HOST_PROJECT_PATH}/build/bin:/src --network=eqemu -it eqemu/server:0.0.3 bash -c './eqemu_server.pl source_peq_db && ./eqemu_server.pl check_db_updates && ./eqemu_server.pl linux_login_server_setup'",
+            "command": "mkdir -p bin && cd bin && docker run -i --rm --privileged -v ${HOST_PROJECT_PATH}/bin:/src --network=eqemu -it eqemu/server:0.0.3 bash -c './eqemu_server.pl source_peq_db && ./eqemu_server.pl check_db_updates && ./eqemu_server.pl linux_login_server_setup'",
             "group": {
                 "kind": "build",
                 "isDefault": true
@@ -100,7 +100,7 @@
         {
             "label": "zone 7000",
             "type": "shell",
-            "command": "docker stop zone7000 | true && docker network create eqemu | true && docker run -i --rm --name zone7000 --cap-add=SYS_PTRACE --security-opt seccomp=unconfined --privileged -v ${HOST_PROJECT_PATH}/build/bin:/src --ulimit core=10000000 --network=eqemu -p 7000:7000/udp -e LD_LIBRARY_PATH=/src/ eqemu/server:0.0.3 gdb -ex run --args ./zone dynamic_zone7000:7000",
+            "command": "docker stop zone7000 | true && docker network create eqemu | true && docker run -i --rm --name zone7000 --cap-add=SYS_PTRACE --security-opt seccomp=unconfined --privileged -v ${HOST_PROJECT_PATH}/bin:/src --ulimit core=10000000 --network=eqemu -p 7000:7000/udp -e LD_LIBRARY_PATH=/src/ eqemu/server:0.0.3 gdb -ex run --args ./zone dynamic_zone7000:7000",
             "group": {
                 "kind": "test",
                 "isDefault": true
@@ -109,7 +109,7 @@
         {
             "label": "zone 7001",
             "type": "shell",
-            "command": "docker stop zone7001 | true && docker network create eqemu | true && docker run -i --rm --name zone7001 --cap-add=SYS_PTRACE --security-opt seccomp=unconfined --privileged -v ${HOST_PROJECT_PATH}/build/bin:/src --ulimit core=10000000 --network=eqemu -p 7001:7001/udp -e LD_LIBRARY_PATH=/src/ eqemu/server:0.0.3 gdb -ex run --args ./zone dynamic_zone7001:7001",
+            "command": "docker stop zone7001 | true && docker network create eqemu | true && docker run -i --rm --name zone7001 --cap-add=SYS_PTRACE --security-opt seccomp=unconfined --privileged -v ${HOST_PROJECT_PATH}/bin:/src --ulimit core=10000000 --network=eqemu -p 7001:7001/udp -e LD_LIBRARY_PATH=/src/ eqemu/server:0.0.3 gdb -ex run --args ./zone dynamic_zone7001:7001",
             "group": {
                 "kind": "test",
                 "isDefault": true
@@ -118,7 +118,7 @@
         {
             "label": "loginserver",
             "type": "shell",
-            "command": "docker stop loginserver | true && docker network create eqemu | true && docker run -i --rm --cap-add=SYS_PTRACE --security-opt seccomp=unconfined --privileged -v ${HOST_PROJECT_PATH}/build/bin:/src --ulimit core=10000000 --network=eqemu --name loginserver -p 5999:5999/udp -p 5998:5998/udp -e LD_LIBRARY_PATH=/src/ eqemu/server:0.0.3 gdb -ex run --args ./loginserver",
+            "command": "docker stop loginserver | true && docker network create eqemu | true && docker run -i --rm --cap-add=SYS_PTRACE --security-opt seccomp=unconfined --privileged -v ${HOST_PROJECT_PATH}/bin:/src --ulimit core=10000000 --network=eqemu --name loginserver -p 5999:5999/udp -p 5998:5998/udp -e LD_LIBRARY_PATH=/src/ eqemu/server:0.0.3 gdb -ex run --args ./loginserver",
             "group": {
                 "kind": "test",
                 "isDefault": true
@@ -127,7 +127,7 @@
         {
             "label": "shared_memory, world",
             "type": "shell",
-            "command": "docker stop sharedmemory | true &&  docker stop world | true && docker network create eqemu | true && docker run --rm -v ${HOST_PROJECT_PATH}/build/bin:/src --network=eqemu --name sharedmemory eqemu/server:0.0.3 ./shared_memory && docker run --rm -v ${HOST_PROJECT_PATH}/build/bin:/src --ulimit core=10000000 -e LD_LIBRARY_PATH=/src/ --network=eqemu --name world -p 9000:9000 -p 9000:9000/udp -p 9001:9001 -p 9080:9080 eqemu/server:0.0.3 gdb -ex run ./world",
+            "command": "docker stop sharedmemory | true &&  docker stop world | true && docker network create eqemu | true && docker run --rm -v ${HOST_PROJECT_PATH}/bin:/src --network=eqemu --name sharedmemory eqemu/server:0.0.3 ./shared_memory && docker run --rm -v ${HOST_PROJECT_PATH}/bin:/src --ulimit core=10000000 -e LD_LIBRARY_PATH=/src/ --network=eqemu --name world -p 9000:9000 -p 9000:9000/udp -p 9001:9001 -p 9080:9080 eqemu/server:0.0.3 gdb -ex run ./world",
             "group": {
                 "kind": "test",
                 "isDefault": true
@@ -136,7 +136,7 @@
         {
             "label": "queryserv",
             "type": "shell",
-            "command": "docker stop queryserv | true && docker run --rm -v ${HOST_PROJECT_PATH}/build/bin:/src --ulimit core=10000000 -e LD_LIBRARY_PATH=/src/ --network=eqemu --name queryserv eqemu/server:0.0.3 gdb -ex run ./queryserv",
+            "command": "docker stop queryserv | true && docker run --rm -v ${HOST_PROJECT_PATH}/bin:/src --ulimit core=10000000 -e LD_LIBRARY_PATH=/src/ --network=eqemu --name queryserv eqemu/server:0.0.3 gdb -ex run ./queryserv",
             "group": {
                 "kind": "test",
                 "isDefault": true
@@ -145,7 +145,16 @@
         {
             "label": "mariadb",
             "type": "shell",
-            "command": "docker stop mariadb | true && cd build/bin && docker network create eqemu | true && docker run --rm -v ${HOST_PROJECT_PATH}/build/bin/db:/bitnami/mariadb -p 3306:3306 -e MARIADB_DATABASE=peq -e MARIADB_USER=eqemu -e MARIADB_PASSWORD=eqemupass -e ALLOW_EMPTY_PASSWORD=yes --name mariadb --network=eqemu bitnami/mariadb:latest",
+            "command": "docker stop mariadb | true && cd bin && docker network create eqemu | true && docker run --rm -v ${HOST_PROJECT_PATH}/bin/db:/bitnami/mariadb -p 3306:3306 -e MARIADB_DATABASE=peq -e MARIADB_USER=eqemu -e MARIADB_PASSWORD=eqemupass -e ALLOW_EMPTY_PASSWORD=yes --name mariadb --network=eqemu bitnami/mariadb:latest",
+            "group": {
+                "kind": "test",
+                "isDefault": true
+            }
+        },
+        {
+            "label": "ucs",
+            "type": "shell",
+            "command": "docker stop ucs | true && cd bin && docker network create eqemu | true && docker run --rm -v ${HOST_PROJECT_PATH}/bin:/src -p 7778:7778 --name ucs --network=eqemu eqemu/server:0.0.3 gdb -ex run ./ucs",
             "group": {
                 "kind": "test",
                 "isDefault": true

CMakeLists.txt

@@ -12,7 +12,7 @@ IF(NOT CMAKE_BUILD_TYPE)
 	SET(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING "Choose the type of build." FORCE)
 ENDIF(NOT CMAKE_BUILD_TYPE)
 
-SET(CMAKE_CXX_STANDARD 11)
+SET(CMAKE_CXX_STANDARD 14)
 SET(CMAKE_CXX_STANDARD_REQUIRED ON)
 SET(CMAKE_CXX_EXTENSIONS OFF)
 
@@ -55,6 +55,7 @@ FIND_PACKAGE(MariaDB)
 FIND_PACKAGE(ZLIB)
 FIND_PACKAGE(OpenSSL)
 FIND_PACKAGE(Lua51)
+FIND_PACKAGE(LuaJit)
 FIND_PACKAGE(PerlLibs)
 FIND_PACKAGE(Sodium)
 FIND_PACKAGE(mbedTLS)
@@ -87,6 +88,12 @@ ELSE()
 	MESSAGE(STATUS "* Lua:                                   MISSING *")
 ENDIF()
 
+IF(LuaJit_FOUND)
+	MESSAGE(STATUS "* LuaJIT:                                  FOUND *")
+ELSE()
+	MESSAGE(STATUS "* LuaJIT:                                MISSING *")
+ENDIF()
+
 IF(PerlLibs_FOUND)
 	MESSAGE(STATUS "* Perl:                                    FOUND *")
 ELSE()
@@ -122,6 +129,7 @@ OPTION(EQEMU_BUILD_LOGIN "Build the login server." ON)
 OPTION(EQEMU_BUILD_HC "Build the headless client." OFF)
 OPTION(EQEMU_BUILD_TESTS "Build utility tests." OFF)
 OPTION(EQEMU_BUILD_CLIENT_FILES "Build Client Import/Export Data Programs." ON)
+OPTION(EQEMU_PREFER_LUA "Build with normal Lua even if LuaJIT is found." OFF)
 
 IF(EQEMU_COMMANDS_LOGGING)
 	ADD_DEFINITIONS(-DCOMMANDS_LOGGING)
@@ -133,7 +141,7 @@ ENDIF(EQEMU_ENABLE_BOTS)
 
 #database
 IF(MySQL_FOUND AND MariaDB_FOUND)
-	SET(DATABASE_LIBRARY_SELECTION MySQL CACHE STRING "Database library to use:
+	SET(DATABASE_LIBRARY_SELECTION MariaDB CACHE STRING "Database library to use:
 			MySQL
 			MariaDB"
 	)
@@ -212,7 +220,12 @@ ELSE()
 	SET(SODIUM_LIBRARY_ENABLED OFF)
 ENDIF()
 
-IF(Lua51_FOUND)
+IF(LUAJIT_FOUND AND NOT (EQEMU_PREFER_LUA AND Lua51_FOUND))
+	SET(LUA_LIBRARY_TYPE "  LuaJIT")
+	SET(LUA_LIBRARY_ENABLED ON)
+	SET(LUA_LIBRARY_LIBS ${LUAJIT_LIBRARY} luabind)
+	SET(LUA_LIBRARY_INCLUDE ${LUAJIT_INCLUDE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/libs/luabind")
+ELSEIF(Lua51_FOUND )
 	SET(LUA_LIBRARY_TYPE " Lua 5.1")
 	SET(LUA_LIBRARY_ENABLED ON)
 	SET(LUA_LIBRARY_LIBS ${LUA_LIBRARY} luabind)
@@ -328,7 +341,10 @@ IF(UNIX)
 	IF(NOT DARWIN)
 		SET(SERVER_LIBS ${SERVER_LIBS} "rt")
 	ENDIF()
-	SET(SERVER_LIBS ${SERVER_LIBS} "uuid")
+	# Freebsd provides uuids in the C library
+	IF(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
+		SET(SERVER_LIBS ${SERVER_LIBS} "uuid")
+	ENDIF()
 ENDIF()
 
 IF(EQEMU_BUILD_LOGIN AND NOT TLS_LIBRARY_ENABLED)

README.md

@@ -1,7 +1,7 @@
 # EQEmulator Core Server
-|Travis CI (Linux)|Appveyor w/ Bots (Windows)   |Appveyor w/o Bots (Windows)   |
+|Travis CI (Linux)|Appveyor (Windows x86)   |Appveyor (Windows x64)   |
 |:---:|:---:|:---:| 
-|[![Linux CI](https://travis-ci.org/EQEmu/Server.svg?branch=master)](https://travis-ci.org/EQEmu/Server)   |[![Build status](https://ci.appveyor.com/api/projects/status/scr25kmntx36c1ub/branch/master?svg=true)](https://ci.appveyor.com/project/KimLS/server-87crp/branch/master)   |[![Build status](https://ci.appveyor.com/api/projects/status/mdwbr4o9l6mxqofj/branch/master?svg=true)](https://ci.appveyor.com/project/KimLS/server-w0pq2/branch/master)   |
+|[![Linux CI](https://travis-ci.org/EQEmu/Server.svg?branch=master)](https://travis-ci.org/EQEmu/Server)   |[![Build status](https://ci.appveyor.com/api/projects/status/v3utuu0dttm2cqd0?svg=true)](https://ci.appveyor.com/project/KimLS/server)   |[![Build status](https://ci.appveyor.com/api/projects/status/scr25kmntx36c1ub?svg=true)](https://ci.appveyor.com/project/KimLS/server-87crp)   |
 
 ***
 
@@ -17,9 +17,13 @@
 |:---:|:---:|:---:|
 |**Install Count**|![Windows Install Count](http://analytics.akkadius.com/?install_count&windows_count)|![Linux Install Count](http://analytics.akkadius.com/?install_count&linux_count)| 
 ### > Windows 
-* [Install](https://eqemu.gitbook.io/server/categories/how-to-guides/installation/server-installation-windows)
+
+* [Install Guide](https://eqemu.gitbook.io/server/categories/installation/server-installation-windows)
 
 ### > Debian/Ubuntu/CentOS/Fedora
+
+* [Install Guide](https://eqemu.gitbook.io/server/categories/installation/server-installation-linux)
+
 * You can use curl or wget to kick off the installer (whichever your OS has)
 > curl -O https://raw.githubusercontent.com/EQEmu/Server/master/utils/scripts/linux_installer/install.sh install.sh && chmod 755 install.sh && ./install.sh
 
@@ -52,7 +56,7 @@ forum, although pull requests will be much quicker and easier on all parties.
 
 ## Resources
 - [EQEmulator Forums](http://www.eqemulator.org/forums)
-- [EQEmulator Wiki](https://github.com/EQEmu/Server/wiki)
+- [EQEmulator Wiki](https://eqemu.gitbook.io/)
 
 ## Related Repositories
 * [ProjectEQ Quests](https://github.com/ProjectEQ/projecteqquests)
@@ -76,3 +80,4 @@ forum, although pull requests will be much quicker and easier on all parties.
 <a href="https://github.com/EQEmu/server/graphs/contributors">
   <img src="https://contributors-img.firebaseapp.com/image?repo=EQEmu/server" />
 </a>
+

cmake/FindLua51.cmake

@@ -38,7 +38,7 @@ locations other than lua/
 find_path(LUA_INCLUDE_DIR lua.h
   HINTS
     ENV LUA_DIR
-  PATH_SUFFIXES include/lua51 include/lua5.1 include/lua-5.1 include/lua include/luajit include
+  PATH_SUFFIXES include/lua51 include/lua5.1 include/lua-5.1 include/lua include
   PATHS
   ~/Library/Frameworks
   /Library/Frameworks
@@ -49,7 +49,7 @@ find_path(LUA_INCLUDE_DIR lua.h
 )
 
 find_library(LUA_LIBRARY
-  NAMES lua51 lua5.1 lua-5.1 lua luajit
+  NAMES lua51 lua5.1 lua-5.1 lua
   HINTS
     ENV LUA_DIR
   PATH_SUFFIXES lib

cmake/FindLuaJit.cmake

@@ -0,0 +1,91 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+# Modified from the FindLua51 that comes with CMake
+
+#[=======================================================================[.rst:
+FindLuaJit
+---------
+
+
+
+Locate LuaJit library This module defines
+
+::
+
+  LUAJIT_FOUND, if false, do not try to link to Lua
+  LUAJIT_LIBRARIES
+  LUAJIT_INCLUDE_DIR, where to find lua.h
+  LUAJIT_VERSION_STRING, the version of Lua found (since CMake 2.8.8)
+
+
+
+Note that the expected include convention is
+
+::
+
+  #include "lua.h"
+
+and not
+
+::
+
+  #include <lua/lua.h>
+
+This is because, the lua location is not standardized and may exist in
+locations other than lua/
+#]=======================================================================]
+
+find_path(LUAJIT_INCLUDE_DIR lua.h
+  HINTS
+    ENV LUA_DIR
+  PATH_SUFFIXES include/luajit include/luajit-2.0 include/luajit-2.1
+  PATHS
+  ~/Library/Frameworks
+  /Library/Frameworks
+  /sw # Fink
+  /opt/local # DarwinPorts
+  /opt/csw # Blastwave
+  /opt
+)
+
+find_library(LUAJIT_LIBRARY
+  NAMES luajit51 luajit5.1 luajit-5.1 luajit
+  HINTS
+    ENV LUA_DIR
+  PATH_SUFFIXES lib
+  PATHS
+  ~/Library/Frameworks
+  /Library/Frameworks
+  /sw
+  /opt/local
+  /opt/csw
+  /opt
+)
+
+if(LUAJIT_LIBRARY)
+  # include the math library for Unix
+  if(UNIX AND NOT APPLE AND NOT BEOS AND NOT HAIKU)
+    find_library(LUAJIT_MATH_LIBRARY m)
+    set( LUAJIT_LIBRARIES "${LUAJIT_LIBRARY};${LUAJIT_MATH_LIBRARY}" CACHE STRING "Lua Libraries")
+  # For Windows and Mac, don't need to explicitly include the math library
+  else()
+    set( LUAJIT_LIBRARIES "${LUAJIT_LIBRARY}" CACHE STRING "Lua Libraries")
+  endif()
+endif()
+
+if(LUAJIT_INCLUDE_DIR AND EXISTS "${LUAJIT_INCLUDE_DIR}/lua.h")
+  file(STRINGS "${LUAJIT_INCLUDE_DIR}/lua.h" lua_version_str REGEX "^#define[ \t]+LUA_RELEASE[ \t]+\"Lua .+\"")
+
+  string(REGEX REPLACE "^#define[ \t]+LUA_RELEASE[ \t]+\"Lua ([^\"]+)\".*" "\\1" LUAJIT_VERSION_STRING "${lua_version_str}")
+  unset(lua_version_str)
+endif()
+
+include(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake)
+# handle the QUIETLY and REQUIRED arguments and set LUAJIT_FOUND to TRUE if
+# all listed variables are TRUE
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(LuaJit
+                                  REQUIRED_VARS LUAJIT_LIBRARIES LUAJIT_INCLUDE_DIR
+                                  VERSION_VAR LUAJIT_VERSION_STRING)
+
+mark_as_advanced(LUAJIT_INCLUDE_DIR LUAJIT_LIBRARIES LUAJIT_LIBRARY LUAJIT_MATH_LIBRARY)
+

common/CMakeLists.txt

@@ -131,10 +131,8 @@ SET(repositories
 	repositories/base/base_adventure_template_entry_flavor_repository.h
 	repositories/base/base_alternate_currency_repository.h
 	repositories/base/base_auras_repository.h
-	repositories/base/base_banned_ips_repository.h
 	repositories/base/base_base_data_repository.h
 	repositories/base/base_blocked_spells_repository.h
-	repositories/base/base_books_repository.h
 	repositories/base/base_bugs_repository.h
 	repositories/base/base_bug_reports_repository.h
 	repositories/base/base_buyer_repository.h
@@ -150,6 +148,7 @@ SET(repositories
 	repositories/base/base_character_currency_repository.h
 	repositories/base/base_character_data_repository.h
 	repositories/base/base_character_disciplines_repository.h
+	repositories/base/base_character_expedition_lockouts_repository.h
 	repositories/base/base_character_inspect_messages_repository.h
 	repositories/base/base_character_item_recast_repository.h
 	repositories/base/base_character_languages_repository.h
@@ -163,18 +162,21 @@ SET(repositories
 	repositories/base/base_character_skills_repository.h
 	repositories/base/base_character_spells_repository.h
 	repositories/base/base_character_tasks_repository.h
-	repositories/base/base_character_tribute_repository.h
 	repositories/base/base_char_create_combinations_repository.h
 	repositories/base/base_char_create_point_allocations_repository.h
 	repositories/base/base_char_recipe_list_repository.h
-	repositories/base/base_chatchannels_repository.h
-	repositories/base/base_command_settings_repository.h
 	repositories/base/base_completed_tasks_repository.h
+	repositories/base/base_content_flags_repository.h
+	repositories/base/base_damageshieldtypes_repository.h
 	repositories/base/base_data_buckets_repository.h
 	repositories/base/base_db_str_repository.h
 	repositories/base/base_discovered_items_repository.h
 	repositories/base/base_doors_repository.h
+	repositories/base/base_dynamic_zones_repository.h
 	repositories/base/base_eventlog_repository.h
+	repositories/base/base_expeditions_repository.h
+	repositories/base/base_expedition_lockouts_repository.h
+	repositories/base/base_expedition_members_repository.h
 	repositories/base/base_faction_base_data_repository.h
 	repositories/base/base_faction_list_repository.h
 	repositories/base/base_faction_list_mod_repository.h
@@ -196,7 +198,6 @@ SET(repositories
 	repositories/base/base_guild_ranks_repository.h
 	repositories/base/base_guild_relations_repository.h
 	repositories/base/base_hackers_repository.h
-	repositories/base/base_horses_repository.h
 	repositories/base/base_instance_list_repository.h
 	repositories/base/base_instance_list_player_repository.h
 	repositories/base/base_inventory_repository.h
@@ -204,8 +205,6 @@ SET(repositories
 	repositories/base/base_ip_exemptions_repository.h
 	repositories/base/base_items_repository.h
 	repositories/base/base_item_tick_repository.h
-	repositories/base/base_launcher_repository.h
-	repositories/base/base_launcher_zones_repository.h
 	repositories/base/base_ldon_trap_entries_repository.h
 	repositories/base/base_ldon_trap_templates_repository.h
 	repositories/base/base_level_exp_mods_repository.h
@@ -274,7 +273,6 @@ SET(repositories
 	repositories/base/base_traps_repository.h
 	repositories/base/base_tributes_repository.h
 	repositories/base/base_tribute_levels_repository.h
-	repositories/base/base_variables_repository.h
 	repositories/base/base_veteran_reward_templates_repository.h
 	repositories/base/base_zone_repository.h
 	repositories/base/base_zone_points_repository.h
@@ -296,10 +294,8 @@ SET(repositories
 	repositories/adventure_template_entry_flavor_repository.h
 	repositories/alternate_currency_repository.h
 	repositories/auras_repository.h
-	repositories/banned_ips_repository.h
 	repositories/base_data_repository.h
 	repositories/blocked_spells_repository.h
-	repositories/books_repository.h
 	repositories/bugs_repository.h
 	repositories/bug_reports_repository.h
 	repositories/buyer_repository.h
@@ -315,6 +311,7 @@ SET(repositories
 	repositories/character_currency_repository.h
 	repositories/character_data_repository.h
 	repositories/character_disciplines_repository.h
+	repositories/character_expedition_lockouts_repository.h
 	repositories/character_inspect_messages_repository.h
 	repositories/character_item_recast_repository.h
 	repositories/character_languages_repository.h
@@ -328,18 +325,21 @@ SET(repositories
 	repositories/character_skills_repository.h
 	repositories/character_spells_repository.h
 	repositories/character_tasks_repository.h
-	repositories/character_tribute_repository.h
 	repositories/char_create_combinations_repository.h
 	repositories/char_create_point_allocations_repository.h
 	repositories/char_recipe_list_repository.h
-	repositories/chatchannels_repository.h
-	repositories/command_settings_repository.h
 	repositories/completed_tasks_repository.h
+	repositories/content_flags_repository.h
+	repositories/damageshieldtypes_repository.h
 	repositories/data_buckets_repository.h
 	repositories/db_str_repository.h
 	repositories/discovered_items_repository.h
 	repositories/doors_repository.h
+	repositories/dynamic_zones_repository.h
 	repositories/eventlog_repository.h
+	repositories/expeditions_repository.h
+	repositories/expedition_lockouts_repository.h
+	repositories/expedition_members_repository.h
 	repositories/faction_base_data_repository.h
 	repositories/faction_list_repository.h
 	repositories/faction_list_mod_repository.h
@@ -361,7 +361,6 @@ SET(repositories
 	repositories/guild_ranks_repository.h
 	repositories/guild_relations_repository.h
 	repositories/hackers_repository.h
-	repositories/horses_repository.h
 	repositories/instance_list_repository.h
 	repositories/instance_list_player_repository.h
 	repositories/inventory_repository.h
@@ -369,8 +368,6 @@ SET(repositories
 	repositories/ip_exemptions_repository.h
 	repositories/items_repository.h
 	repositories/item_tick_repository.h
-	repositories/launcher_repository.h
-	repositories/launcher_zones_repository.h
 	repositories/ldon_trap_entries_repository.h
 	repositories/ldon_trap_templates_repository.h
 	repositories/level_exp_mods_repository.h
@@ -439,7 +436,6 @@ SET(repositories
 	repositories/traps_repository.h
 	repositories/tributes_repository.h
 	repositories/tribute_levels_repository.h
-	repositories/variables_repository.h
 	repositories/veteran_reward_templates_repository.h
 	repositories/zone_repository.h
 	repositories/zone_points_repository.h

common/any.h

@@ -24,7 +24,7 @@
  *  DEALINGS IN THE SOFTWARE.
  */
 
-// EQEmu::Any is a modified version of Boost::Any and as such retains the Boost licensing.
+// EQ::Any is a modified version of Boost::Any and as such retains the Boost licensing.
 
 #ifndef EQEMU_COMMON_ANY_H
 #define EQEMU_COMMON_ANY_H
@@ -32,7 +32,7 @@
 #include <algorithm>
 #include <typeinfo>
 
-namespace EQEmu
+namespace EQ
 {
 	class Any
 	{

common/classes.cpp

@@ -378,6 +378,8 @@ const char *GetClassIDName(uint8 class_id, uint8 level)
 			return "Berserker Guildmaster";
 		case MERCHANT:
 			return "Merchant";
+		case DISCORD_MERCHANT:
+			return "Discord Merchant";
 		case ADVENTURERECRUITER:
 			return "Adventure Recruiter";
 		case ADVENTUREMERCHANT:
@@ -388,6 +390,18 @@ const char *GetClassIDName(uint8 class_id, uint8 level)
 			return "Tribute Master";
 		case GUILD_TRIBUTE_MASTER:
 			return "Guild Tribute Master";
+		case GUILD_BANKER:
+			return "Guild Banker";
+		case NORRATHS_KEEPERS_MERCHANT:
+			return "Radiant Crystal Merchant";
+		case DARK_REIGN_MERCHANT:
+			return "Ebon Crystal Merchant";
+		case FELLOWSHIP_MASTER:
+			return "Fellowship Master";
+		case ALT_CURRENCY_MERCHANT:
+			return "Alternate Currency Merchant";
+		case MERCERNARY_MASTER:
+			return "Mercenary Liaison";
 		default:
 			return "Unknown";
 	}

common/classes.h

@@ -61,6 +61,7 @@
 #define CORPSE_CLASS 62	// only seen on Danvi's Corpse in Akheva so far..
 #define TRIBUTE_MASTER 63
 #define GUILD_TRIBUTE_MASTER 64	// not sure
+#define GUILD_BANKER 66
 #define NORRATHS_KEEPERS_MERCHANT 67
 #define DARK_REIGN_MERCHANT 68
 #define FELLOWSHIP_MASTER 69

common/cli/eqemu_command_handler.cpp

@@ -77,7 +77,7 @@ namespace EQEmuCommand {
 			index++;
 		}
 
-		if (!arguments_filled || argc == 2) {
+		if (!arguments_filled || argc == 2 || cmd[{"-h", "--help"}]) {
 			std::string arguments_string;
 			for (auto &arg : arguments) {
 				arguments_string += " " + arg;
@@ -101,7 +101,7 @@ namespace EQEmuCommand {
 
 			std::cout << command_string.str() << std::endl;
 
-			exit(1);
+			exit(0);
 		}
 	}
 
@@ -188,11 +188,11 @@ namespace EQEmuCommand {
 
 			std::cout << std::endl;
 
-			std::exit(1);
+			std::exit(0);
 		}
 
 		if (ran_command) {
-			std::exit(1);
+			std::exit(0);
 		}
 	}
 

common/compression.cpp

@@ -3,7 +3,7 @@
 #include <string.h>
 #include <zlib.h>
 
-namespace EQEmu
+namespace EQ
 {
 	uint32 EstimateDeflateBuffer(uint32 len) {
 		z_stream zstream;

common/compression.h

@@ -1,6 +1,6 @@
 #pragma once
 
-namespace EQEmu
+namespace EQ
 {
 	uint32 EstimateDeflateBuffer(uint32 len);
 	uint32 DeflateData(const char *buffer, uint32 len, char *out_buffer, uint32 out_len_max);

common/content/world_content_service.cpp

@@ -19,10 +19,14 @@
  */
 
 #include "world_content_service.h"
+#include "../database.h"
+#include "../rulesys.h"
+#include "../eqemu_logsys.h"
+
 
 WorldContentService::WorldContentService()
 {
-	SetCurrentExpansion(0);
+	SetCurrentExpansion(Expansion::EXPANSION_ALL);
 }
 
 int WorldContentService::GetCurrentExpansion() const
@@ -30,17 +34,68 @@ int WorldContentService::GetCurrentExpansion() const
 	return current_expansion;
 }
 
+void WorldContentService::SetExpansionContext()
+{
+	int expansion = RuleI(Expansion, CurrentExpansion);
+	if (expansion >= Expansion::Classic && expansion <= Expansion::MaxId) {
+		content_service.SetCurrentExpansion(expansion);
+	}
+
+	LogInfo(
+		"Current expansion is [{}] ({})",
+		GetCurrentExpansion(),
+		GetCurrentExpansionName()
+	);
+}
+
+std::string WorldContentService::GetCurrentExpansionName()
+{
+	if (content_service.GetCurrentExpansion() == Expansion::EXPANSION_ALL) {
+		return "All Expansions";
+	}
+
+	if (current_expansion >= Expansion::Classic && current_expansion <= Expansion::MaxId) {
+		return Expansion::ExpansionName[content_service.GetCurrentExpansion()];
+	}
+
+	return "Unknown Expansion";
+}
+
+/**
+ * @param current_expansion
+ */
 void WorldContentService::SetCurrentExpansion(int current_expansion)
 {
 	WorldContentService::current_expansion = current_expansion;
 }
 
+/**
+ * @return
+ */
 const std::vector<std::string> &WorldContentService::GetContentFlags() const
 {
 	return content_flags;
 }
 
+/**
+ * @param content_flags
+ */
 void WorldContentService::SetContentFlags(std::vector<std::string> content_flags)
 {
 	WorldContentService::content_flags = content_flags;
 }
+
+/**
+ * @param content_flag
+ * @return
+ */
+bool WorldContentService::IsContentFlagEnabled(const std::string& content_flag)
+{
+	for (auto &flag : GetContentFlags()) {
+		if (flag == content_flag) {
+			return true;
+		}
+	}
+
+	return false;
+}

common/content/world_content_service.h

@@ -25,6 +25,9 @@
 #include <vector>
 
 namespace Expansion {
+	static const int EXPANSION_ALL        = -1;
+	static const int EXPANSION_FILTER_MAX = 99;
+
 	enum ExpansionNumber {
 		Classic = 0,
 		TheRuinsOfKunark,
@@ -95,36 +98,37 @@ public:
 
 	WorldContentService();
 
+	std::string GetCurrentExpansionName();
 	int GetCurrentExpansion() const;
 	void SetCurrentExpansion(int current_expansion);
 
-	bool IsClassicEnabled() { return GetCurrentExpansion() >= Expansion::ExpansionNumber::Classic; }
-	bool IsTheRuinsOfKunarkEnabled() { return GetCurrentExpansion() >= Expansion::ExpansionNumber::TheRuinsOfKunark; }
-	bool IsTheScarsOfVeliousEnabled() { return GetCurrentExpansion() >= Expansion::ExpansionNumber::TheScarsOfVelious; }
-	bool IsTheShadowsOfLuclinEnabled() { return GetCurrentExpansion() >= Expansion::ExpansionNumber::TheShadowsOfLuclin; }
-	bool IsThePlanesOfPowerEnabled() { return GetCurrentExpansion() >= Expansion::ExpansionNumber::ThePlanesOfPower; }
-	bool IsTheLegacyOfYkeshaEnabled() { return GetCurrentExpansion() >= Expansion::ExpansionNumber::TheLegacyOfYkesha; }
-	bool IsLostDungeonsOfNorrathEnabled() { return GetCurrentExpansion() >= Expansion::ExpansionNumber::LostDungeonsOfNorrath; }
-	bool IsGatesOfDiscordEnabled() { return GetCurrentExpansion() >= Expansion::ExpansionNumber::GatesOfDiscord; }
-	bool IsOmensOfWarEnabled() { return GetCurrentExpansion() >= Expansion::ExpansionNumber::OmensOfWar; }
-	bool IsDragonsOfNorrathEnabled() { return GetCurrentExpansion() >= Expansion::ExpansionNumber::DragonsOfNorrath; }
-	bool IsDepthsOfDarkhollowEnabled() { return GetCurrentExpansion() >= Expansion::ExpansionNumber::DepthsOfDarkhollow; }
-	bool IsProphecyOfRoEnabled() { return GetCurrentExpansion() >= Expansion::ExpansionNumber::ProphecyOfRo; }
-	bool IsTheSerpentsSpineEnabled() { return GetCurrentExpansion() >= Expansion::ExpansionNumber::TheSerpentsSpine; }
-	bool IsTheBuriedSeaEnabled() { return GetCurrentExpansion() >= Expansion::ExpansionNumber::TheBuriedSea; }
-	bool IsSecretsOfFaydwerEnabled() { return GetCurrentExpansion() >= Expansion::ExpansionNumber::SecretsOfFaydwer; }
-	bool IsSeedsOfDestructionEnabled() { return GetCurrentExpansion() >= Expansion::ExpansionNumber::SeedsOfDestruction; }
-	bool IsUnderfootEnabled() { return GetCurrentExpansion() >= Expansion::ExpansionNumber::Underfoot; }
-	bool IsHouseOfThuleEnabled() { return GetCurrentExpansion() >= Expansion::ExpansionNumber::HouseOfThule; }
-	bool IsVeilOfAlarisEnabled() { return GetCurrentExpansion() >= Expansion::ExpansionNumber::VeilOfAlaris; }
-	bool IsRainOfFearEnabled() { return GetCurrentExpansion() >= Expansion::ExpansionNumber::RainOfFear; }
-	bool IsCallOfTheForsakenEnabled() { return GetCurrentExpansion() >= Expansion::ExpansionNumber::CallOfTheForsaken; }
-	bool IsTheDarkendSeaEnabled() { return GetCurrentExpansion() >= Expansion::ExpansionNumber::TheDarkendSea; }
-	bool IsTheBrokenMirrorEnabled() { return GetCurrentExpansion() >= Expansion::ExpansionNumber::TheBrokenMirror; }
-	bool IsEmpiresOfKunarkEnabled() { return GetCurrentExpansion() >= Expansion::ExpansionNumber::EmpiresOfKunark; }
-	bool IsRingOfScaleEnabled() { return GetCurrentExpansion() >= Expansion::ExpansionNumber::RingOfScale; }
-	bool IsTheBurningLandsEnabled() { return GetCurrentExpansion() >= Expansion::ExpansionNumber::TheBurningLands; }
-	bool IsTormentOfVeliousEnabled() { return GetCurrentExpansion() >= Expansion::ExpansionNumber::TormentOfVelious; }
+	bool IsClassicEnabled() { return GetCurrentExpansion() >= Expansion::ExpansionNumber::Classic || GetCurrentExpansion() == Expansion::EXPANSION_ALL; }
+	bool IsTheRuinsOfKunarkEnabled() { return GetCurrentExpansion() >= Expansion::ExpansionNumber::TheRuinsOfKunark || GetCurrentExpansion() == Expansion::EXPANSION_ALL; }
+	bool IsTheScarsOfVeliousEnabled() { return GetCurrentExpansion() >= Expansion::ExpansionNumber::TheScarsOfVelious || GetCurrentExpansion() == Expansion::EXPANSION_ALL; }
+	bool IsTheShadowsOfLuclinEnabled() { return GetCurrentExpansion() >= Expansion::ExpansionNumber::TheShadowsOfLuclin || GetCurrentExpansion() == Expansion::EXPANSION_ALL; }
+	bool IsThePlanesOfPowerEnabled() { return GetCurrentExpansion() >= Expansion::ExpansionNumber::ThePlanesOfPower || GetCurrentExpansion() == Expansion::EXPANSION_ALL; }
+	bool IsTheLegacyOfYkeshaEnabled() { return GetCurrentExpansion() >= Expansion::ExpansionNumber::TheLegacyOfYkesha || GetCurrentExpansion() == Expansion::EXPANSION_ALL; }
+	bool IsLostDungeonsOfNorrathEnabled() { return GetCurrentExpansion() >= Expansion::ExpansionNumber::LostDungeonsOfNorrath || GetCurrentExpansion() == Expansion::EXPANSION_ALL; }
+	bool IsGatesOfDiscordEnabled() { return GetCurrentExpansion() >= Expansion::ExpansionNumber::GatesOfDiscord || GetCurrentExpansion() == Expansion::EXPANSION_ALL; }
+	bool IsOmensOfWarEnabled() { return GetCurrentExpansion() >= Expansion::ExpansionNumber::OmensOfWar || GetCurrentExpansion() == Expansion::EXPANSION_ALL; }
+	bool IsDragonsOfNorrathEnabled() { return GetCurrentExpansion() >= Expansion::ExpansionNumber::DragonsOfNorrath || GetCurrentExpansion() == Expansion::EXPANSION_ALL; }
+	bool IsDepthsOfDarkhollowEnabled() { return GetCurrentExpansion() >= Expansion::ExpansionNumber::DepthsOfDarkhollow || GetCurrentExpansion() == Expansion::EXPANSION_ALL; }
+	bool IsProphecyOfRoEnabled() { return GetCurrentExpansion() >= Expansion::ExpansionNumber::ProphecyOfRo || GetCurrentExpansion() == Expansion::EXPANSION_ALL; }
+	bool IsTheSerpentsSpineEnabled() { return GetCurrentExpansion() >= Expansion::ExpansionNumber::TheSerpentsSpine || GetCurrentExpansion() == Expansion::EXPANSION_ALL; }
+	bool IsTheBuriedSeaEnabled() { return GetCurrentExpansion() >= Expansion::ExpansionNumber::TheBuriedSea || GetCurrentExpansion() == Expansion::EXPANSION_ALL; }
+	bool IsSecretsOfFaydwerEnabled() { return GetCurrentExpansion() >= Expansion::ExpansionNumber::SecretsOfFaydwer || GetCurrentExpansion() == Expansion::EXPANSION_ALL; }
+	bool IsSeedsOfDestructionEnabled() { return GetCurrentExpansion() >= Expansion::ExpansionNumber::SeedsOfDestruction || GetCurrentExpansion() == Expansion::EXPANSION_ALL; }
+	bool IsUnderfootEnabled() { return GetCurrentExpansion() >= Expansion::ExpansionNumber::Underfoot || GetCurrentExpansion() == Expansion::EXPANSION_ALL; }
+	bool IsHouseOfThuleEnabled() { return GetCurrentExpansion() >= Expansion::ExpansionNumber::HouseOfThule || GetCurrentExpansion() == Expansion::EXPANSION_ALL; }
+	bool IsVeilOfAlarisEnabled() { return GetCurrentExpansion() >= Expansion::ExpansionNumber::VeilOfAlaris || GetCurrentExpansion() == Expansion::EXPANSION_ALL; }
+	bool IsRainOfFearEnabled() { return GetCurrentExpansion() >= Expansion::ExpansionNumber::RainOfFear || GetCurrentExpansion() == Expansion::EXPANSION_ALL; }
+	bool IsCallOfTheForsakenEnabled() { return GetCurrentExpansion() >= Expansion::ExpansionNumber::CallOfTheForsaken || GetCurrentExpansion() == Expansion::EXPANSION_ALL; }
+	bool IsTheDarkendSeaEnabled() { return GetCurrentExpansion() >= Expansion::ExpansionNumber::TheDarkendSea || GetCurrentExpansion() == Expansion::EXPANSION_ALL; }
+	bool IsTheBrokenMirrorEnabled() { return GetCurrentExpansion() >= Expansion::ExpansionNumber::TheBrokenMirror || GetCurrentExpansion() == Expansion::EXPANSION_ALL; }
+	bool IsEmpiresOfKunarkEnabled() { return GetCurrentExpansion() >= Expansion::ExpansionNumber::EmpiresOfKunark || GetCurrentExpansion() == Expansion::EXPANSION_ALL; }
+	bool IsRingOfScaleEnabled() { return GetCurrentExpansion() >= Expansion::ExpansionNumber::RingOfScale || GetCurrentExpansion() == Expansion::EXPANSION_ALL; }
+	bool IsTheBurningLandsEnabled() { return GetCurrentExpansion() >= Expansion::ExpansionNumber::TheBurningLands || GetCurrentExpansion() == Expansion::EXPANSION_ALL; }
+	bool IsTormentOfVeliousEnabled() { return GetCurrentExpansion() >= Expansion::ExpansionNumber::TormentOfVelious || GetCurrentExpansion() == Expansion::EXPANSION_ALL; }
 
 	bool IsCurrentExpansionClassic() { return current_expansion == Expansion::ExpansionNumber::Classic; }
 	bool IsCurrentExpansionTheRuinsOfKunark() { return current_expansion == Expansion::ExpansionNumber::TheRuinsOfKunark; }
@@ -155,11 +159,13 @@ public:
 	bool IsCurrentExpansionTormentOfVelious() { return current_expansion == Expansion::ExpansionNumber::TormentOfVelious; }
 
 private:
-	int current_expansion;
+	int current_expansion{};
 	std::vector<std::string> content_flags;
 public:
 	const std::vector<std::string> &GetContentFlags() const;
+	bool IsContentFlagEnabled(const std::string& content_flag);
 	void SetContentFlags(std::vector<std::string> content_flags);
+	void SetExpansionContext();
 };
 
 extern WorldContentService content_service;

common/crash.cpp

@@ -118,6 +118,11 @@ void set_exception_handler() {
 #include <unistd.h>
 #include <sys/fcntl.h>
 
+#ifdef __FreeBSD__
+#include <signal.h>
+#include <sys/stat.h>
+#endif
+
 void print_trace()
 {
 	auto uid = geteuid();

common/data_verification.h

@@ -23,7 +23,7 @@
 #include <algorithm>
 #include <cmath>
 
-namespace EQEmu {
+namespace EQ {
 	template<typename T>
 	T Clamp(const T &value, const T &lower, const T &upper)
 	{

common/database.cpp

@@ -61,15 +61,15 @@ Database::Database(const char* host, const char* user, const char* passwd, const
 	Connect(host, user, passwd, database, port);
 }
 
-bool Database::Connect(const char* host, const char* user, const char* passwd, const char* database, uint32 port) {
+bool Database::Connect(const char* host, const char* user, const char* passwd, const char* database, uint32 port, std::string connection_label) {
 	uint32 errnum= 0;
 	char errbuf[MYSQL_ERRMSG_SIZE];
 	if (!Open(host, user, passwd, database, port, &errnum, errbuf)) {
-		LogError("Failed to connect to database: Error: {}", errbuf);
+		LogError("[MySQL] Connection [{}] Failed to connect to database: Error [{}]", connection_label, errbuf);
 		return false;
 	}
 	else {
-		LogInfo("Using database [{}] at [{}]:[{}]", database, host,port);
+		LogInfo("[MySQL] Connection [{}] database [{}] at [{}]:[{}]", connection_label, database, host,port);
 		return true;
 	}
 }
@@ -339,7 +339,7 @@ bool Database::ReserveName(uint32 account_id, char* name) {
 	query = StringFormat("INSERT INTO `character_data` SET `account_id` = %i, `name` = '%s'", account_id, name);
 	results = QueryDatabase(query);
 	if (!results.Success() || results.ErrorMessage() != ""){ return false; }
-	
+
 	// Put character into the default guild if rule is being used.
 	int guild_id = RuleI(Character, DefaultGuild);
 
@@ -353,7 +353,7 @@ bool Database::ReserveName(uint32 account_id, char* name) {
 			}
 		}
 	}
-	
+
 	return true;
 }
 
@@ -512,96 +512,96 @@ bool Database::SaveCharacterCreate(uint32 character_id, uint32 account_id, Playe
 		"guild_auto_consent,"
 		"RestTimer) "
 		"VALUES ("
-		"%u,"  // id					
-		"%u,"  // account_id			
-		"'%s',"  // `name`				
-		"'%s',"  // last_name			
-		"%u,"  // gender				
-		"%u,"  // race					
-		"%u,"  // class					
-		"%u,"  // `level`				
-		"%u,"  // deity					
-		"%u,"  // birthday				
-		"%u,"  // last_login			
-		"%u,"  // time_played			
-		"%u,"  // pvp_status			
-		"%u,"  // level2				
-		"%u,"  // anon					
-		"%u,"  // gm					
-		"%u,"  // intoxication			
-		"%u,"  // hair_color			
-		"%u,"  // beard_color			
-		"%u,"  // eye_color_1			
-		"%u,"  // eye_color_2			
-		"%u,"  // hair_style			
-		"%u,"  // beard					
-		"%u,"  // ability_time_seconds	
-		"%u,"  // ability_number		
-		"%u,"  // ability_time_minutes	
-		"%u,"  // ability_time_hours	
-		"'%s',"  // title				
-		"'%s',"  // suffix				
-		"%u,"  // exp					
-		"%u,"  // points				
-		"%u,"  // mana					
-		"%u,"  // cur_hp				
-		"%u,"  // str					
-		"%u,"  // sta					
-		"%u,"  // cha					
-		"%u,"  // dex					
-		"%u,"  // `int`					
-		"%u,"  // agi					
-		"%u,"  // wis					
-		"%u,"  // face					
-		"%f,"  // y						
-		"%f,"  // x						
-		"%f,"  // z						
-		"%f,"  // heading				
-		"%u,"  // pvp2					
-		"%u,"  // pvp_type				
-		"%u,"  // autosplit_enabled		
-		"%u,"  // zone_change_count		
-		"%u,"  // drakkin_heritage		
-		"%u,"  // drakkin_tattoo		
-		"%u,"  // drakkin_details		
-		"%i,"  // toxicity				
-		"%i,"  // hunger_level			
-		"%i,"  // thirst_level			
-		"%u,"  // ability_up			
-		"%u,"  // zone_id				
-		"%u,"  // zone_instance			
-		"%u,"  // leadership_exp_on		
-		"%u,"  // ldon_points_guk		
-		"%u,"  // ldon_points_mir		
-		"%u,"  // ldon_points_mmc		
-		"%u,"  // ldon_points_ruj		
-		"%u,"  // ldon_points_tak		
-		"%u,"  // ldon_points_available	
+		"%u,"  // id
+		"%u,"  // account_id
+		"'%s',"  // `name`
+		"'%s',"  // last_name
+		"%u,"  // gender
+		"%u,"  // race
+		"%u,"  // class
+		"%u,"  // `level`
+		"%u,"  // deity
+		"%u,"  // birthday
+		"%u,"  // last_login
+		"%u,"  // time_played
+		"%u,"  // pvp_status
+		"%u,"  // level2
+		"%u,"  // anon
+		"%u,"  // gm
+		"%u,"  // intoxication
+		"%u,"  // hair_color
+		"%u,"  // beard_color
+		"%u,"  // eye_color_1
+		"%u,"  // eye_color_2
+		"%u,"  // hair_style
+		"%u,"  // beard
+		"%u,"  // ability_time_seconds
+		"%u,"  // ability_number
+		"%u,"  // ability_time_minutes
+		"%u,"  // ability_time_hours
+		"'%s',"  // title
+		"'%s',"  // suffix
+		"%u,"  // exp
+		"%u,"  // points
+		"%u,"  // mana
+		"%u,"  // cur_hp
+		"%u,"  // str
+		"%u,"  // sta
+		"%u,"  // cha
+		"%u,"  // dex
+		"%u,"  // `int`
+		"%u,"  // agi
+		"%u,"  // wis
+		"%u,"  // face
+		"%f,"  // y
+		"%f,"  // x
+		"%f,"  // z
+		"%f,"  // heading
+		"%u,"  // pvp2
+		"%u,"  // pvp_type
+		"%u,"  // autosplit_enabled
+		"%u,"  // zone_change_count
+		"%u,"  // drakkin_heritage
+		"%u,"  // drakkin_tattoo
+		"%u,"  // drakkin_details
+		"%i,"  // toxicity
+		"%i,"  // hunger_level
+		"%i,"  // thirst_level
+		"%u,"  // ability_up
+		"%u,"  // zone_id
+		"%u,"  // zone_instance
+		"%u,"  // leadership_exp_on
+		"%u,"  // ldon_points_guk
+		"%u,"  // ldon_points_mir
+		"%u,"  // ldon_points_mmc
+		"%u,"  // ldon_points_ruj
+		"%u,"  // ldon_points_tak
+		"%u,"  // ldon_points_available
 		"%u,"  // tribute_time_remaining
-		"%u,"  // show_helm				
-		"%u,"  // career_tribute_points	
-		"%u,"  // tribute_points		
-		"%u,"  // tribute_active		
-		"%u,"  // endurance				
-		"%u,"  // group_leadership_exp	
-		"%u,"  // raid_leadership_exp	
+		"%u,"  // show_helm
+		"%u,"  // career_tribute_points
+		"%u,"  // tribute_points
+		"%u,"  // tribute_active
+		"%u,"  // endurance
+		"%u,"  // group_leadership_exp
+		"%u,"  // raid_leadership_exp
 		"%u,"  // group_leadership_point
 		"%u,"  // raid_leadership_points
-		"%u,"  // air_remaining			
-		"%u,"  // pvp_kills				
-		"%u,"  // pvp_deaths			
-		"%u,"  // pvp_current_points	
-		"%u,"  // pvp_career_points		
-		"%u,"  // pvp_best_kill_streak	
+		"%u,"  // air_remaining
+		"%u,"  // pvp_kills
+		"%u,"  // pvp_deaths
+		"%u,"  // pvp_current_points
+		"%u,"  // pvp_career_points
+		"%u,"  // pvp_best_kill_streak
 		"%u,"  // pvp_worst_death_streak
 		"%u,"  // pvp_current_kill_strea
-		"%u,"  // aa_points_spent		
-		"%u,"  // aa_exp				
-		"%u,"  // aa_points				
-		"%u,"  // group_auto_consent	
-		"%u,"  // raid_auto_consent		
-		"%u,"  // guild_auto_consent	
-		"%u"  // RestTimer				
+		"%u,"  // aa_points_spent
+		"%u,"  // aa_exp
+		"%u,"  // aa_points
+		"%u,"  // group_auto_consent
+		"%u,"  // raid_auto_consent
+		"%u,"  // guild_auto_consent
+		"%u"  // RestTimer
 		")",
 		character_id,					  // " id,                        "
 		account_id,						  // " account_id,                "
@@ -870,6 +870,38 @@ void Database::GetCharName(uint32 char_id, char* name) {
 	}
 }
 
+const char* Database::GetCharNameByID(uint32 char_id) {
+	std::string query = fmt::format("SELECT `name` FROM `character_data` WHERE id = {}", char_id);
+	auto results = QueryDatabase(query);
+
+	if (!results.Success()) {
+		return "";
+	}
+
+	if (results.RowCount() == 0) {
+		return "";
+	}
+
+	auto row = results.begin();
+	return row[0];
+}
+
+const char* Database::GetNPCNameByID(uint32 npc_id) {
+	std::string query = fmt::format("SELECT `name` FROM `npc_types` WHERE id = {}", npc_id);
+	auto results = QueryDatabase(query);
+
+	if (!results.Success()) {
+		return "";
+	}
+
+	if (results.RowCount() == 0) {
+		return "";
+	}
+
+	auto row = results.begin();
+	return row[0];
+}
+
 bool Database::LoadVariables() {
 	auto results = QueryDatabase(StringFormat("SELECT varname, value, unix_timestamp() FROM variables where unix_timestamp(ts) >= %d", varcache.last_update));
 
@@ -1050,50 +1082,6 @@ bool Database::GetZoneGraveyard(const uint32 graveyard_id, uint32* graveyard_zon
 	return true;
 }
 
-bool Database::LoadZoneNames() {
-	std::string query("SELECT zoneidnumber, short_name FROM zone");
-
-	auto results = QueryDatabase(query);
-
-	if (!results.Success())
-	{
-		return false;
-	}
-
-	for (auto row= results.begin();row != results.end();++row)
-	{
-		uint32 zoneid = atoi(row[0]);
-		std::string zonename = row[1];
-		zonename_array.insert(std::pair<uint32,std::string>(zoneid,zonename));
-	}
-
-	return true;
-}
-
-uint32 Database::GetZoneID(const char* zonename) {
-
-	if (zonename == nullptr)
-		return 0;
-
-	for (auto & iter : zonename_array)
-		if (strcasecmp(iter.second.c_str(), zonename) == 0)
-			return iter.first;
-
-	return 0;
-}
-
-const char* Database::GetZoneName(uint32 zoneID, bool ErrorUnknown) {
-	auto iter = zonename_array.find(zoneID);
-
-	if (iter != zonename_array.end())
-		return iter->second.c_str();
-
-	if (ErrorUnknown)
-		return "UNKNOWN";
-
-	return 0;
-}
-
 uint8 Database::GetPEQZone(uint32 zoneID, uint32 version){
 
 	std::string query = StringFormat("SELECT peqzone from zone where zoneidnumber='%i' AND (version=%i OR version=0) ORDER BY version DESC", zoneID, version);
@@ -1310,29 +1298,31 @@ uint8 Database::GetServerType() {
 	return atoi(row[0]);
 }
 
-bool Database::MoveCharacterToZone(const char* charname, const char* zonename, uint32 zoneid) {
-	if(zonename == nullptr || strlen(zonename) == 0)
-		return false;
+bool Database::MoveCharacterToZone(uint32 character_id, uint32 zone_id)
+{
+	std::string query = StringFormat(
+		"UPDATE `character_data` SET `zone_id` = %i, `x` = -1, `y` = -1, `z` = -1 WHERE `id` = %i",
+		zone_id,
+		character_id
+	);
 
-	std::string query = StringFormat("UPDATE `character_data` SET `zone_id` = %i, `x` = -1, `y` = -1, `z` = -1 WHERE `name` = '%s'", zoneid, charname);
 	auto results = QueryDatabase(query);
 
 	if (!results.Success()) {
 		return false;
 	}
 
-	if (results.RowsAffected() == 0)
-		return false;
-
-	return true;
+	return results.RowsAffected() != 0;
 }
 
-bool Database::MoveCharacterToZone(const char* charname, const char* zonename) {
-	return MoveCharacterToZone(charname, zonename, GetZoneID(zonename));
-}
+bool Database::MoveCharacterToZone(const char *charname, uint32 zone_id)
+{
+	std::string query = StringFormat(
+		"UPDATE `character_data` SET `zone_id` = %i, `x` = -1, `y` = -1, `z` = -1 WHERE `name` = '%s'",
+		zone_id,
+		charname
+	);
 
-bool Database::MoveCharacterToZone(uint32 iCharID, const char* iZonename) {
-	std::string query = StringFormat("UPDATE `character_data` SET `zone_id` = %i, `x` = -1, `y` = -1, `z` = -1 WHERE `id` = %i", GetZoneID(iZonename), iCharID);
 	auto results = QueryDatabase(query);
 
 	if (!results.Success()) {
@@ -2318,3 +2308,142 @@ int Database::GetInstanceID(uint32 char_id, uint32 zone_id) {
 
 	return 0;
 }
+
+/**
+ * @param source_character_name
+ * @param destination_character_name
+ * @param destination_account_name
+ * @return
+ */
+bool Database::CopyCharacter(
+	std::string source_character_name,
+	std::string destination_character_name,
+	std::string destination_account_name
+)
+{
+	auto results = QueryDatabase(
+		fmt::format(
+			"SELECT id FROM character_data WHERE name = '{}' and deleted_at is NULL LIMIT 1",
+			source_character_name
+		)
+	);
+
+	if (results.RowCount() == 0) {
+		LogError("No character found with name [{}]", source_character_name);
+	}
+
+	auto        row                 = results.begin();
+	std::string source_character_id = row[0];
+
+	results = QueryDatabase(
+		fmt::format(
+			"SELECT id FROM account WHERE name = '{}' LIMIT 1",
+			destination_account_name
+		)
+	);
+
+	if (results.RowCount() == 0) {
+		LogError("No account found with name [{}]", destination_account_name);
+	}
+
+	row = results.begin();
+	std::string source_account_id = row[0];
+
+	/**
+	 * Fresh ID
+	 */
+	results = QueryDatabase("SELECT (MAX(id) + 1) as new_id from character_data");
+	row     = results.begin();
+	std::string new_character_id = row[0];
+
+	TransactionBegin();
+	for (const auto &iter : DatabaseSchema::GetCharacterTables()) {
+		std::string table_name               = iter.first;
+		std::string character_id_column_name = iter.second;
+
+		/**
+		 * Columns
+		 */
+		results = QueryDatabase(fmt::format("SHOW COLUMNS FROM {}", table_name));
+		std::vector<std::string> columns      = {};
+		int                      column_count = 0;
+		for (row = results.begin(); row != results.end(); ++row) {
+			columns.emplace_back(row[0]);
+			column_count++;
+		}
+
+		results = QueryDatabase(
+			fmt::format(
+				"SELECT {} FROM {} WHERE {} = {}",
+				implode(",", wrap(columns, "`")),
+				table_name,
+				character_id_column_name,
+				source_character_id
+			)
+		);
+
+		std::vector<std::vector<std::string>> new_rows;
+		for (row = results.begin(); row != results.end(); ++row) {
+			std::vector<std::string> new_values   = {};
+			for (int                 column_index = 0; column_index < column_count; column_index++) {
+				std::string column = columns[column_index];
+				std::string value  = row[column_index] ? row[column_index] : "null";
+
+				if (column == character_id_column_name) {
+					value = new_character_id;
+				}
+
+				if (column == "name" && table_name == "character_data") {
+					value = destination_character_name;
+				}
+
+				if (column == "account_id" && table_name == "character_data") {
+					value = source_account_id;
+				}
+
+				new_values.emplace_back(value);
+			}
+
+			new_rows.emplace_back(new_values);
+		}
+
+		std::string              insert_values;
+		std::vector<std::string> insert_rows;
+
+		for (auto &r: new_rows) {
+			std::string insert_row = "(" + implode(",", wrap(r, "'")) + ")";
+			insert_rows.emplace_back(insert_row);
+		}
+
+		if (!insert_rows.empty()) {
+			QueryDatabase(
+				fmt::format(
+					"DELETE FROM {} WHERE {} = {}",
+					table_name,
+					character_id_column_name,
+					new_character_id
+				)
+			);
+
+			auto insert = QueryDatabase(
+				fmt::format(
+					"INSERT INTO {} ({}) VALUES {}",
+					table_name,
+					implode(",", wrap(columns, "`")),
+					implode(",", insert_rows)
+				)
+			);
+
+			if (!insert.ErrorMessage().empty()) {
+				TransactionRollback();
+				return false;
+				break;
+			}
+		}
+	}
+
+	TransactionCommit();
+
+	return true;
+}
+

common/database.h

@@ -40,7 +40,7 @@
 class MySQLRequestResult;
 class Client;
 
-namespace EQEmu
+namespace EQ
 {
 	class InventoryProfile;
 }
@@ -100,22 +100,40 @@ class Database : public DBcore {
 public:
 	Database();
 	Database(const char* host, const char* user, const char* passwd, const char* database,uint32 port);
-	bool Connect(const char* host, const char* user, const char* passwd, const char* database, uint32 port);
+	bool Connect(const char* host, const char* user, const char* passwd, const char* database, uint32 port, std::string connection_label = "default");
 	~Database();
 
 	/* Character Creation */
 
-	bool	AddToNameFilter(const char* name);
-	bool	CreateCharacter(uint32 account_id, char* name, uint16 gender, uint16 race, uint16 class_, uint8 str, uint8 sta, uint8 cha, uint8 dex, uint8 int_, uint8 agi, uint8 wis, uint8 face);
-	bool	DeleteCharacter(char* character_name);
-	bool	MoveCharacterToZone(const char* charname, const char* zonename);
-	bool	MoveCharacterToZone(const char* charname, const char* zonename,uint32 zoneid);
-	bool	MoveCharacterToZone(uint32 iCharID, const char* iZonename);
-	bool	ReserveName(uint32 account_id, char* name);
-	bool	SaveCharacterCreate(uint32 character_id, uint32 account_id, PlayerProfile_Struct* pp);
-	bool	SetHackerFlag(const char* accountname, const char* charactername, const char* hacked);
-	bool	SetMQDetectionFlag(const char* accountname, const char* charactername, const char* hacked, const char* zone);
-	bool	UpdateName(const char* oldname, const char* newname);
+	bool AddToNameFilter(const char *name);
+	bool CreateCharacter(
+		uint32 account_id,
+		char *name,
+		uint16 gender,
+		uint16 race,
+		uint16 class_,
+		uint8 str,
+		uint8 sta,
+		uint8 cha,
+		uint8 dex,
+		uint8 int_,
+		uint8 agi,
+		uint8 wis,
+		uint8 face
+	);
+	bool DeleteCharacter(char *character_name);
+	bool MoveCharacterToZone(const char *charname, uint32 zone_id);
+	bool MoveCharacterToZone(uint32 character_id, uint32 zone_id);
+	bool ReserveName(uint32 account_id, char *name);
+	bool SaveCharacterCreate(uint32 character_id, uint32 account_id, PlayerProfile_Struct *pp);
+	bool SetHackerFlag(const char *accountname, const char *charactername, const char *hacked);
+	bool SetMQDetectionFlag(const char *accountname, const char *charactername, const char *hacked, const char *zone);
+	bool UpdateName(const char *oldname, const char *newname);
+	bool CopyCharacter(
+		std::string source_character_name,
+		std::string destination_character_name,
+		std::string destination_account_name
+	);
 
 	/* General Information Queries */
 
@@ -137,6 +155,8 @@ public:
 
 	void	GetAccountName(uint32 accountid, char* name, uint32* oLSAccountID = 0);
 	void	GetCharName(uint32 char_id, char* name);
+	const char *GetCharNameByID(uint32 char_id);
+	const char *GetNPCNameByID(uint32 npc_id);
 	void	LoginIP(uint32 AccountID, const char* LoginIP);
 
 	/* Instancing */
@@ -153,7 +173,6 @@ public:
 	bool VerifyInstanceAlive(uint16 instance_id, uint32 char_id);
 	bool VerifyZoneInstance(uint32 zone_id, uint16 instance_id);
 
-	uint16 GetInstanceID(const char* zone, uint32 charid, int16 version);
 	uint16 GetInstanceID(uint32 zone, uint32 charid, int16 version);
 	uint16 GetInstanceVersion(uint16 instance_id);
 	uint32 GetTimeRemainingInstance(uint16 instance_id, bool &is_perma);
@@ -193,19 +212,19 @@ public:
 
 	void	GetAccountFromID(uint32 id, char* oAccountName, int16* oStatus);
 	void	SetAgreementFlag(uint32 acctid);
-	
+
 	int		GetIPExemption(std::string account_ip);
 
 	int		GetInstanceID(uint32 char_id, uint32 zone_id);
 
 
 	/* Groups */
-	
+
 	char*	GetGroupLeaderForLogin(const char* name,char* leaderbuf);
 	char*	GetGroupLeadershipInfo(uint32 gid, char* leaderbuf, char* maintank = nullptr, char* assist = nullptr, char* puller = nullptr, char *marknpc = nullptr, char *mentoree = nullptr, int *mentor_percent = nullptr, GroupLeadershipAA_Struct* GLAA = nullptr);
-	
+
 	uint32	GetGroupID(const char* name);
-	
+
 	void	ClearGroup(uint32 gid = 0);
 	void	ClearGroupLeader(uint32 gid = 0);
 	void	SetGroupID(const char* name, uint32 id, uint32 charid, uint32 ismerc = false);
@@ -241,16 +260,11 @@ public:
 	/* General Queries */
 
 	bool	GetSafePoints(const char* short_name, uint32 version, float* safe_x = 0, float* safe_y = 0, float* safe_z = 0, int16* minstatus = 0, uint8* minlevel = 0, char *flag_needed = nullptr);
-	bool	GetSafePoints(uint32 zoneID, uint32 version, float* safe_x = 0, float* safe_y = 0, float* safe_z = 0, int16* minstatus = 0, uint8* minlevel = 0, char *flag_needed = nullptr) { return GetSafePoints(GetZoneName(zoneID), version, safe_x, safe_y, safe_z, minstatus, minlevel, flag_needed); }
 	bool	GetZoneGraveyard(const uint32 graveyard_id, uint32* graveyard_zoneid = 0, float* graveyard_x = 0, float* graveyard_y = 0, float* graveyard_z = 0, float* graveyard_heading = 0);
 	bool	GetZoneLongName(const char* short_name, char** long_name, char* file_name = 0, float* safe_x = 0, float* safe_y = 0, float* safe_z = 0, uint32* graveyard_id = 0, uint32* maxclients = 0);
 	bool	LoadPTimers(uint32 charid, PTimerList &into);
-	bool	LoadZoneNames();
-
-	const char*	GetZoneName(uint32 zoneID, bool ErrorUnknown = false);
 
 	uint32	GetZoneGraveyardID(uint32 zone_id, uint32 version);
-	uint32	GetZoneID(const char* zonename);
 
 	uint8	GetPEQZone(uint32 zoneID, uint32 version);
 	uint8	GetRaceSkill(uint8 skillid, uint8 in_race);
@@ -274,7 +288,6 @@ public:
 	void	LoadLogSettings(EQEmuLogSys::LogSettings* log_settings);
 
 private:
-	std::map<uint32,std::string>	zonename_array;
 
 	Mutex Mvarcache;
 	VarCache_Struct varcache;

common/database/database_dump_service.cpp

@@ -50,7 +50,11 @@ std::string DatabaseDumpService::execute(const std::string &cmd, bool return_res
 	const char *file_name = "db-exec-result.txt";
 
 	if (return_result) {
+#ifdef _WINDOWS
+		std::system((cmd + " > " + file_name + " 2>&1").c_str());
+#else
 		std::system((cmd + " > " + file_name).c_str());
+#endif
 	}
 	else {
 		std::system((cmd).c_str());
@@ -95,7 +99,7 @@ bool DatabaseDumpService::IsTarAvailable()
  */
 bool DatabaseDumpService::Is7ZipAvailable()
 {
-	std::string version_output = execute("7z -help");
+	std::string version_output = execute("7z --help");
 
 	return version_output.find("7-Zip") != std::string::npos;
 }
@@ -124,12 +128,23 @@ std::string DatabaseDumpService::GetMySQLVersion()
 std::string DatabaseDumpService::GetBaseMySQLDumpCommand()
 {
 	auto config = EQEmuConfig::get();
+	if (IsDumpContentTables() && !config->ContentDbHost.empty()) {
+		return fmt::format(
+			"mysqldump -u {} -p{} -h {} --port={} {}",
+			config->ContentDbUsername,
+			config->ContentDbPassword,
+			config->ContentDbHost,
+			config->ContentDbPort,
+			config->ContentDbName
+		);
+	};
 
 	return fmt::format(
-		"mysqldump -u {} -p{} -h {} {}",
+		"mysqldump -u {} -p{} -h {} --port={} {}",
 		config->DatabaseUsername,
 		config->DatabasePassword,
 		config->DatabaseHost,
+		config->DatabasePort,
 		config->DatabaseDB
 	);
 }
@@ -285,8 +300,7 @@ void DatabaseDumpService::Dump()
 		config->DatabaseUsername
 	);
 
-	std::string options = "--allow-keywords --extended-insert";
-
+	std::string options = "--allow-keywords --extended-insert --max-allowed-packet=1G --net-buffer-length=32704";
 	if (IsDumpWithNoData()) {
 		options += " --no-data";
 	}
@@ -396,9 +410,8 @@ void DatabaseDumpService::Dump()
 			else if (Is7ZipAvailable()) {
 				execute(
 					fmt::format(
-						"7z a -t7z {}.zip -C {} {}.sql",
+						"7z a -t7z {}.zip {}.sql",
 						GetDumpFileNameWithPath(),
-						GetSetDumpPath(),
 						GetDumpFileNameWithPath()
 					)
 				);

common/database_conversions.cpp

@@ -189,7 +189,7 @@ namespace Convert {
 		/*002*/	uint32 HP;
 		/*006*/	uint32 Mana;
 		/*010*/	Convert::SpellBuff_Struct Buffs[BUFF_COUNT];
-		/*510*/	uint32 Items[EQEmu::textures::materialCount];
+		/*510*/	uint32 Items[EQ::textures::materialCount];
 		/*546*/	char Name[64];
 		/*610*/
 	};
@@ -230,9 +230,9 @@ namespace Convert {
 		/*0304*/	uint8							ability_time_minutes;
 		/*0305*/	uint8							ability_time_hours;	//place holder
 		/*0306*/	uint8							unknown0306[6];		// @bp Spacer/Flag?
-		/*0312*/	uint32							item_material[EQEmu::textures::materialCount];	// Item texture/material of worn/held items
+		/*0312*/	uint32							item_material[EQ::textures::materialCount];	// Item texture/material of worn/held items
 		/*0348*/	uint8							unknown0348[44];
-		/*0392*/	Convert::Color_Struct			item_tint[EQEmu::textures::materialCount];
+		/*0392*/	Convert::Color_Struct			item_tint[EQ::textures::materialCount];
 		/*0428*/	Convert::AA_Array				aa_array[MAX_PP_AA_ARRAY];
 		/*2348*/	float							unknown2384;		//seen ~128, ~47
 		/*2352*/	char							servername[32];		// length probably not right
@@ -1396,7 +1396,7 @@ bool Database::CheckDatabaseConvertPPDeblob(){
 				if (rquery != ""){ results = QueryDatabase(rquery); }
 				/* Run Material Color Convert */
 				first_entry = 0; rquery = "";
-				for (i = EQEmu::textures::textureBegin; i < EQEmu::textures::materialCount; i++){
+				for (i = EQ::textures::textureBegin; i < EQ::textures::materialCount; i++){
 					if (pp->item_tint[i].color > 0){
 						if (first_entry != 1){
 							rquery = StringFormat("REPLACE INTO `character_material` (id, slot, blue, green, red, use_tint, color) VALUES (%u, %u, %u, %u, %u, %u, %u)", character_id, i, pp->item_tint[i].rgb.blue, pp->item_tint[i].rgb.green, pp->item_tint[i].rgb.red, pp->item_tint[i].rgb.use_tint, pp->item_tint[i].color);

common/database_instances.cpp

@@ -34,6 +34,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #define strcasecmp	_stricmp
 #else
 #include "unix.h"
+#include "../zone/zonedb.h"
 #include <netinet/in.h>
 #include <sys/time.h>
 #endif
@@ -97,42 +98,53 @@ bool Database::CheckInstanceExists(uint16 instance_id) {
 bool Database::CheckInstanceExpired(uint16 instance_id)
 {
 
-	int32 start_time = 0;
-	int32 duration = 0;
+	int32  start_time    = 0;
+	int32  duration      = 0;
 	uint32 never_expires = 0;
 
-	std::string query = StringFormat("SELECT start_time, duration, never_expires FROM instance_list WHERE id=%u", instance_id);
+	std::string query = StringFormat(
+		"SELECT start_time, duration, never_expires FROM instance_list WHERE id=%u",
+		instance_id
+	);
+
 	auto results = QueryDatabase(query);
 
-	if (!results.Success())
+	if (!results.Success()) {
 		return true;
+	}
 
-	if (results.RowCount() == 0)
+	if (results.RowCount() == 0) {
 		return true;
+	}
 
 	auto row = results.begin();
 
-	start_time = atoi(row[0]);
-	duration = atoi(row[1]);
+	start_time    = atoi(row[0]);
+	duration      = atoi(row[1]);
 	never_expires = atoi(row[2]);
 
-	if (never_expires == 1)
+	if (never_expires == 1) {
 		return false;
+	}
 
-	timeval tv;
+	timeval tv{};
 	gettimeofday(&tv, nullptr);
 
-	if ((start_time + duration) <= tv.tv_sec)
-		return true;
+	return (start_time + duration) <= tv.tv_sec;
 
-	return false;
 }
 
 bool Database::CreateInstance(uint16 instance_id, uint32 zone_id, uint32 version, uint32 duration)
 {
-	std::string query = StringFormat("INSERT INTO instance_list (id, zone, version, start_time, duration)"
-		" values(%lu, %lu, %lu, UNIX_TIMESTAMP(), %lu)",
-		(unsigned long)instance_id, (unsigned long)zone_id, (unsigned long)version, (unsigned long)duration);
+	std::string query = StringFormat(
+		"INSERT INTO instance_list (id, zone, version, start_time, duration)"
+		" values (%u, %u, %u, UNIX_TIMESTAMP(), %u)",
+		instance_id,
+		zone_id,
+		version,
+		duration
+	);
+
 	auto results = QueryDatabase(query);
 
 	return results.Success();
@@ -140,66 +152,84 @@ bool Database::CreateInstance(uint16 instance_id, uint32 zone_id, uint32 version
 
 bool Database::GetUnusedInstanceID(uint16 &instance_id)
 {
-	uint32 count = RuleI(Zone, ReservedInstances);
-	uint32 max = 65535;
+	uint32 max_reserved_instance_id = RuleI(Instances, ReservedInstances);
+	uint32 max                      = 32000;
+
+	std::string query = StringFormat(
+		"SELECT IFNULL(MAX(id),%u)+1 FROM instance_list WHERE id > %u",
+		max_reserved_instance_id,
+		max_reserved_instance_id
+	);
+
+	if (RuleB(Instances, RecycleInstanceIds)) {
+		query = (
+			SQL(
+				SELECT i.id + 1 AS next_available
+				FROM instance_list i
+				LEFT JOIN instance_list i2 ON i2.id = i.id + 1
+				WHERE i2.id IS NULL
+				ORDER BY i.id
+				LIMIT 0, 1;
+
+			)
+		);
+	}
 
-	std::string query = StringFormat("SELECT IFNULL(MAX(id),%u)+1 FROM instance_list  WHERE id > %u", count, count);
 	auto results = QueryDatabase(query);
 
-	if (!results.Success())
-	{
+	if (!results.Success()) {
 		instance_id = 0;
 		return false;
 	}
 
-	if (results.RowCount() == 0)
-	{
-		instance_id = 0;
-		return false;
+	if (results.RowCount() == 0) {
+		instance_id = max_reserved_instance_id;
+		return true;
 	}
 
 	auto row = results.begin();
 
-	if (atoi(row[0]) <= max)
-	{
+	if (atoi(row[0]) <= max) {
 		instance_id = atoi(row[0]);
+
 		return true;
 	}
 
-	query = StringFormat("SELECT id FROM instance_list where id > %u ORDER BY id", count);
+	if (instance_id < max_reserved_instance_id) {
+		instance_id = max_reserved_instance_id;
+		return true;
+	}
+
+	query   = StringFormat("SELECT id FROM instance_list where id > %u ORDER BY id", max_reserved_instance_id);
 	results = QueryDatabase(query);
 
-	if (!results.Success())
-	{
+	if (!results.Success()) {
 		instance_id = 0;
 		return false;
 	}
 
-	if (results.RowCount() == 0)
-	{
+	if (results.RowCount() == 0) {
 		instance_id = 0;
 		return false;
 	}
 
-	count++;
-	for (auto row = results.begin(); row != results.end(); ++row)
-	{
-		if (count < atoi(row[0]))
-		{
-			instance_id = count;
+	max_reserved_instance_id++;
+	for (auto row = results.begin(); row != results.end(); ++row) {
+		if (max_reserved_instance_id < atoi(row[0])) {
+			instance_id = max_reserved_instance_id;
 			return true;
 		}
 
-		if (count > max)
-		{
+		if (max_reserved_instance_id > max) {
 			instance_id = 0;
 			return false;
 		}
 
-		count++;
+		max_reserved_instance_id++;
 	}
 
-	instance_id = count;
+	instance_id = max_reserved_instance_id;
+
 	return true;
 }
 
@@ -276,36 +306,6 @@ bool Database::VerifyZoneInstance(uint32 zone_id, uint16 instance_id)
 	return true;
 }
 
-uint16 Database::GetInstanceID(const char* zone, uint32 character_id, int16 version) {
-
-	std::string query = StringFormat(
-		"SELECT "
-		"instance_list.id "
-		"FROM "
-		"instance_list, "
-		"instance_list_player "
-		"WHERE "
-		"instance_list.zone = %u "
-		"AND instance_list.version = %u "
-		"AND instance_list.id = instance_list_player.id "
-		"AND instance_list_player.charid = %u "
-		"LIMIT 1 ",
-		GetZoneID(zone),
-		version,
-		character_id
-		);
-	auto results = QueryDatabase(query);
-
-	if (!results.Success())
-		return 0;
-
-	if (results.RowCount() == 0)
-		return 0;
-
-	auto row = results.begin();
-	return atoi(row[0]);
-}
-
 uint16 Database::GetInstanceID(uint32 zone, uint32 character_id, int16 version)
 {
 	if (!zone)
@@ -482,9 +482,8 @@ void Database::BuryCorpsesInInstance(uint16 instance_id) {
 
 void Database::DeleteInstance(uint16 instance_id)
 {
-	std::string query = StringFormat("DELETE FROM instance_list WHERE id=%u", instance_id);
-	QueryDatabase(query);
-
+	std::string query;
+	
 	query = StringFormat("DELETE FROM instance_list_player WHERE id=%u", instance_id);
 	QueryDatabase(query);
 
@@ -494,6 +493,9 @@ void Database::DeleteInstance(uint16 instance_id)
 	query = StringFormat("DELETE FROM spawn_condition_values WHERE instance_id=%u", instance_id);
 	QueryDatabase(query);
 
+	query = fmt::format("DELETE FROM dynamic_zones WHERE instance_id={}", instance_id);
+	QueryDatabase(query);
+
 	BuryCorpsesInInstance(instance_id);
 }
 
@@ -544,17 +546,46 @@ void Database::GetCharactersInInstance(uint16 instance_id, std::list<uint32> &ch
 
 void Database::PurgeExpiredInstances()
 {
-	std::string query("SELECT id FROM instance_list where (start_time+duration) <= UNIX_TIMESTAMP() and never_expires = 0");
+
+	/**
+	 * Delay purging by a day so that we can continue using adjacent free instance id's
+	 * from the table without risking the chance we immediately re-allocate a zone that freshly expired but
+	 * has not been fully de-allocated
+	 */
+	std::string query =
+		SQL(
+			SELECT
+				id
+			FROM
+				instance_list
+			where
+			(start_time + duration) <= (UNIX_TIMESTAMP() - 86400)
+			and never_expires = 0
+		);
+
 	auto results = QueryDatabase(query);
 
-	if (!results.Success())
+	if (!results.Success()) {
 		return;
+	}
 
-	if (results.RowCount() == 0)
+	if (results.RowCount() == 0) {
 		return;
+	}
 
-	for (auto row = results.begin(); row != results.end(); ++row)
-		DeleteInstance(atoi(row[0]));
+	std::vector<std::string> instance_ids;
+	for (auto row = results.begin(); row != results.end(); ++row) {
+		instance_ids.emplace_back(row[0]);
+	}
+
+	std::string imploded_instance_ids = implode(",", instance_ids);
+
+	QueryDatabase(fmt::format("DELETE FROM instance_list WHERE id IN ({})", imploded_instance_ids));
+	QueryDatabase(fmt::format("DELETE FROM instance_list_player WHERE id IN ({})", imploded_instance_ids));
+	QueryDatabase(fmt::format("DELETE FROM respawn_times WHERE instance_id IN ({})", imploded_instance_ids));
+	QueryDatabase(fmt::format("DELETE FROM spawn_condition_values WHERE instance_id IN ({})", imploded_instance_ids));
+	QueryDatabase(fmt::format("UPDATE character_corpses SET is_buried = 1, instance_id = 0 WHERE instance_id IN ({})", imploded_instance_ids));
+	QueryDatabase(fmt::format("DELETE FROM dynamic_zones WHERE instance_id IN ({})", imploded_instance_ids));
 }
 
 void Database::SetInstanceDuration(uint16 instance_id, uint32 new_duration)
@@ -562,4 +593,4 @@ void Database::SetInstanceDuration(uint16 instance_id, uint32 new_duration)
 	std::string query = StringFormat("UPDATE `instance_list` SET start_time=UNIX_TIMESTAMP(), "
 		"duration=%u WHERE id=%u", new_duration, instance_id);
 	auto results = QueryDatabase(query);
-}
+}

common/database_schema.h

@@ -50,6 +50,7 @@ namespace DatabaseSchema {
 			{"character_data",                 "id"},
 			{"character_disciplines",          "id"},
 			{"character_enabledtasks",         "charid"},
+			{"character_expedition_lockouts",  "character_id"},
 			{"character_inspect_messages",     "id"},
 			{"character_item_recast",          "id"},
 			{"character_languages",            "id"},
@@ -114,6 +115,7 @@ namespace DatabaseSchema {
 			"character_data",
 			"character_disciplines",
 			"character_enabledtasks",
+			"character_expedition_lockouts",
 			"character_inspect_messages",
 			"character_item_recast",
 			"character_languages",
@@ -179,6 +181,7 @@ namespace DatabaseSchema {
 			"books",
 			"char_create_combinations",
 			"char_create_point_allocations",
+			"damageshieldtypes",
 			"doors",
 			"faction_base_data",
 			"faction_list",
@@ -218,7 +221,6 @@ namespace DatabaseSchema {
 			"skill_caps",
 			"spawn2",
 			"spawn_conditions",
-			"spawn_events",
 			"spawnentry",
 			"spawngroup",
 			"spells_new",
@@ -248,11 +250,13 @@ namespace DatabaseSchema {
 		return {
 			"chatchannels",
 			"command_settings",
+			"content_flags",
 			"db_str",
 			"eqtime",
 			"launcher",
 			"launcher_zones",
 			"spawn_condition_values",
+			"spawn_events",
 			"level_exp_mods",
 			"logsys_categories",
 			"name_filter",
@@ -303,7 +307,11 @@ namespace DatabaseSchema {
 			"banned_ips",
 			"bug_reports",
 			"bugs",
+			"dynamic_zones",
 			"eventlog",
+			"expedition_lockouts",
+			"expedition_members",
+			"expeditions",
 			"gm_ips",
 			"group_id",
 			"group_leaders",

common/dbcore.cpp

@@ -51,7 +51,11 @@ DBcore::~DBcore()
 	 * are re-using the default database connection pointer when we dont have an
 	 * external configuration setup ex: (content_database)
 	 */
-	std::string mysql_connection_host = mysql.host;
+	std::string mysql_connection_host;
+	if (mysql.host) {
+		mysql_connection_host = mysql.host;
+	}
+
 	if (GetOriginHost() != mysql_connection_host) {
 		return;
 	}
@@ -79,6 +83,13 @@ MySQLRequestResult DBcore::QueryDatabase(std::string query, bool retryOnFailureO
 	return QueryDatabase(query.c_str(), query.length(), retryOnFailureOnce);
 }
 
+bool DBcore::DoesTableExist(std::string table_name)
+{
+	auto results = QueryDatabase(fmt::format("SHOW TABLES LIKE '{}'", table_name));
+
+	return results.RowCount() > 0;
+}
+
 MySQLRequestResult DBcore::QueryDatabase(const char *query, uint32 querylen, bool retryOnFailureOnce)
 {
 	BenchTimer timer;

common/dbcore.h

@@ -35,6 +35,8 @@ public:
 	const std::string &GetOriginHost() const;
 	void SetOriginHost(const std::string &origin_host);
 
+	bool DoesTableExist(std::string table_name);
+
 protected:
 	bool Open(
 		const char *iHost,

common/deity.cpp

@@ -20,7 +20,7 @@
 #include "deity.h"
 
 
-EQEmu::deity::DeityTypeBit EQEmu::deity::ConvertDeityTypeToDeityTypeBit(DeityType deity_type)
+EQ::deity::DeityTypeBit EQ::deity::ConvertDeityTypeToDeityTypeBit(DeityType deity_type)
 {
 	switch (deity_type) {
 	case DeityBertoxxulous:
@@ -63,7 +63,7 @@ EQEmu::deity::DeityTypeBit EQEmu::deity::ConvertDeityTypeToDeityTypeBit(DeityTyp
 	};
 }
 
-EQEmu::deity::DeityType EQEmu::deity::ConvertDeityTypeBitToDeityType(DeityTypeBit deity_type_bit)
+EQ::deity::DeityType EQ::deity::ConvertDeityTypeBitToDeityType(DeityTypeBit deity_type_bit)
 {
 	switch (deity_type_bit) {
 	case bit_DeityAgnostic:
@@ -105,7 +105,7 @@ EQEmu::deity::DeityType EQEmu::deity::ConvertDeityTypeBitToDeityType(DeityTypeBi
 	};
 }
 
-const char* EQEmu::deity::DeityName(DeityType deity_type)
+const char* EQ::deity::DeityName(DeityType deity_type)
 {
 	switch (deity_type) {
 	case DeityBertoxxulous:

common/deity.h

@@ -23,7 +23,7 @@
 #include "types.h"
 
 
-namespace EQEmu
+namespace EQ
 {
 	namespace deity {
 		enum DeityType {

common/emu_constants.cpp

@@ -20,7 +20,7 @@
 #include "emu_constants.h"
 
 
-int16 EQEmu::invtype::GetInvTypeSize(int16 inv_type) {
+int16 EQ::invtype::GetInvTypeSize(int16 inv_type) {
 	static const int16 local_array[] = {
 		POSSESSIONS_SIZE,
 		BANK_SIZE,
@@ -55,7 +55,7 @@ int16 EQEmu::invtype::GetInvTypeSize(int16 inv_type) {
 	return local_array[inv_type];
 }
 
-const char* EQEmu::bug::CategoryIDToCategoryName(CategoryID category_id) {
+const char* EQ::bug::CategoryIDToCategoryName(CategoryID category_id) {
 	switch (category_id) {
 	case catVideo:
 		return "Video";
@@ -87,7 +87,7 @@ const char* EQEmu::bug::CategoryIDToCategoryName(CategoryID category_id) {
 	}
 }
 
-EQEmu::bug::CategoryID EQEmu::bug::CategoryNameToCategoryID(const char* category_name) {
+EQ::bug::CategoryID EQ::bug::CategoryNameToCategoryID(const char* category_name) {
 	if (!category_name)
 		return catOther;
 
@@ -119,7 +119,7 @@ EQEmu::bug::CategoryID EQEmu::bug::CategoryNameToCategoryID(const char* category
 	return catOther;
 }
 
-const char *EQEmu::constants::GetStanceName(StanceType stance_type) {
+const char *EQ::constants::GetStanceName(StanceType stance_type) {
 	switch (stance_type) {
 	case stanceUnknown:
 		return "Unknown";
@@ -146,9 +146,9 @@ const char *EQEmu::constants::GetStanceName(StanceType stance_type) {
 	}
 }
 
-int EQEmu::constants::ConvertStanceTypeToIndex(StanceType stance_type) {
-	if (stance_type >= EQEmu::constants::stancePassive && stance_type <= EQEmu::constants::stanceBurnAE)
-		return (stance_type - EQEmu::constants::stancePassive);
+int EQ::constants::ConvertStanceTypeToIndex(StanceType stance_type) {
+	if (stance_type >= EQ::constants::stancePassive && stance_type <= EQ::constants::stanceBurnAE)
+		return (stance_type - EQ::constants::stancePassive);
 
 	return 0;
 }

common/emu_constants.h

@@ -27,7 +27,7 @@
 
 
 // local definitions are the result of using hybrid-client or server-only values and methods
-namespace EQEmu
+namespace EQ
 {
 	using RoF2::IINVALID;
 	using RoF2::INULL;
@@ -193,7 +193,7 @@ namespace EQEmu
 	} // namespace invaug
 
 	namespace constants {
-		const EQEmu::versions::ClientVersion CHARACTER_CREATION_CLIENT = EQEmu::versions::ClientVersion::Titanium;
+		const EQ::versions::ClientVersion CHARACTER_CREATION_CLIENT = EQ::versions::ClientVersion::Titanium;
 
 		using RoF2::constants::EXPANSION;
 		using RoF2::constants::EXPANSION_BIT;
@@ -332,6 +332,6 @@ namespace EQEmu
 
 /*	hack list to prevent circular references
 	
-	eq_limits.h:EQEmu::inventory::LookupEntry::InventoryTypeSize[n];
+	eq_limits.h:EQ::inventory::LookupEntry::InventoryTypeSize[n];
 
 */

common/emu_oplist.h

@@ -136,20 +136,22 @@ N(OP_Dye),
 N(OP_DynamicWall),
 N(OP_DzAddPlayer),
 N(OP_DzChooseZone),
+N(OP_DzChooseZoneReply),
 N(OP_DzCompass),
 N(OP_DzExpeditionEndsWarning),
 N(OP_DzExpeditionInfo),
-N(OP_DzExpeditionList),
-N(OP_DzJoinExpeditionConfirm),
-N(OP_DzJoinExpeditionReply),
-N(OP_DzLeaderStatus),
+N(OP_DzExpeditionInvite),
+N(OP_DzExpeditionInviteResponse),
+N(OP_DzExpeditionLockoutTimers),
 N(OP_DzListTimers),
 N(OP_DzMakeLeader),
 N(OP_DzMemberList),
-N(OP_DzMemberStatus),
+N(OP_DzMemberListName),
+N(OP_DzMemberListStatus),
 N(OP_DzPlayerList),
 N(OP_DzQuit),
 N(OP_DzRemovePlayer),
+N(OP_DzSetLeaderName),
 N(OP_DzSwapPlayer),
 N(OP_Emote),
 N(OP_EndLootRequest),
@@ -271,6 +273,7 @@ N(OP_ItemVerifyRequest),
 N(OP_ItemViewUnknown),
 N(OP_Jump),
 N(OP_KeyRing),
+N(OP_KickPlayers),
 N(OP_KnowledgeBase),
 N(OP_LDoNButton),
 N(OP_LDoNDisarmTraps),

common/emu_versions.cpp

@@ -21,7 +21,7 @@
 #include "emu_constants.h"
 
 
-bool EQEmu::versions::IsValidClientVersion(ClientVersion client_version)
+bool EQ::versions::IsValidClientVersion(ClientVersion client_version)
 {
 	if (client_version <= ClientVersion::Unknown || client_version > LastClientVersion)
 		return false;
@@ -29,7 +29,7 @@ bool EQEmu::versions::IsValidClientVersion(ClientVersion client_version)
 	return true;
 }
 
-EQEmu::versions::ClientVersion EQEmu::versions::ValidateClientVersion(ClientVersion client_version)
+EQ::versions::ClientVersion EQ::versions::ValidateClientVersion(ClientVersion client_version)
 {
 	if (client_version <= ClientVersion::Unknown || client_version > LastClientVersion)
 		return ClientVersion::Unknown;
@@ -37,7 +37,7 @@ EQEmu::versions::ClientVersion EQEmu::versions::ValidateClientVersion(ClientVers
 	return client_version;
 }
 
-const char* EQEmu::versions::ClientVersionName(ClientVersion client_version)
+const char* EQ::versions::ClientVersionName(ClientVersion client_version)
 {
 	switch (client_version) {
 	case ClientVersion::Unknown:
@@ -61,7 +61,7 @@ const char* EQEmu::versions::ClientVersionName(ClientVersion client_version)
 	};
 }
 
-uint32 EQEmu::versions::ConvertClientVersionToClientVersionBit(ClientVersion client_version)
+uint32 EQ::versions::ConvertClientVersionToClientVersionBit(ClientVersion client_version)
 {
 	switch (client_version) {
 	case ClientVersion::Titanium:
@@ -81,7 +81,7 @@ uint32 EQEmu::versions::ConvertClientVersionToClientVersionBit(ClientVersion cli
 	}
 }
 
-EQEmu::versions::ClientVersion EQEmu::versions::ConvertClientVersionBitToClientVersion(uint32 client_version_bit)
+EQ::versions::ClientVersion EQ::versions::ConvertClientVersionBitToClientVersion(uint32 client_version_bit)
 {
 	switch (client_version_bit) {
 	case ((uint32)1 << (static_cast<unsigned int>(ClientVersion::Titanium) - 1)) :
@@ -101,7 +101,7 @@ EQEmu::versions::ClientVersion EQEmu::versions::ConvertClientVersionBitToClientV
 	}
 }
 
-bool EQEmu::versions::IsValidMobVersion(MobVersion mob_version)
+bool EQ::versions::IsValidMobVersion(MobVersion mob_version)
 {
 	if (mob_version <= MobVersion::Unknown || mob_version > LastMobVersion)
 		return false;
@@ -109,7 +109,7 @@ bool EQEmu::versions::IsValidMobVersion(MobVersion mob_version)
 	return true;
 }
 
-bool EQEmu::versions::IsValidPCMobVersion(MobVersion mob_version)
+bool EQ::versions::IsValidPCMobVersion(MobVersion mob_version)
 {
 	if (mob_version <= MobVersion::Unknown || mob_version > LastPCMobVersion)
 		return false;
@@ -117,7 +117,7 @@ bool EQEmu::versions::IsValidPCMobVersion(MobVersion mob_version)
 	return true;
 }
 
-bool EQEmu::versions::IsValidNonPCMobVersion(MobVersion mob_version)
+bool EQ::versions::IsValidNonPCMobVersion(MobVersion mob_version)
 {
 	if (mob_version <= LastPCMobVersion || mob_version > LastNonPCMobVersion)
 		return false;
@@ -125,7 +125,7 @@ bool EQEmu::versions::IsValidNonPCMobVersion(MobVersion mob_version)
 	return true;
 }
 
-bool EQEmu::versions::IsValidOfflinePCMobVersion(MobVersion mob_version)
+bool EQ::versions::IsValidOfflinePCMobVersion(MobVersion mob_version)
 {
 	if (mob_version <= LastNonPCMobVersion || mob_version > LastOfflinePCMobVersion)
 		return false;
@@ -133,7 +133,7 @@ bool EQEmu::versions::IsValidOfflinePCMobVersion(MobVersion mob_version)
 	return true;
 }
 
-EQEmu::versions::MobVersion EQEmu::versions::ValidateMobVersion(MobVersion mob_version)
+EQ::versions::MobVersion EQ::versions::ValidateMobVersion(MobVersion mob_version)
 {
 	if (mob_version <= MobVersion::Unknown || mob_version > LastMobVersion)
 		return MobVersion::Unknown;
@@ -141,7 +141,7 @@ EQEmu::versions::MobVersion EQEmu::versions::ValidateMobVersion(MobVersion mob_v
 	return mob_version;
 }
 
-EQEmu::versions::MobVersion EQEmu::versions::ValidatePCMobVersion(MobVersion mob_version)
+EQ::versions::MobVersion EQ::versions::ValidatePCMobVersion(MobVersion mob_version)
 {
 	if (mob_version <= MobVersion::Unknown || mob_version > LastPCMobVersion)
 		return MobVersion::Unknown;
@@ -149,7 +149,7 @@ EQEmu::versions::MobVersion EQEmu::versions::ValidatePCMobVersion(MobVersion mob
 	return mob_version;
 }
 
-EQEmu::versions::MobVersion EQEmu::versions::ValidateNonPCMobVersion(MobVersion mob_version)
+EQ::versions::MobVersion EQ::versions::ValidateNonPCMobVersion(MobVersion mob_version)
 {
 	if (mob_version <= LastPCMobVersion || mob_version > LastNonPCMobVersion)
 		return MobVersion::Unknown;
@@ -157,7 +157,7 @@ EQEmu::versions::MobVersion EQEmu::versions::ValidateNonPCMobVersion(MobVersion
 	return mob_version;
 }
 
-EQEmu::versions::MobVersion EQEmu::versions::ValidateOfflinePCMobVersion(MobVersion mob_version)
+EQ::versions::MobVersion EQ::versions::ValidateOfflinePCMobVersion(MobVersion mob_version)
 {
 	if (mob_version <= LastNonPCMobVersion || mob_version > LastOfflinePCMobVersion)
 		return MobVersion::Unknown;
@@ -165,7 +165,7 @@ EQEmu::versions::MobVersion EQEmu::versions::ValidateOfflinePCMobVersion(MobVers
 	return mob_version;
 }
 
-const char* EQEmu::versions::MobVersionName(MobVersion mob_version)
+const char* EQ::versions::MobVersionName(MobVersion mob_version)
 {
 	switch (mob_version) {
 	case MobVersion::Unknown:
@@ -217,7 +217,7 @@ const char* EQEmu::versions::MobVersionName(MobVersion mob_version)
 	};
 }
 
-EQEmu::versions::ClientVersion EQEmu::versions::ConvertMobVersionToClientVersion(MobVersion mob_version)
+EQ::versions::ClientVersion EQ::versions::ConvertMobVersionToClientVersion(MobVersion mob_version)
 {
 	switch (mob_version) {
 	case MobVersion::Unknown:
@@ -240,7 +240,7 @@ EQEmu::versions::ClientVersion EQEmu::versions::ConvertMobVersionToClientVersion
 	}
 }
 
-EQEmu::versions::MobVersion EQEmu::versions::ConvertClientVersionToMobVersion(ClientVersion client_version)
+EQ::versions::MobVersion EQ::versions::ConvertClientVersionToMobVersion(ClientVersion client_version)
 {
 	switch (client_version) {
 	case ClientVersion::Unknown:
@@ -263,7 +263,7 @@ EQEmu::versions::MobVersion EQEmu::versions::ConvertClientVersionToMobVersion(Cl
 	}
 }
 
-EQEmu::versions::MobVersion EQEmu::versions::ConvertPCMobVersionToOfflinePCMobVersion(MobVersion mob_version)
+EQ::versions::MobVersion EQ::versions::ConvertPCMobVersionToOfflinePCMobVersion(MobVersion mob_version)
 {
 	switch (mob_version) {
 	case MobVersion::Titanium:
@@ -283,7 +283,7 @@ EQEmu::versions::MobVersion EQEmu::versions::ConvertPCMobVersionToOfflinePCMobVe
 	}
 }
 
-EQEmu::versions::MobVersion EQEmu::versions::ConvertOfflinePCMobVersionToPCMobVersion(MobVersion mob_version)
+EQ::versions::MobVersion EQ::versions::ConvertOfflinePCMobVersionToPCMobVersion(MobVersion mob_version)
 {
 	switch (mob_version) {
 	case MobVersion::OfflineTitanium:
@@ -303,7 +303,7 @@ EQEmu::versions::MobVersion EQEmu::versions::ConvertOfflinePCMobVersionToPCMobVe
 	}
 }
 
-EQEmu::versions::ClientVersion EQEmu::versions::ConvertOfflinePCMobVersionToClientVersion(MobVersion mob_version)
+EQ::versions::ClientVersion EQ::versions::ConvertOfflinePCMobVersionToClientVersion(MobVersion mob_version)
 {
 	switch (mob_version) {
 	case MobVersion::OfflineTitanium:
@@ -323,7 +323,7 @@ EQEmu::versions::ClientVersion EQEmu::versions::ConvertOfflinePCMobVersionToClie
 	}
 }
 
-EQEmu::versions::MobVersion EQEmu::versions::ConvertClientVersionToOfflinePCMobVersion(ClientVersion client_version)
+EQ::versions::MobVersion EQ::versions::ConvertClientVersionToOfflinePCMobVersion(ClientVersion client_version)
 {
 	switch (client_version) {
 	case ClientVersion::Titanium:
@@ -343,7 +343,7 @@ EQEmu::versions::MobVersion EQEmu::versions::ConvertClientVersionToOfflinePCMobV
 	}
 }
 
-const char* EQEmu::expansions::ExpansionName(Expansion expansion)
+const char* EQ::expansions::ExpansionName(Expansion expansion)
 {
 	switch (expansion) {
 	case Expansion::EverQuest:
@@ -393,12 +393,12 @@ const char* EQEmu::expansions::ExpansionName(Expansion expansion)
 	}
 }
 
-const char* EQEmu::expansions::ExpansionName(uint32 expansion_bit)
+const char* EQ::expansions::ExpansionName(uint32 expansion_bit)
 {
 	return ExpansionName(ConvertExpansionBitToExpansion(expansion_bit));
 }
 
-uint32 EQEmu::expansions::ConvertExpansionToExpansionBit(Expansion expansion)
+uint32 EQ::expansions::ConvertExpansionToExpansionBit(Expansion expansion)
 {
 	switch (expansion) {
 	case Expansion::RoK:
@@ -446,7 +446,7 @@ uint32 EQEmu::expansions::ConvertExpansionToExpansionBit(Expansion expansion)
 	}
 }
 
-EQEmu::expansions::Expansion EQEmu::expansions::ConvertExpansionBitToExpansion(uint32 expansion_bit)
+EQ::expansions::Expansion EQ::expansions::ConvertExpansionBitToExpansion(uint32 expansion_bit)
 {
 	switch (expansion_bit) {
 	case bitRoK:
@@ -494,7 +494,7 @@ EQEmu::expansions::Expansion EQEmu::expansions::ConvertExpansionBitToExpansion(u
 	}
 }
 
-uint32 EQEmu::expansions::ConvertExpansionToExpansionsMask(Expansion expansion)
+uint32 EQ::expansions::ConvertExpansionToExpansionsMask(Expansion expansion)
 {
 	switch (expansion) {
 	case Expansion::RoK:
@@ -542,17 +542,17 @@ uint32 EQEmu::expansions::ConvertExpansionToExpansionsMask(Expansion expansion)
 	}
 }
 
-EQEmu::expansions::Expansion EQEmu::expansions::ConvertClientVersionToExpansion(versions::ClientVersion client_version)
+EQ::expansions::Expansion EQ::expansions::ConvertClientVersionToExpansion(versions::ClientVersion client_version)
 {
-	return EQEmu::constants::StaticLookup(client_version)->Expansion;
+	return EQ::constants::StaticLookup(client_version)->Expansion;
 }
 
-uint32 EQEmu::expansions::ConvertClientVersionToExpansionBit(versions::ClientVersion client_version)
+uint32 EQ::expansions::ConvertClientVersionToExpansionBit(versions::ClientVersion client_version)
 {
-	return EQEmu::constants::StaticLookup(client_version)->ExpansionBit;
+	return EQ::constants::StaticLookup(client_version)->ExpansionBit;
 }
 
-uint32 EQEmu::expansions::ConvertClientVersionToExpansionsMask(versions::ClientVersion client_version)
+uint32 EQ::expansions::ConvertClientVersionToExpansionsMask(versions::ClientVersion client_version)
 {
-	return EQEmu::constants::StaticLookup(client_version)->ExpansionsMask;
+	return EQ::constants::StaticLookup(client_version)->ExpansionsMask;
 }

common/emu_versions.h

@@ -25,7 +25,7 @@
 #include <stdlib.h>
 
 
-namespace EQEmu
+namespace EQ
 {
 	namespace versions {
 		enum class ClientVersion : uint32 {

common/eq_constants.h

@@ -318,7 +318,7 @@ static const uint8 DamageTypeUnknown	= 0xFF;
 **
 **	(indexed by 'Skill' of SkillUseTypes)
 */
-static const uint8 SkillDamageTypes[EQEmu::skills::HIGHEST_SKILL + 1] = // change to _SkillServerArraySize once activated
+static const uint8 SkillDamageTypes[EQ::skills::HIGHEST_SKILL + 1] = // change to _SkillServerArraySize once activated
 {
 /*1HBlunt*/					0,
 /*1HSlashing*/				1,

common/eq_limits.cpp

@@ -25,7 +25,7 @@
 
 
 static bool global_dictionary_init = false;
-void EQEmu::InitializeDynamicLookups() {
+void EQ::InitializeDynamicLookups() {
 	if (global_dictionary_init == true)
 		return;
 
@@ -37,12 +37,12 @@ void EQEmu::InitializeDynamicLookups() {
 	global_dictionary_init = true;
 }
 
-static std::unique_ptr<EQEmu::constants::LookupEntry> constants_dynamic_nongm_lookup_entries[EQEmu::versions::ClientVersionCount];
-static std::unique_ptr<EQEmu::constants::LookupEntry> constants_dynamic_gm_lookup_entries[EQEmu::versions::ClientVersionCount];
-static const EQEmu::constants::LookupEntry constants_static_lookup_entries[EQEmu::versions::ClientVersionCount] =
+static std::unique_ptr<EQ::constants::LookupEntry> constants_dynamic_nongm_lookup_entries[EQ::versions::ClientVersionCount];
+static std::unique_ptr<EQ::constants::LookupEntry> constants_dynamic_gm_lookup_entries[EQ::versions::ClientVersionCount];
+static const EQ::constants::LookupEntry constants_static_lookup_entries[EQ::versions::ClientVersionCount] =
 {
 	/*[ClientVersion::Unknown] =*/
-	EQEmu::constants::LookupEntry(
+	EQ::constants::LookupEntry(
 		ClientUnknown::constants::EXPANSION,
 		ClientUnknown::constants::EXPANSION_BIT,
 		ClientUnknown::constants::EXPANSIONS_MASK,
@@ -50,7 +50,7 @@ static const EQEmu::constants::LookupEntry constants_static_lookup_entries[EQEmu
 		ClientUnknown::INULL
 	),
 	/*[ClientVersion::Client62] =*/
-	EQEmu::constants::LookupEntry(
+	EQ::constants::LookupEntry(
 		Client62::constants::EXPANSION,
 		Client62::constants::EXPANSION_BIT,
 		Client62::constants::EXPANSIONS_MASK,
@@ -58,7 +58,7 @@ static const EQEmu::constants::LookupEntry constants_static_lookup_entries[EQEmu
 		Client62::INULL
 	),
 	/*[ClientVersion::Titanium] =*/
-	EQEmu::constants::LookupEntry(
+	EQ::constants::LookupEntry(
 		Titanium::constants::EXPANSION,
 		Titanium::constants::EXPANSION_BIT,
 		Titanium::constants::EXPANSIONS_MASK,
@@ -66,7 +66,7 @@ static const EQEmu::constants::LookupEntry constants_static_lookup_entries[EQEmu
 		Titanium::constants::SAY_LINK_BODY_SIZE
 	),
 	/*[ClientVersion::SoF] =*/
-	EQEmu::constants::LookupEntry(
+	EQ::constants::LookupEntry(
 		SoF::constants::EXPANSION,
 		SoF::constants::EXPANSION_BIT,
 		SoF::constants::EXPANSIONS_MASK,
@@ -74,7 +74,7 @@ static const EQEmu::constants::LookupEntry constants_static_lookup_entries[EQEmu
 		SoF::constants::SAY_LINK_BODY_SIZE
 	),
 	/*[ClientVersion::SoD] =*/
-	EQEmu::constants::LookupEntry(
+	EQ::constants::LookupEntry(
 		SoD::constants::EXPANSION,
 		SoD::constants::EXPANSION_BIT,
 		SoD::constants::EXPANSIONS_MASK,
@@ -82,7 +82,7 @@ static const EQEmu::constants::LookupEntry constants_static_lookup_entries[EQEmu
 		SoD::constants::SAY_LINK_BODY_SIZE
 	),
 	/*[ClientVersion::UF] =*/
-	EQEmu::constants::LookupEntry(
+	EQ::constants::LookupEntry(
 		UF::constants::EXPANSION,
 		UF::constants::EXPANSION_BIT,
 		UF::constants::EXPANSIONS_MASK,
@@ -90,7 +90,7 @@ static const EQEmu::constants::LookupEntry constants_static_lookup_entries[EQEmu
 		UF::constants::SAY_LINK_BODY_SIZE
 	),
 	/*[ClientVersion::RoF] =*/
-	EQEmu::constants::LookupEntry(
+	EQ::constants::LookupEntry(
 		RoF::constants::EXPANSION,
 		RoF::constants::EXPANSION_BIT,
 		RoF::constants::EXPANSIONS_MASK,
@@ -98,7 +98,7 @@ static const EQEmu::constants::LookupEntry constants_static_lookup_entries[EQEmu
 		RoF::constants::SAY_LINK_BODY_SIZE
 	),
 	/*[ClientVersion::RoF2] =*/
-	EQEmu::constants::LookupEntry(
+	EQ::constants::LookupEntry(
 		RoF2::constants::EXPANSION,
 		RoF2::constants::EXPANSION_BIT,
 		RoF2::constants::EXPANSIONS_MASK,
@@ -108,7 +108,7 @@ static const EQEmu::constants::LookupEntry constants_static_lookup_entries[EQEmu
 };
 
 static bool constants_dictionary_init = false;
-void EQEmu::constants::InitializeDynamicLookups() {
+void EQ::constants::InitializeDynamicLookups() {
 	if (constants_dictionary_init == true)
 		return;
 	constants_dictionary_init = true;
@@ -119,7 +119,7 @@ void EQEmu::constants::InitializeDynamicLookups() {
 	// use static references for now
 }
 
-const EQEmu::constants::LookupEntry* EQEmu::constants::DynamicLookup(versions::ClientVersion client_version, bool gm_flag)
+const EQ::constants::LookupEntry* EQ::constants::DynamicLookup(versions::ClientVersion client_version, bool gm_flag)
 {
 	if (gm_flag)
 		return DynamicGMLookup(client_version);
@@ -127,7 +127,7 @@ const EQEmu::constants::LookupEntry* EQEmu::constants::DynamicLookup(versions::C
 		return DynamicNonGMLookup(client_version);
 }
 
-const EQEmu::constants::LookupEntry* EQEmu::constants::DynamicNonGMLookup(versions::ClientVersion client_version)
+const EQ::constants::LookupEntry* EQ::constants::DynamicNonGMLookup(versions::ClientVersion client_version)
 {
 	client_version = versions::ValidateClientVersion(client_version);
 	if (constants_dynamic_nongm_lookup_entries[static_cast<int>(client_version)])
@@ -136,7 +136,7 @@ const EQEmu::constants::LookupEntry* EQEmu::constants::DynamicNonGMLookup(versio
 	return &constants_static_lookup_entries[static_cast<int>(client_version)];
 }
 
-const EQEmu::constants::LookupEntry* EQEmu::constants::DynamicGMLookup(versions::ClientVersion client_version)
+const EQ::constants::LookupEntry* EQ::constants::DynamicGMLookup(versions::ClientVersion client_version)
 {
 	client_version = versions::ValidateClientVersion(client_version);
 	if (constants_dynamic_gm_lookup_entries[static_cast<int>(client_version)])
@@ -145,18 +145,18 @@ const EQEmu::constants::LookupEntry* EQEmu::constants::DynamicGMLookup(versions:
 	return &constants_static_lookup_entries[static_cast<int>(client_version)];
 }
 
-const EQEmu::constants::LookupEntry* EQEmu::constants::StaticLookup(versions::ClientVersion client_version)
+const EQ::constants::LookupEntry* EQ::constants::StaticLookup(versions::ClientVersion client_version)
 {
 	return &constants_static_lookup_entries[static_cast<int>(versions::ValidateClientVersion(client_version))];
 }
 
-static std::unique_ptr<EQEmu::inventory::LookupEntry> inventory_dynamic_nongm_lookup_entries[EQEmu::versions::MobVersionCount];
-static std::unique_ptr<EQEmu::inventory::LookupEntry> inventory_dynamic_gm_lookup_entries[EQEmu::versions::MobVersionCount];
-static const EQEmu::inventory::LookupEntry inventory_static_lookup_entries[EQEmu::versions::MobVersionCount] =
+static std::unique_ptr<EQ::inventory::LookupEntry> inventory_dynamic_nongm_lookup_entries[EQ::versions::MobVersionCount];
+static std::unique_ptr<EQ::inventory::LookupEntry> inventory_dynamic_gm_lookup_entries[EQ::versions::MobVersionCount];
+static const EQ::inventory::LookupEntry inventory_static_lookup_entries[EQ::versions::MobVersionCount] =
 {
 	/*[MobVersion::Unknown] =*/
-	EQEmu::inventory::LookupEntry(
-		EQEmu::inventory::LookupEntry::InventoryTypeSize_Struct(
+	EQ::inventory::LookupEntry(
+		EQ::inventory::LookupEntry::InventoryTypeSize_Struct(
 			ClientUnknown::INULL, ClientUnknown::INULL, ClientUnknown::INULL,
 			ClientUnknown::INULL, ClientUnknown::INULL, ClientUnknown::INULL,
 			ClientUnknown::INULL, ClientUnknown::INULL, ClientUnknown::INULL,
@@ -182,8 +182,8 @@ static const EQEmu::inventory::LookupEntry inventory_static_lookup_entries[EQEmu
 		false
 	),
 	/*[MobVersion::Client62] =*/
-	EQEmu::inventory::LookupEntry(
-		EQEmu::inventory::LookupEntry::InventoryTypeSize_Struct(
+	EQ::inventory::LookupEntry(
+		EQ::inventory::LookupEntry::InventoryTypeSize_Struct(
 			Client62::INULL, Client62::INULL, Client62::INULL,
 			Client62::INULL, Client62::INULL, Client62::INULL,
 			Client62::INULL, Client62::INULL, Client62::INULL,
@@ -209,9 +209,9 @@ static const EQEmu::inventory::LookupEntry inventory_static_lookup_entries[EQEmu
 		false
 	),
 	/*[MobVersion::Titanium] =*/
-	EQEmu::inventory::LookupEntry(
-		EQEmu::inventory::LookupEntry::InventoryTypeSize_Struct(
-			EQEmu::invtype::POSSESSIONS_SIZE,		Titanium::invtype::BANK_SIZE,			Titanium::invtype::SHARED_BANK_SIZE,
+	EQ::inventory::LookupEntry(
+		EQ::inventory::LookupEntry::InventoryTypeSize_Struct(
+			EQ::invtype::POSSESSIONS_SIZE,		Titanium::invtype::BANK_SIZE,			Titanium::invtype::SHARED_BANK_SIZE,
 			Titanium::invtype::TRADE_SIZE,			Titanium::invtype::WORLD_SIZE,			Titanium::invtype::LIMBO_SIZE,
 			Titanium::invtype::TRIBUTE_SIZE,		Titanium::INULL,						Titanium::invtype::GUILD_TRIBUTE_SIZE,
 			Titanium::invtype::MERCHANT_SIZE,		Titanium::INULL,						Titanium::invtype::CORPSE_SIZE,
@@ -236,9 +236,9 @@ static const EQEmu::inventory::LookupEntry inventory_static_lookup_entries[EQEmu
 		Titanium::inventory::AllowOverLevelEquipment
 	),
 	/*[MobVersion::SoF] =*/
-	EQEmu::inventory::LookupEntry(
-		EQEmu::inventory::LookupEntry::InventoryTypeSize_Struct(
-			EQEmu::invtype::POSSESSIONS_SIZE,	SoF::invtype::BANK_SIZE,			SoF::invtype::SHARED_BANK_SIZE,
+	EQ::inventory::LookupEntry(
+		EQ::inventory::LookupEntry::InventoryTypeSize_Struct(
+			EQ::invtype::POSSESSIONS_SIZE,	SoF::invtype::BANK_SIZE,			SoF::invtype::SHARED_BANK_SIZE,
 			SoF::invtype::TRADE_SIZE,			SoF::invtype::WORLD_SIZE,			SoF::invtype::LIMBO_SIZE,
 			SoF::invtype::TRIBUTE_SIZE,			SoF::INULL,							SoF::invtype::GUILD_TRIBUTE_SIZE,
 			SoF::invtype::MERCHANT_SIZE,		SoF::INULL,							SoF::invtype::CORPSE_SIZE,
@@ -263,9 +263,9 @@ static const EQEmu::inventory::LookupEntry inventory_static_lookup_entries[EQEmu
 		SoF::inventory::AllowOverLevelEquipment
 	),
 	/*[MobVersion::SoD] =*/
-	EQEmu::inventory::LookupEntry(
-		EQEmu::inventory::LookupEntry::InventoryTypeSize_Struct(
-			EQEmu::invtype::POSSESSIONS_SIZE,	SoD::invtype::BANK_SIZE,			SoD::invtype::SHARED_BANK_SIZE,
+	EQ::inventory::LookupEntry(
+		EQ::inventory::LookupEntry::InventoryTypeSize_Struct(
+			EQ::invtype::POSSESSIONS_SIZE,	SoD::invtype::BANK_SIZE,			SoD::invtype::SHARED_BANK_SIZE,
 			SoD::invtype::TRADE_SIZE,			SoD::invtype::WORLD_SIZE,			SoD::invtype::LIMBO_SIZE,
 			SoD::invtype::TRIBUTE_SIZE,			SoD::INULL,							SoD::invtype::GUILD_TRIBUTE_SIZE,
 			SoD::invtype::MERCHANT_SIZE,		SoD::INULL,							SoD::invtype::CORPSE_SIZE,
@@ -290,9 +290,9 @@ static const EQEmu::inventory::LookupEntry inventory_static_lookup_entries[EQEmu
 		SoD::inventory::AllowOverLevelEquipment
 	),
 	/*[MobVersion::UF] =*/
-	EQEmu::inventory::LookupEntry(
-		EQEmu::inventory::LookupEntry::InventoryTypeSize_Struct(
-			EQEmu::invtype::POSSESSIONS_SIZE,	UF::invtype::BANK_SIZE,				UF::invtype::SHARED_BANK_SIZE,
+	EQ::inventory::LookupEntry(
+		EQ::inventory::LookupEntry::InventoryTypeSize_Struct(
+			EQ::invtype::POSSESSIONS_SIZE,	UF::invtype::BANK_SIZE,				UF::invtype::SHARED_BANK_SIZE,
 			UF::invtype::TRADE_SIZE,			UF::invtype::WORLD_SIZE,			UF::invtype::LIMBO_SIZE,
 			UF::invtype::TRIBUTE_SIZE,			UF::INULL,							UF::invtype::GUILD_TRIBUTE_SIZE,
 			UF::invtype::MERCHANT_SIZE,			UF::INULL,							UF::invtype::CORPSE_SIZE,
@@ -317,9 +317,9 @@ static const EQEmu::inventory::LookupEntry inventory_static_lookup_entries[EQEmu
 		UF::inventory::AllowOverLevelEquipment
 	),
 	/*[MobVersion::RoF] =*/
-	EQEmu::inventory::LookupEntry(
-		EQEmu::inventory::LookupEntry::InventoryTypeSize_Struct(
-			EQEmu::invtype::POSSESSIONS_SIZE,	RoF::invtype::BANK_SIZE,					RoF::invtype::SHARED_BANK_SIZE,
+	EQ::inventory::LookupEntry(
+		EQ::inventory::LookupEntry::InventoryTypeSize_Struct(
+			EQ::invtype::POSSESSIONS_SIZE,	RoF::invtype::BANK_SIZE,					RoF::invtype::SHARED_BANK_SIZE,
 			RoF::invtype::TRADE_SIZE,			RoF::invtype::WORLD_SIZE,					RoF::invtype::LIMBO_SIZE,
 			RoF::invtype::TRIBUTE_SIZE,			RoF::invtype::TROPHY_TRIBUTE_SIZE,			RoF::invtype::GUILD_TRIBUTE_SIZE,
 			RoF::invtype::MERCHANT_SIZE,		RoF::invtype::DELETED_SIZE,					RoF::invtype::CORPSE_SIZE,
@@ -344,9 +344,9 @@ static const EQEmu::inventory::LookupEntry inventory_static_lookup_entries[EQEmu
 		RoF::inventory::AllowOverLevelEquipment
 	),
 	/*[MobVersion::RoF2] =*/
-	EQEmu::inventory::LookupEntry(
-		EQEmu::inventory::LookupEntry::InventoryTypeSize_Struct(
-			EQEmu::invtype::POSSESSIONS_SIZE,	RoF2::invtype::BANK_SIZE,					RoF2::invtype::SHARED_BANK_SIZE,
+	EQ::inventory::LookupEntry(
+		EQ::inventory::LookupEntry::InventoryTypeSize_Struct(
+			EQ::invtype::POSSESSIONS_SIZE,	RoF2::invtype::BANK_SIZE,					RoF2::invtype::SHARED_BANK_SIZE,
 			RoF2::invtype::TRADE_SIZE,			RoF2::invtype::WORLD_SIZE,					RoF2::invtype::LIMBO_SIZE,
 			RoF2::invtype::TRIBUTE_SIZE,		RoF2::invtype::TROPHY_TRIBUTE_SIZE,			RoF2::invtype::GUILD_TRIBUTE_SIZE,
 			RoF2::invtype::MERCHANT_SIZE,		RoF2::invtype::DELETED_SIZE,				RoF2::invtype::CORPSE_SIZE,
@@ -371,9 +371,9 @@ static const EQEmu::inventory::LookupEntry inventory_static_lookup_entries[EQEmu
 		RoF2::inventory::AllowOverLevelEquipment
 	),
 	/*[MobVersion::NPC] =*/
-	EQEmu::inventory::LookupEntry(
-		EQEmu::inventory::LookupEntry::InventoryTypeSize_Struct(
-			EQEmu::invtype::POSSESSIONS_SIZE,		EntityLimits::NPC::INULL,	EntityLimits::NPC::INULL,
+	EQ::inventory::LookupEntry(
+		EQ::inventory::LookupEntry::InventoryTypeSize_Struct(
+			EQ::invtype::POSSESSIONS_SIZE,		EntityLimits::NPC::INULL,	EntityLimits::NPC::INULL,
 			EntityLimits::NPC::invtype::TRADE_SIZE,	EntityLimits::NPC::INULL,	EntityLimits::NPC::INULL,
 			EntityLimits::NPC::INULL,				EntityLimits::NPC::INULL,	EntityLimits::NPC::INULL,
 			EntityLimits::NPC::INULL,				EntityLimits::NPC::INULL,	EntityLimits::NPC::INULL, /*InvTypeCorpseSize,*/
@@ -389,8 +389,8 @@ static const EQEmu::inventory::LookupEntry inventory_static_lookup_entries[EQEmu
 		EntityLimits::NPC::INULL,
 		EntityLimits::NPC::INULL,
 		EntityLimits::NPC::INULL,
-		0, //EQEmu::inventory::ContainerCount, /*ItemBagSize,*/
-		0, //EQEmu::inventory::SocketCount, /*ItemAugSize,*/
+		0, //EQ::inventory::ContainerCount, /*ItemBagSize,*/
+		0, //EQ::inventory::SocketCount, /*ItemAugSize,*/
 
 		false,
 		false,
@@ -398,9 +398,9 @@ static const EQEmu::inventory::LookupEntry inventory_static_lookup_entries[EQEmu
 		false
 	),
 	/*[MobVersion::NPCMerchant] =*/
-	EQEmu::inventory::LookupEntry(
-		EQEmu::inventory::LookupEntry::InventoryTypeSize_Struct(
-			EQEmu::invtype::POSSESSIONS_SIZE, /*InvTypePossessionsSize,*/	EntityLimits::NPCMerchant::INULL,	EntityLimits::NPCMerchant::INULL,
+	EQ::inventory::LookupEntry(
+		EQ::inventory::LookupEntry::InventoryTypeSize_Struct(
+			EQ::invtype::POSSESSIONS_SIZE, /*InvTypePossessionsSize,*/	EntityLimits::NPCMerchant::INULL,	EntityLimits::NPCMerchant::INULL,
 			EntityLimits::NPCMerchant::invtype::TRADE_SIZE,					EntityLimits::NPCMerchant::INULL,	EntityLimits::NPCMerchant::INULL,
 			EntityLimits::NPCMerchant::INULL,								EntityLimits::NPCMerchant::INULL,	EntityLimits::NPCMerchant::INULL,
 			EntityLimits::NPCMerchant::INULL,								EntityLimits::NPCMerchant::INULL,	EntityLimits::NPCMerchant::INULL, /*InvTypeCorpseSize,*/
@@ -416,8 +416,8 @@ static const EQEmu::inventory::LookupEntry inventory_static_lookup_entries[EQEmu
 		EntityLimits::NPCMerchant::INULL,
 		EntityLimits::NPCMerchant::INULL,
 		EntityLimits::NPCMerchant::INULL,
-		0, //EQEmu::inventory::ContainerCount, /*ItemBagSize,*/
-		0, //EQEmu::inventory::SocketCount, /*ItemAugSize,*/
+		0, //EQ::inventory::ContainerCount, /*ItemBagSize,*/
+		0, //EQ::inventory::SocketCount, /*ItemAugSize,*/
 
 		false,
 		false,
@@ -425,9 +425,9 @@ static const EQEmu::inventory::LookupEntry inventory_static_lookup_entries[EQEmu
 		false
 	),
 	/*[MobVersion::Merc] =*/
-	EQEmu::inventory::LookupEntry(
-		EQEmu::inventory::LookupEntry::InventoryTypeSize_Struct(
-			EQEmu::invtype::POSSESSIONS_SIZE, /*InvTypePossessionsSize,*/	EntityLimits::Merc::INULL,	EntityLimits::Merc::INULL,
+	EQ::inventory::LookupEntry(
+		EQ::inventory::LookupEntry::InventoryTypeSize_Struct(
+			EQ::invtype::POSSESSIONS_SIZE, /*InvTypePossessionsSize,*/	EntityLimits::Merc::INULL,	EntityLimits::Merc::INULL,
 			EntityLimits::Merc::invtype::TRADE_SIZE,						EntityLimits::Merc::INULL,	EntityLimits::Merc::INULL,
 			EntityLimits::Merc::INULL,										EntityLimits::Merc::INULL,	EntityLimits::Merc::INULL,
 			EntityLimits::Merc::INULL,										EntityLimits::Merc::INULL,	EntityLimits::Merc::INULL, /*InvTypeCorpseSize,*/
@@ -443,8 +443,8 @@ static const EQEmu::inventory::LookupEntry inventory_static_lookup_entries[EQEmu
 		EntityLimits::Merc::INULL,
 		EntityLimits::Merc::INULL,
 		EntityLimits::Merc::INULL,
-		0, //EQEmu::inventory::ContainerCount, /*ItemBagSize,*/
-		0, //EQEmu::inventory::SocketCount, /*ItemAugSize,*/
+		0, //EQ::inventory::ContainerCount, /*ItemBagSize,*/
+		0, //EQ::inventory::SocketCount, /*ItemAugSize,*/
 
 		false,
 		false,
@@ -452,9 +452,9 @@ static const EQEmu::inventory::LookupEntry inventory_static_lookup_entries[EQEmu
 		false
 	),
 	/*[MobVersion::Bot] =*/
-	EQEmu::inventory::LookupEntry(
-		EQEmu::inventory::LookupEntry::InventoryTypeSize_Struct(
-			EQEmu::invtype::POSSESSIONS_SIZE, /*InvTypePossessionsSize,*/	EntityLimits::Bot::INULL,	EntityLimits::Bot::INULL,
+	EQ::inventory::LookupEntry(
+		EQ::inventory::LookupEntry::InventoryTypeSize_Struct(
+			EQ::invtype::POSSESSIONS_SIZE, /*InvTypePossessionsSize,*/	EntityLimits::Bot::INULL,	EntityLimits::Bot::INULL,
 			EntityLimits::Bot::invtype::TRADE_SIZE,							EntityLimits::Bot::INULL,	EntityLimits::Bot::INULL,
 			EntityLimits::Bot::INULL,										EntityLimits::Bot::INULL,	EntityLimits::Bot::INULL,
 			EntityLimits::Bot::INULL,										EntityLimits::Bot::INULL,	EntityLimits::Bot::INULL, /*InvTypeCorpseSize,*/
@@ -470,8 +470,8 @@ static const EQEmu::inventory::LookupEntry inventory_static_lookup_entries[EQEmu
 		EntityLimits::Bot::invslot::CURSOR_BITMASK,
 		EntityLimits::Bot::invslot::POSSESSIONS_BITMASK,
 		EntityLimits::Bot::INULL,
-		0, //EQEmu::inventory::ContainerCount, /*ItemBagSize,*/
-		EQEmu::invaug::SOCKET_COUNT, //EQEmu::inventory::SocketCount, /*ItemAugSize,*/
+		0, //EQ::inventory::ContainerCount, /*ItemBagSize,*/
+		EQ::invaug::SOCKET_COUNT, //EQ::inventory::SocketCount, /*ItemAugSize,*/
 
 		false,
 		false,
@@ -479,9 +479,9 @@ static const EQEmu::inventory::LookupEntry inventory_static_lookup_entries[EQEmu
 		false
 	),
 	/*[MobVersion::ClientPet] =*/
-	EQEmu::inventory::LookupEntry(
-		EQEmu::inventory::LookupEntry::InventoryTypeSize_Struct(
-			EQEmu::invtype::POSSESSIONS_SIZE, /*InvTypePossessionsSize,*/	EntityLimits::ClientPet::INULL,	EntityLimits::ClientPet::INULL,
+	EQ::inventory::LookupEntry(
+		EQ::inventory::LookupEntry::InventoryTypeSize_Struct(
+			EQ::invtype::POSSESSIONS_SIZE, /*InvTypePossessionsSize,*/	EntityLimits::ClientPet::INULL,	EntityLimits::ClientPet::INULL,
 			EntityLimits::ClientPet::invtype::TRADE_SIZE,					EntityLimits::ClientPet::INULL,	EntityLimits::ClientPet::INULL,
 			EntityLimits::ClientPet::INULL,									EntityLimits::ClientPet::INULL,	EntityLimits::ClientPet::INULL,
 			EntityLimits::ClientPet::INULL,									EntityLimits::ClientPet::INULL,	EntityLimits::ClientPet::INULL, /*InvTypeCorpseSize,*/
@@ -497,8 +497,8 @@ static const EQEmu::inventory::LookupEntry inventory_static_lookup_entries[EQEmu
 		EntityLimits::ClientPet::INULL,
 		EntityLimits::ClientPet::INULL,
 		EntityLimits::ClientPet::INULL,
-		0, //EQEmu::inventory::ContainerCount, /*ItemBagSize,*/
-		0, //EQEmu::inventory::SocketCount, /*ItemAugSize,*/
+		0, //EQ::inventory::ContainerCount, /*ItemBagSize,*/
+		0, //EQ::inventory::SocketCount, /*ItemAugSize,*/
 
 		false,
 		false,
@@ -506,9 +506,9 @@ static const EQEmu::inventory::LookupEntry inventory_static_lookup_entries[EQEmu
 		false
 	),
 	/*[MobVersion::NPCPet] =*/
-	EQEmu::inventory::LookupEntry(
-		EQEmu::inventory::LookupEntry::InventoryTypeSize_Struct(
-			EQEmu::invtype::POSSESSIONS_SIZE, /*InvTypePossessionsSize,*/	EntityLimits::NPCPet::INULL,	EntityLimits::NPCPet::INULL,
+	EQ::inventory::LookupEntry(
+		EQ::inventory::LookupEntry::InventoryTypeSize_Struct(
+			EQ::invtype::POSSESSIONS_SIZE, /*InvTypePossessionsSize,*/	EntityLimits::NPCPet::INULL,	EntityLimits::NPCPet::INULL,
 			EntityLimits::NPCPet::invtype::TRADE_SIZE,						EntityLimits::NPCPet::INULL,	EntityLimits::NPCPet::INULL,
 			EntityLimits::NPCPet::INULL,									EntityLimits::NPCPet::INULL,	EntityLimits::NPCPet::INULL,
 			EntityLimits::NPCPet::INULL,									EntityLimits::NPCPet::INULL,	EntityLimits::NPCPet::INULL, /*InvTypeCorpseSize,*/
@@ -524,8 +524,8 @@ static const EQEmu::inventory::LookupEntry inventory_static_lookup_entries[EQEmu
 		EntityLimits::NPCPet::INULL,
 		EntityLimits::NPCPet::INULL,
 		EntityLimits::NPCPet::INULL,
-		0, //EQEmu::inventory::ContainerCount, /*ItemBagSize,*/
-		0, //EQEmu::inventory::SocketCount, /*ItemAugSize,*/
+		0, //EQ::inventory::ContainerCount, /*ItemBagSize,*/
+		0, //EQ::inventory::SocketCount, /*ItemAugSize,*/
 
 		false,
 		false,
@@ -533,9 +533,9 @@ static const EQEmu::inventory::LookupEntry inventory_static_lookup_entries[EQEmu
 		false
 	),
 	/*[MobVersion::MercPet] =*/
-	EQEmu::inventory::LookupEntry(
-		EQEmu::inventory::LookupEntry::InventoryTypeSize_Struct(
-			EQEmu::invtype::POSSESSIONS_SIZE, /*InvTypePossessionsSize,*/	EntityLimits::MercPet::INULL,	EntityLimits::MercPet::INULL,
+	EQ::inventory::LookupEntry(
+		EQ::inventory::LookupEntry::InventoryTypeSize_Struct(
+			EQ::invtype::POSSESSIONS_SIZE, /*InvTypePossessionsSize,*/	EntityLimits::MercPet::INULL,	EntityLimits::MercPet::INULL,
 			EntityLimits::MercPet::invtype::TRADE_SIZE,						EntityLimits::MercPet::INULL,	EntityLimits::MercPet::INULL,
 			EntityLimits::MercPet::INULL,									EntityLimits::MercPet::INULL,	EntityLimits::MercPet::INULL,
 			EntityLimits::MercPet::INULL,									EntityLimits::MercPet::INULL,	EntityLimits::MercPet::INULL, /*InvTypeCorpseSize,*/
@@ -551,8 +551,8 @@ static const EQEmu::inventory::LookupEntry inventory_static_lookup_entries[EQEmu
 		EntityLimits::MercPet::INULL,
 		EntityLimits::MercPet::INULL,
 		EntityLimits::MercPet::INULL,
-		0, //EQEmu::inventory::ContainerCount, /*ItemBagSize,*/
-		0, //EQEmu::inventory::SocketCount, /*ItemAugSize,*/
+		0, //EQ::inventory::ContainerCount, /*ItemBagSize,*/
+		0, //EQ::inventory::SocketCount, /*ItemAugSize,*/
 
 		false,
 		false,
@@ -560,9 +560,9 @@ static const EQEmu::inventory::LookupEntry inventory_static_lookup_entries[EQEmu
 		false
 	),
 	/*[MobVersion::BotPet] =*/
-	EQEmu::inventory::LookupEntry(
-		EQEmu::inventory::LookupEntry::InventoryTypeSize_Struct(
-			EQEmu::invtype::POSSESSIONS_SIZE, /*InvTypePossessionsSize,*/	EntityLimits::BotPet::INULL,	EntityLimits::BotPet::INULL,
+	EQ::inventory::LookupEntry(
+		EQ::inventory::LookupEntry::InventoryTypeSize_Struct(
+			EQ::invtype::POSSESSIONS_SIZE, /*InvTypePossessionsSize,*/	EntityLimits::BotPet::INULL,	EntityLimits::BotPet::INULL,
 			EntityLimits::BotPet::invtype::TRADE_SIZE,						EntityLimits::BotPet::INULL,	EntityLimits::BotPet::INULL,
 			EntityLimits::BotPet::INULL,									EntityLimits::BotPet::INULL,	EntityLimits::BotPet::INULL,
 			EntityLimits::BotPet::INULL,									EntityLimits::BotPet::INULL,	EntityLimits::BotPet::INULL, /*InvTypeCorpseSize,*/
@@ -578,8 +578,8 @@ static const EQEmu::inventory::LookupEntry inventory_static_lookup_entries[EQEmu
 		EntityLimits::BotPet::INULL,
 		EntityLimits::BotPet::INULL,
 		EntityLimits::BotPet::INULL,
-		0, //EQEmu::inventory::ContainerCount, /*ItemBagSize,*/
-		0, //EQEmu::inventory::SocketCount, /*ItemAugSize,*/
+		0, //EQ::inventory::ContainerCount, /*ItemBagSize,*/
+		0, //EQ::inventory::SocketCount, /*ItemAugSize,*/
 
 		false,
 		false,
@@ -587,8 +587,8 @@ static const EQEmu::inventory::LookupEntry inventory_static_lookup_entries[EQEmu
 		false
 	),
 	/*[MobVersion::OfflineTitanium] =*/
-	EQEmu::inventory::LookupEntry(
-		EQEmu::inventory::LookupEntry::InventoryTypeSize_Struct(
+	EQ::inventory::LookupEntry(
+		EQ::inventory::LookupEntry::InventoryTypeSize_Struct(
 			Titanium::INULL,						Titanium::INULL,						Titanium::INULL,
 			Titanium::invtype::TRADE_SIZE,			Titanium::INULL,						Titanium::INULL,
 			Titanium::INULL,						Titanium::INULL,						Titanium::INULL,
@@ -614,8 +614,8 @@ static const EQEmu::inventory::LookupEntry inventory_static_lookup_entries[EQEmu
 		false
 	),
 	/*[MobVersion::OfflineSoF] =*/
-	EQEmu::inventory::LookupEntry(
-		EQEmu::inventory::LookupEntry::InventoryTypeSize_Struct(
+	EQ::inventory::LookupEntry(
+		EQ::inventory::LookupEntry::InventoryTypeSize_Struct(
 			SoF::INULL,							SoF::INULL,							SoF::INULL,
 			SoF::invtype::TRADE_SIZE,			SoF::INULL,							SoF::INULL,
 			SoF::INULL,							SoF::INULL,							SoF::INULL,
@@ -641,8 +641,8 @@ static const EQEmu::inventory::LookupEntry inventory_static_lookup_entries[EQEmu
 		false
 	),
 	/*[MobVersion::OfflineSoD] =*/
-	EQEmu::inventory::LookupEntry(
-		EQEmu::inventory::LookupEntry::InventoryTypeSize_Struct(
+	EQ::inventory::LookupEntry(
+		EQ::inventory::LookupEntry::InventoryTypeSize_Struct(
 			SoD::INULL,							SoD::INULL,							SoD::INULL,
 			SoD::invtype::TRADE_SIZE,			SoD::INULL,							SoD::INULL,
 			SoD::INULL,							SoD::INULL,							SoD::INULL,
@@ -668,8 +668,8 @@ static const EQEmu::inventory::LookupEntry inventory_static_lookup_entries[EQEmu
 		false
 	),
 	/*[MobVersion::OfflineUF] =*/
-	EQEmu::inventory::LookupEntry(
-		EQEmu::inventory::LookupEntry::InventoryTypeSize_Struct(
+	EQ::inventory::LookupEntry(
+		EQ::inventory::LookupEntry::InventoryTypeSize_Struct(
 			UF::INULL,							UF::INULL,							UF::INULL,
 			UF::invtype::TRADE_SIZE,			UF::INULL,							UF::INULL,
 			UF::INULL,							UF::INULL,							UF::INULL,
@@ -695,8 +695,8 @@ static const EQEmu::inventory::LookupEntry inventory_static_lookup_entries[EQEmu
 		false
 	),
 	/*[MobVersion::OfflineRoF] =*/
-	EQEmu::inventory::LookupEntry(
-		EQEmu::inventory::LookupEntry::InventoryTypeSize_Struct(
+	EQ::inventory::LookupEntry(
+		EQ::inventory::LookupEntry::InventoryTypeSize_Struct(
 			RoF::INULL,							RoF::INULL,							RoF::INULL,
 			RoF::invtype::TRADE_SIZE,			RoF::INULL,							RoF::INULL,
 			RoF::INULL,							RoF::INULL,							RoF::INULL,
@@ -722,8 +722,8 @@ static const EQEmu::inventory::LookupEntry inventory_static_lookup_entries[EQEmu
 		false
 	),
 	/*[MobVersion::OfflineRoF2] =*/
-	EQEmu::inventory::LookupEntry(
-		EQEmu::inventory::LookupEntry::InventoryTypeSize_Struct(
+	EQ::inventory::LookupEntry(
+		EQ::inventory::LookupEntry::InventoryTypeSize_Struct(
 			RoF2::INULL,						RoF2::INULL,						RoF2::INULL,
 			RoF2::invtype::TRADE_SIZE,			RoF2::INULL,						RoF2::INULL,
 			RoF2::INULL,						RoF2::INULL,						RoF2::INULL,
@@ -751,7 +751,7 @@ static const EQEmu::inventory::LookupEntry inventory_static_lookup_entries[EQEmu
 };
 
 static bool inventory_dictionary_init = false;
-void EQEmu::inventory::InitializeDynamicLookups() {
+void EQ::inventory::InitializeDynamicLookups() {
 	if (inventory_dictionary_init == true)
 		return;
 	inventory_dictionary_init = true;
@@ -774,9 +774,9 @@ void EQEmu::inventory::InitializeDynamicLookups() {
 
 	const uint32 dynamic_check_mask = 
 		(
-			EQEmu::expansions::bitPoR |
-			EQEmu::expansions::bitTBS |
-			EQEmu::expansions::bitHoT
+			EQ::expansions::bitPoR |
+			EQ::expansions::bitTBS |
+			EQ::expansions::bitHoT
 		);
 
 	// if all of the above expansion bits are present, then static references will suffice
@@ -784,7 +784,7 @@ void EQEmu::inventory::InitializeDynamicLookups() {
 		return;
 
 	// Dynamic Lookups (promotive methodology) (all mob versions allowed)
-	for (uint32 iter = static_cast<uint32>(EQEmu::versions::MobVersion::Unknown); iter <= static_cast<uint32>(EQEmu::versions::LastPCMobVersion); ++iter) {
+	for (uint32 iter = static_cast<uint32>(EQ::versions::MobVersion::Unknown); iter <= static_cast<uint32>(EQ::versions::LastPCMobVersion); ++iter) {
 		// no need to dynamic this condition since it is the lowest compatibility standard
 		if ((dynamic_check_mask & ~constants_static_lookup_entries[iter].ExpansionsMask) == dynamic_check_mask)
 			continue;
@@ -803,21 +803,21 @@ void EQEmu::inventory::InitializeDynamicLookups() {
 		inventory_dynamic_nongm_lookup_entries[iter]->PossessionsBitmask = 0; // we'll fix later
 		inventory_dynamic_nongm_lookup_entries[iter]->CorpseBitmask = 0; // we'll fix later
 
-		if (RuleI(World, ExpansionSettings) & EQEmu::expansions::bitPoR) {
+		if (RuleI(World, ExpansionSettings) & EQ::expansions::bitPoR) {
 			// update bank size
-			if (constants_static_lookup_entries[iter].ExpansionsMask & EQEmu::expansions::bitPoR)
+			if (constants_static_lookup_entries[iter].ExpansionsMask & EQ::expansions::bitPoR)
 				inventory_dynamic_nongm_lookup_entries[iter]->InventoryTypeSize.Bank = SoF::invtype::BANK_SIZE;
 		}
 
-		if (RuleI(World, ExpansionSettings) & EQEmu::expansions::bitTBS) {
+		if (RuleI(World, ExpansionSettings) & EQ::expansions::bitTBS) {
 			// update power source
-			if (constants_static_lookup_entries[iter].ExpansionsMask & EQEmu::expansions::bitTBS)
+			if (constants_static_lookup_entries[iter].ExpansionsMask & EQ::expansions::bitTBS)
 				inventory_dynamic_nongm_lookup_entries[iter]->EquipmentBitmask = SoF::invslot::EQUIPMENT_BITMASK;
 		}
 
-		if (RuleI(World, ExpansionSettings) & EQEmu::expansions::bitHoT) {
+		if (RuleI(World, ExpansionSettings) & EQ::expansions::bitHoT) {
 			// update general size
-			if (constants_static_lookup_entries[iter].ExpansionsMask & EQEmu::expansions::bitHoT)
+			if (constants_static_lookup_entries[iter].ExpansionsMask & EQ::expansions::bitHoT)
 				inventory_dynamic_nongm_lookup_entries[iter]->GeneralBitmask = RoF::invslot::GENERAL_BITMASK;
 		}
 
@@ -841,7 +841,7 @@ void EQEmu::inventory::InitializeDynamicLookups() {
 	}
 
 	// Dynamic GM Lookups (demotive methodology) (client-linked mob versions only)
-	for (uint32 iter = static_cast<uint32>(EQEmu::versions::MobVersion::Unknown); iter <= static_cast<uint32>(EQEmu::versions::LastPCMobVersion); ++iter) {
+	for (uint32 iter = static_cast<uint32>(EQ::versions::MobVersion::Unknown); iter <= static_cast<uint32>(EQ::versions::LastPCMobVersion); ++iter) {
 		// no need to dynamic this condition since it is the lowest compatibility standard
 		if ((dynamic_check_mask & ~constants_static_lookup_entries[iter].ExpansionsMask) == dynamic_check_mask)
 			continue;
@@ -869,13 +869,13 @@ void EQEmu::inventory::InitializeDynamicLookups() {
 		inventory_dynamic_gm_lookup_entries[iter]->PossessionsBitmask = 0; // we'll fix later
 		inventory_dynamic_gm_lookup_entries[iter]->CorpseBitmask = 0; // we'll fix later
 
-		if (~RuleI(World, ExpansionSettings) & EQEmu::expansions::bitPoR) {
+		if (~RuleI(World, ExpansionSettings) & EQ::expansions::bitPoR) {
 			// update bank size
-			if (constants_static_lookup_entries[iter].ExpansionsMask & EQEmu::expansions::bitPoR)
+			if (constants_static_lookup_entries[iter].ExpansionsMask & EQ::expansions::bitPoR)
 				inventory_dynamic_gm_lookup_entries[iter]->InventoryTypeSize.Bank = Titanium::invtype::BANK_SIZE;
 		}
 
-		if (~RuleI(World, ExpansionSettings) & EQEmu::expansions::bitTBS) {
+		if (~RuleI(World, ExpansionSettings) & EQ::expansions::bitTBS) {
 			// update power source
 			switch (iter) {
 			case versions::bitUF:
@@ -890,7 +890,7 @@ void EQEmu::inventory::InitializeDynamicLookups() {
 			}
 		}
 
-		if (~RuleI(World, ExpansionSettings) & EQEmu::expansions::bitHoT) {
+		if (~RuleI(World, ExpansionSettings) & EQ::expansions::bitHoT) {
 			// update general size
 			switch (iter) {
 			case versions::bitUF:
@@ -927,7 +927,7 @@ void EQEmu::inventory::InitializeDynamicLookups() {
 	// only client versions that require a change from their static definitions have been given a dynamic (gm) lookup entry
 }
 
-const EQEmu::inventory::LookupEntry* EQEmu::inventory::DynamicLookup(versions::MobVersion mob_version, bool gm_flag)
+const EQ::inventory::LookupEntry* EQ::inventory::DynamicLookup(versions::MobVersion mob_version, bool gm_flag)
 {
 	if (gm_flag)
 		return DynamicGMLookup(mob_version);
@@ -935,7 +935,7 @@ const EQEmu::inventory::LookupEntry* EQEmu::inventory::DynamicLookup(versions::M
 		return DynamicNonGMLookup(mob_version);
 }
 
-const EQEmu::inventory::LookupEntry* EQEmu::inventory::DynamicNonGMLookup(versions::MobVersion mob_version)
+const EQ::inventory::LookupEntry* EQ::inventory::DynamicNonGMLookup(versions::MobVersion mob_version)
 {
 	mob_version = versions::ValidateMobVersion(mob_version);
 	if (inventory_dynamic_nongm_lookup_entries[static_cast<int>(mob_version)])
@@ -944,7 +944,7 @@ const EQEmu::inventory::LookupEntry* EQEmu::inventory::DynamicNonGMLookup(versio
 	return &inventory_static_lookup_entries[static_cast<int>(mob_version)];
 }
 
-const EQEmu::inventory::LookupEntry* EQEmu::inventory::DynamicGMLookup(versions::MobVersion mob_version)
+const EQ::inventory::LookupEntry* EQ::inventory::DynamicGMLookup(versions::MobVersion mob_version)
 {
 	mob_version = versions::ValidateMobVersion(mob_version);
 	if (inventory_dynamic_gm_lookup_entries[static_cast<int>(mob_version)])
@@ -953,107 +953,107 @@ const EQEmu::inventory::LookupEntry* EQEmu::inventory::DynamicGMLookup(versions:
 	return &inventory_static_lookup_entries[static_cast<int>(mob_version)];
 }
 
-const EQEmu::inventory::LookupEntry* EQEmu::inventory::StaticLookup(versions::MobVersion mob_version)
+const EQ::inventory::LookupEntry* EQ::inventory::StaticLookup(versions::MobVersion mob_version)
 {
 	return &inventory_static_lookup_entries[static_cast<int>(versions::ValidateMobVersion(mob_version))];
 }
 
-static std::unique_ptr<EQEmu::behavior::LookupEntry> behavior_dynamic_nongm_lookup_entries[EQEmu::versions::MobVersionCount];
-static std::unique_ptr<EQEmu::behavior::LookupEntry> behavior_dynamic_gm_lookup_entries[EQEmu::versions::MobVersionCount];
-static const EQEmu::behavior::LookupEntry behavior_static_lookup_entries[EQEmu::versions::MobVersionCount] =
+static std::unique_ptr<EQ::behavior::LookupEntry> behavior_dynamic_nongm_lookup_entries[EQ::versions::MobVersionCount];
+static std::unique_ptr<EQ::behavior::LookupEntry> behavior_dynamic_gm_lookup_entries[EQ::versions::MobVersionCount];
+static const EQ::behavior::LookupEntry behavior_static_lookup_entries[EQ::versions::MobVersionCount] =
 {
 	/*[MobVersion::Unknown] =*/
-	EQEmu::behavior::LookupEntry(
+	EQ::behavior::LookupEntry(
 		true
 	),
 	/*[MobVersion::Client62] =*/
-	EQEmu::behavior::LookupEntry(
+	EQ::behavior::LookupEntry(
 		true
 	),
 	/*[MobVersion::Titanium] =*/
-	EQEmu::behavior::LookupEntry(
+	EQ::behavior::LookupEntry(
 		Titanium::behavior::CoinHasWeight
 	),
 	/*[MobVersion::SoF] =*/
-	EQEmu::behavior::LookupEntry(
+	EQ::behavior::LookupEntry(
 		SoF::behavior::CoinHasWeight
 	),
 	/*[MobVersion::SoD] =*/
-	EQEmu::behavior::LookupEntry(
+	EQ::behavior::LookupEntry(
 		SoD::behavior::CoinHasWeight
 	),
 	/*[MobVersion::UF] =*/
-	EQEmu::behavior::LookupEntry(
+	EQ::behavior::LookupEntry(
 		UF::behavior::CoinHasWeight
 	),
 	/*[MobVersion::RoF] =*/
-	EQEmu::behavior::LookupEntry(
+	EQ::behavior::LookupEntry(
 		RoF::behavior::CoinHasWeight
 	),
 	/*[MobVersion::RoF2] =*/
-	EQEmu::behavior::LookupEntry(
+	EQ::behavior::LookupEntry(
 		RoF2::behavior::CoinHasWeight
 	),
 	/*[MobVersion::NPC] =*/
-	EQEmu::behavior::LookupEntry(
-		EQEmu::behavior::CoinHasWeight
+	EQ::behavior::LookupEntry(
+		EQ::behavior::CoinHasWeight
 	),
 	/*[MobVersion::NPCMerchant] =*/
-	EQEmu::behavior::LookupEntry(
-		EQEmu::behavior::CoinHasWeight
+	EQ::behavior::LookupEntry(
+		EQ::behavior::CoinHasWeight
 	),
 	/*[MobVersion::Merc] =*/
-	EQEmu::behavior::LookupEntry(
-		EQEmu::behavior::CoinHasWeight
+	EQ::behavior::LookupEntry(
+		EQ::behavior::CoinHasWeight
 	),
 	/*[MobVersion::Bot] =*/
-	EQEmu::behavior::LookupEntry(
-		EQEmu::behavior::CoinHasWeight
+	EQ::behavior::LookupEntry(
+		EQ::behavior::CoinHasWeight
 	),
 	/*[MobVersion::ClientPet] =*/
-	EQEmu::behavior::LookupEntry(
-		EQEmu::behavior::CoinHasWeight
+	EQ::behavior::LookupEntry(
+		EQ::behavior::CoinHasWeight
 	),
 	/*[MobVersion::NPCPet] =*/
-	EQEmu::behavior::LookupEntry(
-		EQEmu::behavior::CoinHasWeight
+	EQ::behavior::LookupEntry(
+		EQ::behavior::CoinHasWeight
 	),
 	/*[MobVersion::MercPet] =*/
-	EQEmu::behavior::LookupEntry(
-		EQEmu::behavior::CoinHasWeight
+	EQ::behavior::LookupEntry(
+		EQ::behavior::CoinHasWeight
 	),
 	/*[MobVersion::BotPet] =*/
-	EQEmu::behavior::LookupEntry(
-		EQEmu::behavior::CoinHasWeight
+	EQ::behavior::LookupEntry(
+		EQ::behavior::CoinHasWeight
 	),
 	/*[MobVersion::OfflineTitanium] =*/
-	EQEmu::behavior::LookupEntry(
+	EQ::behavior::LookupEntry(
 		Titanium::behavior::CoinHasWeight
 	),
 	/*[MobVersion::OfflineSoF] =*/
-	EQEmu::behavior::LookupEntry(
+	EQ::behavior::LookupEntry(
 		SoF::behavior::CoinHasWeight
 	),
 	/*[MobVersion::OfflineSoD] =*/
-	EQEmu::behavior::LookupEntry(
+	EQ::behavior::LookupEntry(
 		SoD::behavior::CoinHasWeight
 	),
 	/*[MobVersion::OfflineUF] =*/
-	EQEmu::behavior::LookupEntry(
+	EQ::behavior::LookupEntry(
 		UF::behavior::CoinHasWeight
 	),
 	/*[MobVersion::OfflineRoF] =*/
-	EQEmu::behavior::LookupEntry(
+	EQ::behavior::LookupEntry(
 		RoF::behavior::CoinHasWeight
 	),
 	/*[MobVersion::OfflineRoF2] =*/
-	EQEmu::behavior::LookupEntry(
+	EQ::behavior::LookupEntry(
 		RoF2::behavior::CoinHasWeight
 	)
 };
 
 static bool behavior_dictionary_init = false;
-void EQEmu::behavior::InitializeDynamicLookups() {
+void EQ::behavior::InitializeDynamicLookups() {
 	if (behavior_dictionary_init == true)
 		return;
 	behavior_dictionary_init = true;
@@ -1064,7 +1064,7 @@ void EQEmu::behavior::InitializeDynamicLookups() {
 	// use static references for now
 }
 
-const EQEmu::behavior::LookupEntry* EQEmu::behavior::DynamicLookup(versions::MobVersion mob_version, bool gm_flag)
+const EQ::behavior::LookupEntry* EQ::behavior::DynamicLookup(versions::MobVersion mob_version, bool gm_flag)
 {
 	if (gm_flag)
 		return DynamicGMLookup(mob_version);
@@ -1072,7 +1072,7 @@ const EQEmu::behavior::LookupEntry* EQEmu::behavior::DynamicLookup(versions::Mob
 		return DynamicNonGMLookup(mob_version);
 }
 
-const EQEmu::behavior::LookupEntry* EQEmu::behavior::DynamicNonGMLookup(versions::MobVersion mob_version)
+const EQ::behavior::LookupEntry* EQ::behavior::DynamicNonGMLookup(versions::MobVersion mob_version)
 {
 	mob_version = versions::ValidateMobVersion(mob_version);
 	if (behavior_dynamic_nongm_lookup_entries[static_cast<int>(mob_version)])
@@ -1081,7 +1081,7 @@ const EQEmu::behavior::LookupEntry* EQEmu::behavior::DynamicNonGMLookup(versions
 	return &behavior_static_lookup_entries[static_cast<int>(mob_version)];
 }
 
-const EQEmu::behavior::LookupEntry* EQEmu::behavior::DynamicGMLookup(versions::MobVersion mob_version)
+const EQ::behavior::LookupEntry* EQ::behavior::DynamicGMLookup(versions::MobVersion mob_version)
 {
 	mob_version = versions::ValidateMobVersion(mob_version);
 	if (behavior_dynamic_gm_lookup_entries[static_cast<int>(mob_version)])
@@ -1090,17 +1090,17 @@ const EQEmu::behavior::LookupEntry* EQEmu::behavior::DynamicGMLookup(versions::M
 	return &behavior_static_lookup_entries[static_cast<int>(mob_version)];
 }
 
-const EQEmu::behavior::LookupEntry* EQEmu::behavior::StaticLookup(versions::MobVersion mob_version)
+const EQ::behavior::LookupEntry* EQ::behavior::StaticLookup(versions::MobVersion mob_version)
 {
 	return &behavior_static_lookup_entries[static_cast<int>(versions::ValidateMobVersion(mob_version))];
 }
 
-static std::unique_ptr<EQEmu::spells::LookupEntry> spells_dynamic_nongm_lookup_entries[EQEmu::versions::ClientVersionCount];
-static std::unique_ptr<EQEmu::spells::LookupEntry> spells_dynamic_gm_lookup_entries[EQEmu::versions::ClientVersionCount];
-static const EQEmu::spells::LookupEntry spells_static_lookup_entries[EQEmu::versions::ClientVersionCount] =
+static std::unique_ptr<EQ::spells::LookupEntry> spells_dynamic_nongm_lookup_entries[EQ::versions::ClientVersionCount];
+static std::unique_ptr<EQ::spells::LookupEntry> spells_dynamic_gm_lookup_entries[EQ::versions::ClientVersionCount];
+static const EQ::spells::LookupEntry spells_static_lookup_entries[EQ::versions::ClientVersionCount] =
 {
 	/*[ClientVersion::Unknown] =*/
-	EQEmu::spells::LookupEntry(
+	EQ::spells::LookupEntry(
 		ClientUnknown::INULL,
 		ClientUnknown::INULL,
 		ClientUnknown::INULL,
@@ -1113,7 +1113,7 @@ static const EQEmu::spells::LookupEntry spells_static_lookup_entries[EQEmu::vers
 		ClientUnknown::INULL
 	),
 	/*[ClientVersion::Client62] =*/
-	EQEmu::spells::LookupEntry(
+	EQ::spells::LookupEntry(
 		Client62::INULL,
 		Client62::INULL,
 		Client62::INULL,
@@ -1126,7 +1126,7 @@ static const EQEmu::spells::LookupEntry spells_static_lookup_entries[EQEmu::vers
 		Client62::INULL
 	),
 	/*[ClientVersion::Titanium] =*/
-	EQEmu::spells::LookupEntry(
+	EQ::spells::LookupEntry(
 		Titanium::spells::SPELL_ID_MAX,
 		Titanium::spells::SPELLBOOK_SIZE,
 		Titanium::spells::SPELL_GEM_COUNT,
@@ -1139,7 +1139,7 @@ static const EQEmu::spells::LookupEntry spells_static_lookup_entries[EQEmu::vers
 		Titanium::spells::MERC_BUFFS
 	),
 	/*[ClientVersion::SoF] =*/
-	EQEmu::spells::LookupEntry(
+	EQ::spells::LookupEntry(
 		SoF::spells::SPELL_ID_MAX,
 		SoF::spells::SPELLBOOK_SIZE,
 		SoF::spells::SPELL_GEM_COUNT,
@@ -1152,7 +1152,7 @@ static const EQEmu::spells::LookupEntry spells_static_lookup_entries[EQEmu::vers
 		SoF::spells::MERC_BUFFS
 	),
 	/*[ClientVersion::SoD] =*/
-	EQEmu::spells::LookupEntry(
+	EQ::spells::LookupEntry(
 		SoD::spells::SPELL_ID_MAX,
 		SoD::spells::SPELLBOOK_SIZE,
 		SoD::spells::SPELL_GEM_COUNT,
@@ -1165,7 +1165,7 @@ static const EQEmu::spells::LookupEntry spells_static_lookup_entries[EQEmu::vers
 		SoD::spells::MERC_BUFFS
 	),
 	/*[ClientVersion::UF] =*/
-	EQEmu::spells::LookupEntry(
+	EQ::spells::LookupEntry(
 		UF::spells::SPELL_ID_MAX,
 		UF::spells::SPELLBOOK_SIZE,
 		UF::spells::SPELL_GEM_COUNT,
@@ -1178,7 +1178,7 @@ static const EQEmu::spells::LookupEntry spells_static_lookup_entries[EQEmu::vers
 		UF::spells::MERC_BUFFS
 	),
 	/*[ClientVersion::RoF] =*/
-	EQEmu::spells::LookupEntry(
+	EQ::spells::LookupEntry(
 		RoF::spells::SPELL_ID_MAX,
 		RoF::spells::SPELLBOOK_SIZE,
 		UF::spells::SPELL_GEM_COUNT, // client translators are setup to allow the max value a client supports..however, the top 4 indices are not valid in this case
@@ -1191,7 +1191,7 @@ static const EQEmu::spells::LookupEntry spells_static_lookup_entries[EQEmu::vers
 		RoF::spells::MERC_BUFFS
 	),
 	/*[ClientVersion::RoF2] =*/
-	EQEmu::spells::LookupEntry(
+	EQ::spells::LookupEntry(
 		RoF2::spells::SPELL_ID_MAX,
 		RoF2::spells::SPELLBOOK_SIZE,
 		UF::spells::SPELL_GEM_COUNT, // client translators are setup to allow the max value a client supports..however, the top 4 indices are not valid in this case
@@ -1206,7 +1206,7 @@ static const EQEmu::spells::LookupEntry spells_static_lookup_entries[EQEmu::vers
 };
 
 static bool spells_dictionary_init = false;
-void EQEmu::spells::InitializeDynamicLookups() {
+void EQ::spells::InitializeDynamicLookups() {
 	if (spells_dictionary_init == true)
 		return;
 	spells_dictionary_init = true;
@@ -1217,7 +1217,7 @@ void EQEmu::spells::InitializeDynamicLookups() {
 	// use static references for now
 }
 
-const EQEmu::spells::LookupEntry* EQEmu::spells::DynamicLookup(versions::ClientVersion client_version, bool gm_flag)
+const EQ::spells::LookupEntry* EQ::spells::DynamicLookup(versions::ClientVersion client_version, bool gm_flag)
 {
 	if (gm_flag)
 		return DynamicGMLookup(client_version);
@@ -1225,7 +1225,7 @@ const EQEmu::spells::LookupEntry* EQEmu::spells::DynamicLookup(versions::ClientV
 		return DynamicNonGMLookup(client_version);
 }
 
-const EQEmu::spells::LookupEntry* EQEmu::spells::DynamicNonGMLookup(versions::ClientVersion client_version)
+const EQ::spells::LookupEntry* EQ::spells::DynamicNonGMLookup(versions::ClientVersion client_version)
 {
 	client_version = versions::ValidateClientVersion(client_version);
 	if (spells_dynamic_nongm_lookup_entries[static_cast<int>(client_version)])
@@ -1234,7 +1234,7 @@ const EQEmu::spells::LookupEntry* EQEmu::spells::DynamicNonGMLookup(versions::Cl
 	return &spells_static_lookup_entries[static_cast<int>(client_version)];
 }
 
-const EQEmu::spells::LookupEntry* EQEmu::spells::DynamicGMLookup(versions::ClientVersion client_version)
+const EQ::spells::LookupEntry* EQ::spells::DynamicGMLookup(versions::ClientVersion client_version)
 {
 	client_version = versions::ValidateClientVersion(client_version);
 	if (spells_dynamic_gm_lookup_entries[static_cast<int>(client_version)])
@@ -1243,7 +1243,7 @@ const EQEmu::spells::LookupEntry* EQEmu::spells::DynamicGMLookup(versions::Clien
 	return &spells_static_lookup_entries[static_cast<int>(client_version)];
 }
 
-const EQEmu::spells::LookupEntry* EQEmu::spells::StaticLookup(versions::ClientVersion client_version)
+const EQ::spells::LookupEntry* EQ::spells::StaticLookup(versions::ClientVersion client_version)
 {
 	return &spells_static_lookup_entries[static_cast<int>(versions::ValidateClientVersion(client_version))];
 }

common/eq_limits.h

@@ -31,13 +31,13 @@
 #include "../common/patches/rof2_limits.h"
 
 
-namespace EQEmu
+namespace EQ
 {
 	void InitializeDynamicLookups();
 
 	namespace constants {
 		struct LookupEntry {
-			EQEmu::expansions::Expansion Expansion;
+			EQ::expansions::Expansion Expansion;
 			uint32 ExpansionBit;
 			uint32 ExpansionsMask;
 			int16 CharacterCreationLimit;
@@ -45,7 +45,7 @@ namespace EQEmu
 			
 			LookupEntry(const LookupEntry *lookup_entry) { }
 			LookupEntry(
-				EQEmu::expansions::Expansion Expansion,
+				EQ::expansions::Expansion Expansion,
 				uint32 ExpansionBit,
 				uint32 ExpansionsMask,
 				int16 CharacterCreationLimit,
@@ -111,7 +111,7 @@ namespace EQEmu
 
 			union {
 				InventoryTypeSize_Struct InventoryTypeSize;
-				int16 InventoryTypeSizeArray[25]; // should reflect EQEmu::invtype::TYPE_COUNT referenced in emu_constants.h
+				int16 InventoryTypeSizeArray[25]; // should reflect EQ::invtype::TYPE_COUNT referenced in emu_constants.h
 			};
 
 			uint64 EquipmentBitmask;
@@ -244,9 +244,9 @@ namespace ClientUnknown
 	const int16 INULL = 0;
 
 	namespace constants {
-		const EQEmu::expansions::Expansion EXPANSION = EQEmu::expansions::Expansion::EverQuest;
-		const uint32 EXPANSION_BIT = EQEmu::expansions::bitEverQuest;
-		const uint32 EXPANSIONS_MASK = EQEmu::expansions::maskEverQuest;
+		const EQ::expansions::Expansion EXPANSION = EQ::expansions::Expansion::EverQuest;
+		const uint32 EXPANSION_BIT = EQ::expansions::bitEverQuest;
+		const uint32 EXPANSIONS_MASK = EQ::expansions::maskEverQuest;
 
 	} // namespace constants
 
@@ -258,9 +258,9 @@ namespace Client62
 	const int16 INULL = 0;
 
 	namespace constants {
-		const EQEmu::expansions::Expansion EXPANSION = EQEmu::expansions::Expansion::EverQuest;
-		const uint32 EXPANSION_BIT = EQEmu::expansions::bitEverQuest;
-		const uint32 EXPANSIONS_MASK = EQEmu::expansions::maskEverQuest;
+		const EQ::expansions::Expansion EXPANSION = EQ::expansions::Expansion::EverQuest;
+		const uint32 EXPANSION_BIT = EQ::expansions::bitEverQuest;
+		const uint32 EXPANSIONS_MASK = EQ::expansions::maskEverQuest;
 
 	} // namespace constants
 

common/eq_packet_structs.h

@@ -129,7 +129,7 @@ struct LDoNTrapTemplate
 
 // All clients translate the character select information to some degree
 
-struct CharSelectEquip : EQEmu::textures::Texture_Struct, EQEmu::textures::Tint_Struct {};
+struct CharSelectEquip : EQ::textures::Texture_Struct, EQ::textures::Tint_Struct {};
 
 // RoF2-based hybrid struct
 struct CharacterSelectEntry_Struct
@@ -144,7 +144,7 @@ struct CharacterSelectEntry_Struct
 	uint16 Instance;
 	uint8 Gender;
 	uint8 Face;
-	CharSelectEquip	Equip[EQEmu::textures::materialCount];
+	CharSelectEquip	Equip[EQ::textures::materialCount];
 	uint8 Unknown15;			// Seen FF
 	uint8 Unknown19;			// Seen FF
 	uint32 DrakkinTattoo;
@@ -253,7 +253,7 @@ struct Spawn_Struct {
 /*0189*/ uint32	petOwnerId;			// If this is a pet, the spawn id of owner
 /*0193*/ uint8	guildrank;			// 0=normal, 1=officer, 2=leader
 /*0194*/ uint8	unknown0194[3];
-/*0197*/ EQEmu::TextureProfile equipment;
+/*0197*/ EQ::TextureProfile equipment;
 /*0233*/ float	runspeed;		// Speed when running
 /*0036*/ uint8	afk;			// 0=no, 1=afk
 /*0238*/ uint32	guildID;		// Current guild
@@ -284,7 +284,7 @@ union
 /*0340*/ uint32 spawnId;		// Spawn Id
 /*0344*/ float bounding_radius; // used in melee, overrides calc
 /*0347*/ uint8 IsMercenary;
-/*0348*/ EQEmu::TintProfile equipment_tint;
+/*0348*/ EQ::TintProfile equipment_tint;
 /*0384*/ uint8	lfg;			// 0=off, 1=lfg on
 /*0385*/
 
@@ -375,13 +375,16 @@ struct NewZone_Struct {
 /*0686*/	uint16	zone_instance;
 /*0688*/	uint32	unknown688;
 /*0692*/	uint8	unknown692[8];
+// Titanium doesn't have a translator, but we can still safely add stuff under here without issues since client memcpy's only what it knows
+// Just wastes some bandwidth sending to tit clients /shrug
 /*0700*/	float	fog_density;
 /*0704*/	uint32	SuspendBuffs;
 /*0708*/	uint32	FastRegenHP;
 /*0712*/	uint32	FastRegenMana;
 /*0716*/	uint32	FastRegenEndurance;
 /*0720*/	uint32	NPCAggroMaxDist;
-/*0724*/
+/*0724*/	uint32	underworld_teleport_index; // > 0 teleports w/ zone point index, invalid succors, if this value is 0, it prevents you from running off edges that would end up underworld
+/*0728*/
 };
 
 /*
@@ -736,7 +739,7 @@ struct BandolierItem_Struct
 struct Bandolier_Struct
 {
 	char Name[32];
-	BandolierItem_Struct Items[EQEmu::profile::BANDOLIER_ITEM_COUNT];
+	BandolierItem_Struct Items[EQ::profile::BANDOLIER_ITEM_COUNT];
 };
 
 //len = 72
@@ -750,7 +753,7 @@ struct PotionBeltItem_Struct
 //len = 288
 struct PotionBelt_Struct
 {
-	PotionBeltItem_Struct Items[EQEmu::profile::POTION_BELT_SIZE];
+	PotionBeltItem_Struct Items[EQ::profile::POTION_BELT_SIZE];
 };
 
 struct MovePotionToBelt_Struct
@@ -841,7 +844,7 @@ struct SuspendedMinion_Struct
 	/*002*/	uint32 HP;
 	/*006*/	uint32 Mana;
 	/*010*/	SpellBuff_Struct Buffs[BUFF_COUNT];
-	/*510*/	EQEmu::TextureMaterialProfile Items;
+	/*510*/	EQ::TextureMaterialProfile Items;
 	/*546*/	char Name[64];
 	/*610*/
 };
@@ -933,7 +936,7 @@ struct PlayerProfile_Struct
 /*0245*/	uint8				guildbanker;
 /*0246*/	uint8				unknown0246[6];		//
 /*0252*/	uint32				intoxication;
-/*0256*/	uint32				spellSlotRefresh[EQEmu::spells::SPELL_GEM_COUNT];	//in ms
+/*0256*/	uint32				spellSlotRefresh[EQ::spells::SPELL_GEM_COUNT];	//in ms
 /*0292*/	uint32				abilitySlotRefresh;
 /*0296*/	uint8				haircolor;			// Player hair color
 /*0297*/	uint8				beardcolor;			// Player beard color
@@ -946,9 +949,9 @@ struct PlayerProfile_Struct
 /*0304*/	uint8				ability_time_minutes;
 /*0305*/	uint8				ability_time_hours;	//place holder
 /*0306*/	uint8				unknown0306[6];		// @bp Spacer/Flag?
-/*0312*/	EQEmu::TextureMaterialProfile	item_material;	// Item texture/material of worn/held items
+/*0312*/	EQ::TextureMaterialProfile	item_material;	// Item texture/material of worn/held items
 /*0348*/	uint8				unknown0348[44];
-/*0392*/	EQEmu::TintProfile	item_tint;
+/*0392*/	EQ::TintProfile	item_tint;
 /*0428*/	AA_Array			aa_array[MAX_PP_AA_ARRAY];
 /*2348*/	float				unknown2384;		//seen ~128, ~47
 /*2352*/	char				servername[32];		// length probably not right
@@ -972,9 +975,9 @@ struct PlayerProfile_Struct
 /*2505*/	uint8				unknown2541[47];	// ?
 /*2552*/	uint8				languages[MAX_PP_LANGUAGE];
 /*2580*/	uint8				unknown2616[4];
-/*2584*/	uint32				spell_book[EQEmu::spells::SPELLBOOK_SIZE];
+/*2584*/	uint32				spell_book[EQ::spells::SPELLBOOK_SIZE];
 /*4504*/	uint8				unknown4540[128];	// Was [428] all 0xff
-/*4632*/	uint32				mem_spells[EQEmu::spells::SPELL_GEM_COUNT];
+/*4632*/	uint32				mem_spells[EQ::spells::SPELL_GEM_COUNT];
 /*4668*/	uint8				unknown4704[32];	//
 /*4700*/	float				y;					// Player y position
 /*4704*/	float				x;					// Player x position
@@ -1050,7 +1053,7 @@ struct PlayerProfile_Struct
 /*7212*/	uint32				tribute_points;
 /*7216*/	uint32				unknown7252;
 /*7220*/	uint32				tribute_active;		//1=active
-/*7224*/	Tribute_Struct		tributes[EQEmu::invtype::TRIBUTE_SIZE];
+/*7224*/	Tribute_Struct		tributes[EQ::invtype::TRIBUTE_SIZE];
 /*7264*/	Disciplines_Struct	disciplines;
 /*7664*/	uint32				recastTimers[MAX_RECAST_TYPES];	// Timers (GMT of last use)
 /*7744*/	char				unknown7780[160];
@@ -1077,7 +1080,7 @@ struct PlayerProfile_Struct
 /*12800*/	uint32				expAA;
 /*12804*/	uint32				aapoints;			//avaliable, unspent
 /*12808*/	uint8				unknown12844[36];
-/*12844*/	Bandolier_Struct	bandoliers[EQEmu::profile::BANDOLIERS_SIZE];
+/*12844*/	Bandolier_Struct	bandoliers[EQ::profile::BANDOLIERS_SIZE];
 /*14124*/	uint8				unknown14160[4506];
 /*18630*/	SuspendedMinion_Struct	SuspendedMinion; // No longer in use
 /*19240*/	uint32				timeentitledonaccount;
@@ -1095,16 +1098,16 @@ struct PlayerProfile_Struct
 /*19568*/
 
 	// All player profile packets are translated and this overhead is ignored in out-bound packets
-	PlayerProfile_Struct() : m_player_profile_version(EQEmu::versions::MobVersion::Unknown) { }
+	PlayerProfile_Struct() : m_player_profile_version(EQ::versions::MobVersion::Unknown) { }
 
-	EQEmu::versions::MobVersion PlayerProfileVersion() { return m_player_profile_version; }
-	void SetPlayerProfileVersion(EQEmu::versions::MobVersion mob_version) { m_player_profile_version = EQEmu::versions::ValidateMobVersion(mob_version); }
-	void SetPlayerProfileVersion(EQEmu::versions::ClientVersion client_version) { SetPlayerProfileVersion(EQEmu::versions::ConvertClientVersionToMobVersion(client_version)); }
+	EQ::versions::MobVersion PlayerProfileVersion() { return m_player_profile_version; }
+	void SetPlayerProfileVersion(EQ::versions::MobVersion mob_version) { m_player_profile_version = EQ::versions::ValidateMobVersion(mob_version); }
+	void SetPlayerProfileVersion(EQ::versions::ClientVersion client_version) { SetPlayerProfileVersion(EQ::versions::ConvertClientVersionToMobVersion(client_version)); }
 
 private:
 	// No need for gm flag since pp already has one
 	// No need for lookup pointer since this struct is not tied to any one system
-	EQEmu::versions::MobVersion m_player_profile_version;
+	EQ::versions::MobVersion m_player_profile_version;
 };
 
 
@@ -1215,7 +1218,7 @@ struct WearChange_Struct {
 /*010*/ uint32                       elite_material;    // 1 for Drakkin Elite Material
 /*014*/ uint32                       hero_forge_model; // New to VoA
 /*018*/ uint32                       unknown18; // New to RoF
-/*022*/ EQEmu::textures::Tint_Struct color;
+/*022*/ EQ::textures::Tint_Struct color;
 /*026*/ uint8                        wear_slot_id;
 /*027*/
 };
@@ -2123,7 +2126,7 @@ struct AdventureLeaderboard_Struct
 /*struct Item_Shop_Struct {
 	uint16 merchantid;
 	uint8 itemtype;
-	EQEmu::ItemData item;
+	EQ::ItemData item;
 	uint8 iss_unknown001[6];
 };*/
 
@@ -2149,7 +2152,7 @@ struct Illusion_Struct { //size: 256 - SoF
 /*092*/	uint32	drakkin_heritage;	//
 /*096*/	uint32	drakkin_tattoo;		//
 /*100*/	uint32	drakkin_details;	//
-/*104*/	EQEmu::TintProfile	armor_tint;	//
+/*104*/	EQ::TintProfile	armor_tint;	//
 /*140*/	uint8	eyecolor1;		// Field Not Identified in any Illusion Struct
 /*141*/	uint8	eyecolor2;		// Field Not Identified in any Illusion Struct
 /*142*/	uint8	unknown138[114];	//
@@ -3489,8 +3492,8 @@ struct SelectTributeReply_Struct {
 
 struct TributeInfo_Struct {
 	uint32	active;		//0 == inactive, 1 == active
-	uint32	tributes[EQEmu::invtype::TRIBUTE_SIZE];	//-1 == NONE
-	uint32	tiers[EQEmu::invtype::TRIBUTE_SIZE];		//all 00's
+	uint32	tributes[EQ::invtype::TRIBUTE_SIZE];	//-1 == NONE
+	uint32	tiers[EQ::invtype::TRIBUTE_SIZE];		//all 00's
 	uint32	tribute_master_id;
 };
 
@@ -4401,7 +4404,7 @@ struct AnnoyingZoneUnknown_Struct {
 };
 
 struct LoadSpellSet_Struct {
-	uint32 spell[EQEmu::spells::SPELL_GEM_COUNT];	// 0xFFFFFFFF if no action, slot number if to unmem starting at 0
+	uint32 spell[EQ::spells::SPELL_GEM_COUNT];	// 0xFFFFFFFF if no action, slot number if to unmem starting at 0
 	uint32 unknown;					//there seems to be an extra field in this packet...
 };
 
@@ -4832,17 +4835,98 @@ struct BuffIcon_Struct
 	BuffIconEntry_Struct entries[0];
 };
 
-struct ExpeditionInfo_Struct
+struct ExpeditionInvite_Struct
 {
-/*000*/ uint32 max_players;
-/*004*/ char expedition_name[128];
-/*132*/ char leader_name[64];
+/*000*/ uint32 client_id;            // unique character id
+/*004*/ uint32 unknown004;           // added after titanium
+/*008*/ char   inviter_name[64];
+/*072*/ char   expedition_name[128];
+/*200*/ uint8  swapping;             // 0: adding 1: swapping
+/*201*/ char   swap_name[64];        // if swapping, swap name being removed
+/*265*/ uint8  padding[3];
+/*268*/ uint16 dz_zone_id;           // dz_id zone/instance pair, sent back in reply
+/*270*/ uint16 dz_instance_id;
 };
 
-struct ExpeditionJoinPrompt_Struct
+struct ExpeditionInviteResponse_Struct
 {
-/*000*/ char player_name[64];
-/*064*/ char expedition_name[64];
+/*000*/ uint32 unknown000;
+/*004*/ uint32 unknown004;     // added after titanium
+/*008*/ uint16 dz_zone_id;     // dz_id pair sent in invite
+/*010*/ uint16 dz_instance_id;
+/*012*/ uint8  accepted;       // 0: declined 1: accepted
+/*013*/ uint8  swapping;       // 0: adding 1: swapping (sent in invite)
+/*014*/ char   swap_name[64];  // swap name sent in invite
+/*078*/ uint8  unknown078;     // padding garbage?
+/*079*/ uint8  unknown079;     // padding garbage?
+};
+
+struct ExpeditionInfo_Struct
+{
+/*000*/ uint32 client_id;
+/*004*/ uint32 unknown004; // added after titanium
+/*008*/ uint32 assigned;   // padded bool, 0: not in expedition (clear data), 1: in expedition
+/*012*/ uint32 max_players;
+/*016*/ char   expedition_name[128];
+/*144*/ char   leader_name[64];
+};
+
+struct ExpeditionMemberEntry_Struct
+{
+/*000*/ char  name[64];          // variable length, null terminated, max 0x40 (64)
+/*064*/ uint8 expedition_status; // 0: unknown, 1: Online, 2: Offline, 3: In Dynamic Zone, 4: Link Dead
+};
+
+struct ExpeditionMemberList_Struct
+{
+/*000*/ uint32 client_id;
+/*004*/ uint32 member_count;
+/*008*/ ExpeditionMemberEntry_Struct members[0]; // variable length
+};
+
+struct ExpeditionMemberListName_Struct
+{
+/*000*/ uint32 client_id;
+/*004*/ uint32 unknown004;
+/*008*/ uint32 add_name; // padded bool, 0: remove name, 1: add name with unknown status
+/*012*/ char   name[64];
+};
+
+struct ExpeditionLockoutTimerEntry_Struct
+{
+/*000*/ char   expedition_name[128]; // variable length, null terminated, max 0x80 (128)
+/*000*/ uint32 seconds_remaining;
+/*000*/ int32  event_type;           // seen -1 (0xffffffff) for replay timers and 1 for event timers
+/*000*/ char   event_name[256];      // variable length, null terminated, max 0x100 (256)
+};
+
+struct ExpeditionLockoutTimers_Struct
+{
+/*000*/ uint32 client_id;
+/*004*/ uint32 count;
+/*008*/ ExpeditionLockoutTimerEntry_Struct timers[0];
+};
+
+struct ExpeditionSetLeaderName_Struct
+{
+/*000*/ uint32 client_id;
+/*004*/ uint32 unknown004;
+/*008*/ char   leader_name[64];
+};
+
+struct ExpeditionCommand_Struct
+{
+/*000*/ uint32 unknown000;
+/*004*/ uint32 unknown004;
+/*008*/ char name[64];
+};
+
+struct ExpeditionCommandSwap_Struct
+{
+/*000*/ uint32 unknown000;
+/*004*/ uint32 unknown004;
+/*008*/ char add_player_name[64]; // swap to (player must confirm)
+/*072*/ char rem_player_name[64]; // swap from
 };
 
 struct ExpeditionExpireWarning
@@ -4850,48 +4934,67 @@ struct ExpeditionExpireWarning
 /*008*/ uint32 minutes_remaining;
 };
 
-struct ExpeditionCompassEntry_Struct
+struct DynamicZoneCompassEntry_Struct
 {
-/*000*/ uint32 enabled; //guess
-/*004*/ float y;
-/*008*/ float x;
-/*012*/ float z;
+/*000*/ uint16 dz_zone_id;      // target dz id pair
+/*002*/ uint16 dz_instance_id;
+/*004*/ uint32 dz_type;         // 1: Expedition, 2: Tutorial (purple), 3: Task, 4: Mission, 5: Quest (green)
+/*008*/ uint32 unknown008;
+/*012*/ float y;
+/*016*/ float x;
+/*020*/ float z;
 };
 
-struct ExpeditionCompass_Struct
+struct DynamicZoneCompass_Struct
 {
+/*000*/ uint32 client_id;
 /*000*/ uint32 count;
-/*004*/ ExpeditionCompassEntry_Struct entries[0];
+/*004*/ DynamicZoneCompassEntry_Struct entries[0];
 };
 
-struct ExpeditionMemberEntry_Struct
+struct DynamicZoneChooseZoneEntry_Struct
 {
-	char name[64];
-	char status;
+/*000*/ uint16 dz_zone_id;       // dz_id pair
+/*002*/ uint16 dz_instance_id;
+/*004*/ uint32 unknown_id1;      // seen 28 00 00 00 (40), sent back in reply
+/*008*/ uint32 dz_type;          // 1: Expedition, 2: Tutorial, 3: Task, 4: Mission, 5: Quest -- sent back in reply
+/*012*/ uint32 unknown_id2;      // possibly an id based on dz type, for expeditions this was same as dz_id (zone|instance) but task dz was different
+/*016*/ char   description[128]; // variable length, null terminated
+/*144*/ char   leader_name[64];  // variable length, null terminated
 };
 
-struct ExpeditionMemberList_Struct
+struct DynamicZoneChooseZone_Struct
 {
-/*000*/ uint32 count;
-/*004*/ ExpeditionMemberEntry_Struct entries[0];
+/*000*/ uint32 client_id;
+/*004*/ uint32 count;
+/*008*/ DynamicZoneChooseZoneEntry_Struct choices[0];
 };
 
-struct ExpeditionLockoutEntry_Struct
+struct DynamicZoneChooseZoneReply_Struct
 {
-/*000*/ uint32 time_left;
-/*004*/ char expedition[128];
-/*132*/ char expedition_event[128];
+/*000*/ uint32 unknown000;     // ff ff ff ff
+/*004*/ uint32 unknown004;     // seen 69 00 00 00
+/*008*/ uint32 unknown008;     // ff ff ff ff
+/*012*/ uint32 unknown_id1;    // from choose zone entry message
+/*016*/ uint16 dz_zone_id;     // dz_id pair
+/*018*/ uint16 dz_instance_id;
+/*020*/ uint32 dz_type;        // 1: Expedition, 2: Tutorial, 3: Task, 4: Mission, 5: Quest
+/*024*/ uint32 unknown_id2;    // from choose zone entry message
+/*028*/ uint32 unknown028;     // 00 00 00 00
+/*032*/ uint32 unknown032;     // always same as unknown044
+/*036*/ uint32 unknown036;
+/*040*/ uint32 unknown040;
+/*044*/ uint32 unknown044;     // always same as unknown032
+/*048*/ uint32 unknown048;     // seen 01 00 00 00 and 02 00 00 00
 };
 
-struct ExpeditionLockoutList_Struct
+struct KickPlayers_Struct
 {
-/*000*/ uint32 count;
-/*004*/ ExpeditionLockoutEntry_Struct entries[0];
-};
-
-struct ExpeditionLeaderSet_Struct
-{
-/*000*/ char leader_name[64];
+/*000*/ char   char_name[64];
+/*064*/ uint32 unknown064;      // always 0
+/*068*/ uint8  kick_expedition; // true if /kickplayers exp
+/*069*/ uint8  kick_task;       // true if /kickplayers task
+/*070*/ uint8  padding[2];
 };
 
 struct CorpseDrag_Struct
@@ -5341,18 +5444,20 @@ struct MercenaryMerchantResponse_Struct {
 
 struct ServerLootItem_Struct {
 	uint32	item_id;	  // uint32	item_id;
-	int16	equip_slot;	  // int16	equip_slot;
-	uint16	charges;	  // uint8	charges;
-	uint16	lootslot;	  // uint16	lootslot;
-	uint32	aug_1;		  // uint32	aug_1;
-	uint32	aug_2;		  // uint32	aug_2;
-	uint32	aug_3;		  // uint32	aug_3;
-	uint32	aug_4;		  // uint32	aug_4;
-	uint32	aug_5;		  // uint32	aug_5;
-	uint32	aug_6;		  // uint32	aug_5;
-	uint8	attuned;
-	uint8	min_level;
-	uint8	max_level;
+	int16  equip_slot;	  // int16	equip_slot;
+	uint16 charges;	  // uint8	charges;
+	uint16 lootslot;	  // uint16	lootslot;
+	uint32 aug_1;		  // uint32	aug_1;
+	uint32 aug_2;		  // uint32	aug_2;
+	uint32 aug_3;		  // uint32	aug_3;
+	uint32 aug_4;		  // uint32	aug_4;
+	uint32 aug_5;		  // uint32	aug_5;
+	uint32 aug_6;		  // uint32	aug_5;
+	uint8  attuned;
+	uint16 trivial_min_level;
+	uint16 trivial_max_level;
+	uint16 npc_min_level;
+	uint16 npc_max_level;
 };
 
 //Found in client near a ref to the string:

common/eq_stream_intf.h

@@ -100,7 +100,7 @@ public:
 	virtual MatchState CheckSignature(const Signature *sig) { return MatchFailed; }
 	virtual EQStreamState GetState() = 0;
 	virtual void SetOpcodeManager(OpcodeManager **opm) = 0;
-	virtual const EQEmu::versions::ClientVersion ClientVersion() const { return EQEmu::versions::ClientVersion::Unknown; }
+	virtual const EQ::versions::ClientVersion ClientVersion() const { return EQ::versions::ClientVersion::Unknown; }
 	virtual Stats GetStats() const = 0;
 	virtual void ResetStats() = 0;
 	virtual EQStreamManagerInterface* GetManager() const = 0;

common/eq_stream_proxy.cpp

@@ -22,7 +22,7 @@ std::string EQStreamProxy::Describe() const {
 	return(m_structs->Describe());
 }
 
-const EQEmu::versions::ClientVersion EQStreamProxy::ClientVersion() const
+const EQ::versions::ClientVersion EQStreamProxy::ClientVersion() const
 {
 	return m_structs->ClientVersion();
 }

common/eq_stream_proxy.h

@@ -28,7 +28,7 @@ public:
 	virtual void RemoveData();
 	virtual bool CheckState(EQStreamState state);
 	virtual std::string Describe() const;
-	virtual const EQEmu::versions::ClientVersion ClientVersion() const;
+	virtual const EQ::versions::ClientVersion ClientVersion() const;
 	virtual EQStreamState GetState();
 	virtual void SetOpcodeManager(OpcodeManager **opm);
 	virtual Stats GetStats() const;

common/eqemu_exception.cpp

@@ -18,7 +18,7 @@
 
 #include "eqemu_exception.h"
 
-namespace EQEmu
+namespace EQ
 {
 	Exception::Exception(const char* name, const std::string& description, const char* file, long line)
 		: line_(line),

common/eqemu_exception.h

@@ -22,7 +22,7 @@
 #include <sstream>
 #include <exception>
 
-namespace EQEmu
+namespace EQ
 {
 	//! EQEmu Exception Class
 	/*!
@@ -104,7 +104,7 @@ namespace EQEmu
 } // EQEmu
 
 #ifndef EQ_EXCEPT
-#define EQ_EXCEPT(n, d) throw EQEmu::Exception(n, d, __FILE__, __LINE__)
+#define EQ_EXCEPT(n, d) throw EQ::Exception(n, d, __FILE__, __LINE__)
 #endif
 
 #endif

common/eqemu_logsys.cpp

@@ -126,6 +126,7 @@ void EQEmuLogSys::LoadLogSettingsDefaults()
 	log_settings[Logs::NPCScaling].log_to_gmsay       = static_cast<uint8>(Logs::General);
 	log_settings[Logs::HotReload].log_to_gmsay        = static_cast<uint8>(Logs::General);
 	log_settings[Logs::HotReload].log_to_console      = static_cast<uint8>(Logs::General);
+	log_settings[Logs::Loot].log_to_gmsay             = static_cast<uint8>(Logs::General);
 
 	/**
 	 * RFC 5424

common/eqemu_logsys.h

@@ -116,6 +116,12 @@ namespace Logs {
 		Aura,
 		HotReload,
 		Merchants,
+		ZonePoints,
+		Loot,
+		Expeditions,
+		DynamicZones,
+		Group,
+		Adventure,
 		MaxCategoryID /* Don't Remove this */
 	};
 
@@ -191,6 +197,12 @@ namespace Logs {
 		"Aura",
 		"HotReload",
 		"Merchants",
+		"ZonePoints",
+		"Loot",
+		"Expeditions",
+		"DynamicZones",
+		"Group",
+		"Adventure",
 	};
 }
 

common/eqemu_logsys_log_aliases.h

@@ -161,6 +161,16 @@
         OutF(LogSys, Logs::Detail, Logs::Doors, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
 } while (0)
 
+#define LogGroup(message, ...) do {\
+    if (LogSys.log_settings[Logs::Group].is_category_enabled == 1)\
+        OutF(LogSys, Logs::General, Logs::Group, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogGroupDetail(message, ...) do {\
+    if (LogSys.log_settings[Logs::Group].is_category_enabled == 1)\
+        OutF(LogSys, Logs::Detail, Logs::Group, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
 #define LogGuilds(message, ...) do {\
     if (LogSys.log_settings[Logs::Guilds].is_category_enabled == 1)\
         OutF(LogSys, Logs::General, Logs::Guilds, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
@@ -581,6 +591,61 @@
         OutF(LogSys, Logs::Detail, Logs::Merchants, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
 } while (0)
 
+#define LogZonePoints(message, ...) do {\
+    if (LogSys.log_settings[Logs::ZonePoints].is_category_enabled == 1)\
+        OutF(LogSys, Logs::General, Logs::ZonePoints, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogZonePointsDetail(message, ...) do {\
+    if (LogSys.log_settings[Logs::ZonePoints].is_category_enabled == 1)\
+        OutF(LogSys, Logs::Detail, Logs::ZonePoints, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogLoot(message, ...) do {\
+    if (LogSys.log_settings[Logs::Loot].is_category_enabled == 1)\
+        OutF(LogSys, Logs::General, Logs::Loot, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogLootDetail(message, ...) do {\
+    if (LogSys.log_settings[Logs::Loot].is_category_enabled == 1)\
+        OutF(LogSys, Logs::Detail, Logs::Loot, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogExpeditions(message, ...) do {\
+    if (LogSys.log_settings[Logs::Expeditions].is_category_enabled == 1)\
+        OutF(LogSys, Logs::General, Logs::Expeditions, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogExpeditionsModerate(message, ...) do {\
+    if (LogSys.log_settings[Logs::Expeditions].is_category_enabled == 1)\
+        OutF(LogSys, Logs::Moderate, Logs::Expeditions, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogExpeditionsDetail(message, ...) do {\
+    if (LogSys.log_settings[Logs::Expeditions].is_category_enabled == 1)\
+        OutF(LogSys, Logs::Detail, Logs::Expeditions, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogDynamicZones(message, ...) do {\
+    if (LogSys.log_settings[Logs::DynamicZones].is_category_enabled == 1)\
+        OutF(LogSys, Logs::General, Logs::DynamicZones, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogDynamicZonesDetail(message, ...) do {\
+    if (LogSys.log_settings[Logs::DynamicZones].is_category_enabled == 1)\
+        OutF(LogSys, Logs::Detail, Logs::DynamicZones, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogAdventure(message, ...) do {\
+    if (LogSys.log_settings[Logs::Adventure].is_category_enabled == 1)\
+        OutF(LogSys, Logs::General, Logs::Adventure, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogAdventureDetail(message, ...) do {\
+    if (LogSys.log_settings[Logs::Adventure].is_category_enabled == 1)\
+        OutF(LogSys, Logs::Detail, Logs::Adventure, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
 #define Log(debug_level, log_category, message, ...) do {\
     if (LogSys.log_settings[log_category].is_category_enabled == 1)\
         LogSys.Out(debug_level, log_category, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
@@ -674,6 +739,12 @@
 #define LogDoorsDetail(message, ...) do {\
 } while (0)
 
+#define LogGroup(message, ...) do {\
+} while (0)
+
+#define LogGroupDetail(message, ...) do {\
+} while (0)
+
 #define LogGuilds(message, ...) do {\
 } while (0)
 
@@ -926,6 +997,27 @@
 #define LogMerchantsDetail(message, ...) do {\
 } while (0)
 
+#define LogZonePoints(message, ...) do {\
+} while (0)
+
+#define LogZonePointsDetail(message, ...) do {\
+} while (0)
+
+#define LogExpeditions(message, ...) do {\
+} while (0)
+
+#define LogExpeditionsModerate(message, ...) do {\
+} while (0)
+
+#define LogExpeditionsDetail(message, ...) do {\
+} while (0)
+
+#define LogDynamicZones(message, ...) do {\
+} while (0)
+
+#define LogDynamicZonesDetail(message, ...) do {\
+} while (0)
+
 #define Log(debug_level, log_category, message, ...) do {\
 } while (0)
 
@@ -933,4 +1025,4 @@
 } while (0)
 #endif
 
-#endif //EQEMU_EQEMU_LOGSYS_LOG_ALIASES_H
+#endif //EQEMU_EQEMU_LOGSYS_LOG_ALIASES_H

common/event/event_loop.h

@@ -25,6 +25,10 @@ namespace EQ
 			uv_run(&m_loop, UV_RUN_DEFAULT);
 		}
 
+		void Shutdown() {
+			uv_stop(&m_loop);
+		}
+
 		uv_loop_t* Handle() { return &m_loop; }
 
 	private:

common/event/task.h

@@ -8,7 +8,7 @@ namespace EQ {
 	class Task
 	{
 	public:
-		typedef std::function<void(const EQEmu::Any&)> ResolveFn;
+		typedef std::function<void(const EQ::Any&)> ResolveFn;
 		typedef std::function<void(const std::exception&)> RejectFn;
 		typedef std::function<void()> FinallyFn;
 		typedef std::function<void(ResolveFn, RejectFn)> TaskFn;
@@ -19,7 +19,7 @@ namespace EQ {
 			RejectFn on_catch;
 			FinallyFn on_finally;
 			bool has_result;
-			EQEmu::Any result;
+			EQ::Any result;
 			bool has_error;
 			std::exception error;
 		};
@@ -63,7 +63,7 @@ namespace EQ {
 			uv_queue_work(EventLoop::Get().Handle(), m_work, [](uv_work_t* req) {
 				TaskBaton *baton = (TaskBaton*)req->data;
 
-				baton->fn([baton](const EQEmu::Any& result) {
+				baton->fn([baton](const EQ::Any& result) {
 					baton->has_error = false;
 					baton->has_result = true;
 					baton->result = result;

common/extprofile.h

@@ -40,7 +40,7 @@ struct ExtendedProfile_Struct {
 	uint16				old_pet_hp; /* Not Used */
 	uint16				old_pet_mana; /* Not Used */
 	SpellBuff_Struct	pet_buffs[BUFF_COUNT]; /* Not Used */
-	EQEmu::TextureMaterialProfile	pet_items; /* Not Used */
+	EQ::TextureMaterialProfile	pet_items; /* Not Used */
 	char				merc_name[64]; /* Used */
 
 	uint32				aa_effects; /* Used */

common/fixed_memory_hash_set.h

@@ -23,7 +23,7 @@
 #include "eqemu_exception.h"
 #include "types.h"
 
-namespace EQEmu {
+namespace EQ {
 
 	/*! Simple HashSet designed to be used in fixed memory that may be difficult to use an
 	allocator for (shared memory), we assume all keys are unsigned int

common/fixed_memory_variable_hash_set.h

@@ -23,7 +23,7 @@
 #include "eqemu_exception.h"
 #include "types.h"
 
-namespace EQEmu {
+namespace EQ {
 
 	/*! Simple HashSet designed to be used in fixed memory that may be difficult to use an
 	allocator for (shared memory), we assume all keys are unsigned int, values are a pointer and size

common/inventory_profile.cpp

@@ -33,7 +33,7 @@
 
 #include <iostream>
 
-std::list<EQEmu::ItemInstance*> dirty_inst;
+std::list<EQ::ItemInstance*> dirty_inst;
 
 
 //
@@ -48,50 +48,50 @@ ItemInstQueue::~ItemInstQueue()
 }
 
 // Put item onto back of queue
-void ItemInstQueue::push(EQEmu::ItemInstance* inst)
+void ItemInstQueue::push(EQ::ItemInstance* inst)
 {
 	m_list.push_back(inst);
 }
 
 // Put item onto front of queue
-void ItemInstQueue::push_front(EQEmu::ItemInstance* inst)
+void ItemInstQueue::push_front(EQ::ItemInstance* inst)
 {
 	m_list.push_front(inst);
 }
 
 // Remove item from front of queue
-EQEmu::ItemInstance* ItemInstQueue::pop()
+EQ::ItemInstance* ItemInstQueue::pop()
 {
 	if (m_list.empty())
 		return nullptr;
 
-	EQEmu::ItemInstance* inst = m_list.front();
+	EQ::ItemInstance* inst = m_list.front();
 	m_list.pop_front();
 	return inst;
 }
 
 // Remove item from back of queue
-EQEmu::ItemInstance* ItemInstQueue::pop_back()
+EQ::ItemInstance* ItemInstQueue::pop_back()
 {
 	if (m_list.empty())
 		return nullptr;
 
-	EQEmu::ItemInstance* inst = m_list.back();
+	EQ::ItemInstance* inst = m_list.back();
 	m_list.pop_back();
 	return inst;
 }
 
 // Look at item at front of queue
-EQEmu::ItemInstance* ItemInstQueue::peek_front() const
+EQ::ItemInstance* ItemInstQueue::peek_front() const
 {
 	return (m_list.empty()) ? nullptr : m_list.front();
 }
 
 
 //
-// class EQEmu::InventoryProfile
+// class EQ::InventoryProfile
 //
-EQEmu::InventoryProfile::~InventoryProfile()
+EQ::InventoryProfile::~InventoryProfile()
 {
 	for (auto iter = m_worn.begin(); iter != m_worn.end(); ++iter) {
 		safe_delete(iter->second);
@@ -119,18 +119,18 @@ EQEmu::InventoryProfile::~InventoryProfile()
 	m_trade.clear();
 }
 
-void EQEmu::InventoryProfile::SetInventoryVersion(versions::MobVersion inventory_version) {
+void EQ::InventoryProfile::SetInventoryVersion(versions::MobVersion inventory_version) {
 	m_mob_version = versions::ValidateMobVersion(inventory_version);
 	SetGMInventory(m_gm_inventory);
 }
 
-void EQEmu::InventoryProfile::SetGMInventory(bool gmi_flag) {
+void EQ::InventoryProfile::SetGMInventory(bool gmi_flag) {
 	m_gm_inventory = gmi_flag;
 
 	m_lookup = inventory::DynamicLookup(m_mob_version, gmi_flag);
 }
 
-void EQEmu::InventoryProfile::CleanDirty() {
+void EQ::InventoryProfile::CleanDirty() {
 	auto iter = dirty_inst.begin();
 	while (iter != dirty_inst.end()) {
 		delete (*iter);
@@ -139,14 +139,14 @@ void EQEmu::InventoryProfile::CleanDirty() {
 	dirty_inst.clear();
 }
 
-void EQEmu::InventoryProfile::MarkDirty(ItemInstance *inst) {
+void EQ::InventoryProfile::MarkDirty(ItemInstance *inst) {
 	if (inst) {
 		dirty_inst.push_back(inst);
 	}
 }
 
 // Retrieve item at specified slot; returns false if item not found
-EQEmu::ItemInstance* EQEmu::InventoryProfile::GetItem(int16 slot_id) const
+EQ::ItemInstance* EQ::InventoryProfile::GetItem(int16 slot_id) const
 {
 	ItemInstance* result = nullptr;
 
@@ -219,31 +219,31 @@ EQEmu::ItemInstance* EQEmu::InventoryProfile::GetItem(int16 slot_id) const
 }
 
 // Retrieve item at specified position within bag
-EQEmu::ItemInstance* EQEmu::InventoryProfile::GetItem(int16 slot_id, uint8 bagidx) const
+EQ::ItemInstance* EQ::InventoryProfile::GetItem(int16 slot_id, uint8 bagidx) const
 {
 	return GetItem(InventoryProfile::CalcSlotId(slot_id, bagidx));
 }
 
 // Put an item snto specified slot
-int16 EQEmu::InventoryProfile::PutItem(int16 slot_id, const ItemInstance& inst)
+int16 EQ::InventoryProfile::PutItem(int16 slot_id, const ItemInstance& inst)
 {
-	if (slot_id <= EQEmu::invslot::POSSESSIONS_END && slot_id >= EQEmu::invslot::POSSESSIONS_BEGIN) {
+	if (slot_id <= EQ::invslot::POSSESSIONS_END && slot_id >= EQ::invslot::POSSESSIONS_BEGIN) {
 		if ((((uint64)1 << slot_id) & m_lookup->PossessionsBitmask) == 0)
-			return EQEmu::invslot::SLOT_INVALID;
+			return EQ::invslot::SLOT_INVALID;
 	}
-	else if (slot_id <= EQEmu::invbag::GENERAL_BAGS_END && slot_id >= EQEmu::invbag::GENERAL_BAGS_BEGIN) {
-		auto temp_slot = EQEmu::invslot::GENERAL_BEGIN + ((slot_id - EQEmu::invbag::GENERAL_BAGS_BEGIN) / EQEmu::invbag::SLOT_COUNT);
+	else if (slot_id <= EQ::invbag::GENERAL_BAGS_END && slot_id >= EQ::invbag::GENERAL_BAGS_BEGIN) {
+		auto temp_slot = EQ::invslot::GENERAL_BEGIN + ((slot_id - EQ::invbag::GENERAL_BAGS_BEGIN) / EQ::invbag::SLOT_COUNT);
 		if ((((uint64)1 << temp_slot) & m_lookup->PossessionsBitmask) == 0)
-			return EQEmu::invslot::SLOT_INVALID;
+			return EQ::invslot::SLOT_INVALID;
 	}
-	else if (slot_id <= EQEmu::invslot::BANK_END && slot_id >= EQEmu::invslot::BANK_BEGIN) {
-		if ((slot_id - EQEmu::invslot::BANK_BEGIN) >= m_lookup->InventoryTypeSize.Bank)
-			return EQEmu::invslot::SLOT_INVALID;
+	else if (slot_id <= EQ::invslot::BANK_END && slot_id >= EQ::invslot::BANK_BEGIN) {
+		if ((slot_id - EQ::invslot::BANK_BEGIN) >= m_lookup->InventoryTypeSize.Bank)
+			return EQ::invslot::SLOT_INVALID;
 	}
-	else if (slot_id <= EQEmu::invbag::BANK_BAGS_END && slot_id >= EQEmu::invbag::BANK_BAGS_BEGIN) {
-		auto temp_slot = (slot_id - EQEmu::invbag::BANK_BAGS_BEGIN) / EQEmu::invbag::SLOT_COUNT;
+	else if (slot_id <= EQ::invbag::BANK_BAGS_END && slot_id >= EQ::invbag::BANK_BAGS_BEGIN) {
+		auto temp_slot = (slot_id - EQ::invbag::BANK_BAGS_BEGIN) / EQ::invbag::SLOT_COUNT;
 		if (temp_slot >= m_lookup->InventoryTypeSize.Bank)
-			return EQEmu::invslot::SLOT_INVALID;
+			return EQ::invslot::SLOT_INVALID;
 	}
 	
 	// Clean up item already in slot (if exists)
@@ -259,17 +259,17 @@ int16 EQEmu::InventoryProfile::PutItem(int16 slot_id, const ItemInstance& inst)
 	return _PutItem(slot_id, inst.Clone());
 }
 
-int16 EQEmu::InventoryProfile::PushCursor(const ItemInstance &inst) {
+int16 EQ::InventoryProfile::PushCursor(const ItemInstance &inst) {
 	m_cursor.push(inst.Clone());
 	return invslot::slotCursor;
 }
 
-EQEmu::ItemInstance* EQEmu::InventoryProfile::GetCursorItem() {
+EQ::ItemInstance* EQ::InventoryProfile::GetCursorItem() {
 	return m_cursor.peek_front();
 }
 
 // Swap items in inventory
-bool EQEmu::InventoryProfile::SwapItem(
+bool EQ::InventoryProfile::SwapItem(
 	int16 source_slot,
 	int16 destination_slot,
 	SwapItemFailState &fail_state,
@@ -280,54 +280,54 @@ bool EQEmu::InventoryProfile::SwapItem(
 ) {
 	fail_state = swapInvalid;
 
-	if (source_slot <= EQEmu::invslot::POSSESSIONS_END && source_slot >= EQEmu::invslot::POSSESSIONS_BEGIN) {
+	if (source_slot <= EQ::invslot::POSSESSIONS_END && source_slot >= EQ::invslot::POSSESSIONS_BEGIN) {
 		if ((((uint64) 1 << source_slot) & m_lookup->PossessionsBitmask) == 0) {
 			fail_state = swapNotAllowed;
 			return false;
 		}
 	}
-	else if (source_slot <= EQEmu::invbag::GENERAL_BAGS_END && source_slot >= EQEmu::invbag::GENERAL_BAGS_BEGIN) {
-		auto temp_slot = EQEmu::invslot::GENERAL_BEGIN + ((source_slot - EQEmu::invbag::GENERAL_BAGS_BEGIN) / EQEmu::invbag::SLOT_COUNT);
+	else if (source_slot <= EQ::invbag::GENERAL_BAGS_END && source_slot >= EQ::invbag::GENERAL_BAGS_BEGIN) {
+		auto temp_slot = EQ::invslot::GENERAL_BEGIN + ((source_slot - EQ::invbag::GENERAL_BAGS_BEGIN) / EQ::invbag::SLOT_COUNT);
 		if ((((uint64)1 << temp_slot) & m_lookup->PossessionsBitmask) == 0) {
 			fail_state = swapNotAllowed;
 			return false;
 		}
 	}
-	else if (source_slot <= EQEmu::invslot::BANK_END && source_slot >= EQEmu::invslot::BANK_BEGIN) {
-		if ((source_slot - EQEmu::invslot::BANK_BEGIN) >= m_lookup->InventoryTypeSize.Bank) {
+	else if (source_slot <= EQ::invslot::BANK_END && source_slot >= EQ::invslot::BANK_BEGIN) {
+		if ((source_slot - EQ::invslot::BANK_BEGIN) >= m_lookup->InventoryTypeSize.Bank) {
 			fail_state = swapNotAllowed;
 			return false;
 		}
 	}
-	else if (source_slot <= EQEmu::invbag::BANK_BAGS_END && source_slot >= EQEmu::invbag::BANK_BAGS_BEGIN) {
-		auto temp_slot = (source_slot - EQEmu::invbag::BANK_BAGS_BEGIN) / EQEmu::invbag::SLOT_COUNT;
+	else if (source_slot <= EQ::invbag::BANK_BAGS_END && source_slot >= EQ::invbag::BANK_BAGS_BEGIN) {
+		auto temp_slot = (source_slot - EQ::invbag::BANK_BAGS_BEGIN) / EQ::invbag::SLOT_COUNT;
 		if (temp_slot >= m_lookup->InventoryTypeSize.Bank) {
 			fail_state = swapNotAllowed;
 			return false;
 		}
 	}
 
-	if (destination_slot <= EQEmu::invslot::POSSESSIONS_END && destination_slot >= EQEmu::invslot::POSSESSIONS_BEGIN) {
+	if (destination_slot <= EQ::invslot::POSSESSIONS_END && destination_slot >= EQ::invslot::POSSESSIONS_BEGIN) {
 		if ((((uint64)1 << destination_slot) & m_lookup->PossessionsBitmask) == 0) {
 			fail_state = swapNotAllowed;
 			return false;
 		}
 	}
-	else if (destination_slot <= EQEmu::invbag::GENERAL_BAGS_END && destination_slot >= EQEmu::invbag::GENERAL_BAGS_BEGIN) {
-		auto temp_slot = EQEmu::invslot::GENERAL_BEGIN + ((destination_slot - EQEmu::invbag::GENERAL_BAGS_BEGIN) / EQEmu::invbag::SLOT_COUNT);
+	else if (destination_slot <= EQ::invbag::GENERAL_BAGS_END && destination_slot >= EQ::invbag::GENERAL_BAGS_BEGIN) {
+		auto temp_slot = EQ::invslot::GENERAL_BEGIN + ((destination_slot - EQ::invbag::GENERAL_BAGS_BEGIN) / EQ::invbag::SLOT_COUNT);
 		if ((((uint64)1 << temp_slot) & m_lookup->PossessionsBitmask) == 0) {
 			fail_state = swapNotAllowed;
 			return false;
 		}
 	}
-	else if (destination_slot <= EQEmu::invslot::BANK_END && destination_slot >= EQEmu::invslot::BANK_BEGIN) {
-		if ((destination_slot - EQEmu::invslot::BANK_BEGIN) >= m_lookup->InventoryTypeSize.Bank) {
+	else if (destination_slot <= EQ::invslot::BANK_END && destination_slot >= EQ::invslot::BANK_BEGIN) {
+		if ((destination_slot - EQ::invslot::BANK_BEGIN) >= m_lookup->InventoryTypeSize.Bank) {
 			fail_state = swapNotAllowed;
 			return false;
 		}
 	}
-	else if (destination_slot <= EQEmu::invbag::BANK_BAGS_END && destination_slot >= EQEmu::invbag::BANK_BAGS_BEGIN) {
-		auto temp_slot = (destination_slot - EQEmu::invbag::BANK_BAGS_BEGIN) / EQEmu::invbag::SLOT_COUNT;
+	else if (destination_slot <= EQ::invbag::BANK_BAGS_END && destination_slot >= EQ::invbag::BANK_BAGS_BEGIN) {
+		auto temp_slot = (destination_slot - EQ::invbag::BANK_BAGS_BEGIN) / EQ::invbag::SLOT_COUNT;
 		if (temp_slot >= m_lookup->InventoryTypeSize.Bank) {
 			fail_state = swapNotAllowed;
 			return false;
@@ -399,7 +399,7 @@ bool EQEmu::InventoryProfile::SwapItem(
 }
 
 // Remove item from inventory (with memory delete)
-bool EQEmu::InventoryProfile::DeleteItem(int16 slot_id, uint8 quantity) {
+bool EQ::InventoryProfile::DeleteItem(int16 slot_id, uint8 quantity) {
 	// Pop item out of inventory map (or queue)
 	ItemInstance *item_to_delete = PopItem(slot_id);
 
@@ -434,7 +434,7 @@ bool EQEmu::InventoryProfile::DeleteItem(int16 slot_id, uint8 quantity) {
 }
 
 // Checks All items in a bag for No Drop
-bool EQEmu::InventoryProfile::CheckNoDrop(int16 slot_id, bool recurse)
+bool EQ::InventoryProfile::CheckNoDrop(int16 slot_id, bool recurse)
 {
 	ItemInstance* inst = GetItem(slot_id);
 	if (!inst)
@@ -445,7 +445,7 @@ bool EQEmu::InventoryProfile::CheckNoDrop(int16 slot_id, bool recurse)
 
 // Remove item from bucket without memory delete
 // Returns item pointer if full delete was successful
-EQEmu::ItemInstance* EQEmu::InventoryProfile::PopItem(int16 slot_id)
+EQ::ItemInstance* EQ::InventoryProfile::PopItem(int16 slot_id)
 {
 	ItemInstance* p = nullptr;
 
@@ -488,7 +488,7 @@ EQEmu::ItemInstance* EQEmu::InventoryProfile::PopItem(int16 slot_id)
 	return p;
 }
 
-bool EQEmu::InventoryProfile::HasSpaceForItem(const ItemData *ItemToTry, int16 Quantity) {
+bool EQ::InventoryProfile::HasSpaceForItem(const ItemData *ItemToTry, int16 Quantity) {
 
 	if (ItemToTry->Stackable) {
 
@@ -592,7 +592,7 @@ bool EQEmu::InventoryProfile::HasSpaceForItem(const ItemData *ItemToTry, int16 Q
 
 //This function has a flaw in that it only returns the last stack that it looked at
 //when quantity is greater than 1 and not all of quantity can be found in 1 stack.
-int16 EQEmu::InventoryProfile::HasItem(uint32 item_id, uint8 quantity, uint8 where)
+int16 EQ::InventoryProfile::HasItem(uint32 item_id, uint8 quantity, uint8 where)
 {
 	int16 slot_id = INVALID_INDEX;
 
@@ -642,7 +642,7 @@ int16 EQEmu::InventoryProfile::HasItem(uint32 item_id, uint8 quantity, uint8 whe
 }
 
 //this function has the same quantity flaw mentioned above in HasItem()
-int16 EQEmu::InventoryProfile::HasItemByUse(uint8 use, uint8 quantity, uint8 where)
+int16 EQ::InventoryProfile::HasItemByUse(uint8 use, uint8 quantity, uint8 where)
 {
 	int16 slot_id = INVALID_INDEX;
 
@@ -688,7 +688,7 @@ int16 EQEmu::InventoryProfile::HasItemByUse(uint8 use, uint8 quantity, uint8 whe
 	return slot_id;
 }
 
-int16 EQEmu::InventoryProfile::HasItemByLoreGroup(uint32 loregroup, uint8 where)
+int16 EQ::InventoryProfile::HasItemByLoreGroup(uint32 loregroup, uint8 where)
 {
 	int16 slot_id = INVALID_INDEX;
 
@@ -736,7 +736,7 @@ int16 EQEmu::InventoryProfile::HasItemByLoreGroup(uint32 loregroup, uint8 where)
 
 // Locate an available inventory slot
 // Returns slot_id when there's one available, else SLOT_INVALID
-int16 EQEmu::InventoryProfile::FindFreeSlot(bool for_bag, bool try_cursor, uint8 min_size, bool is_arrow)
+int16 EQ::InventoryProfile::FindFreeSlot(bool for_bag, bool try_cursor, uint8 min_size, bool is_arrow)
 {
 	// Check basic inventory
 	for (int16 i = invslot::GENERAL_BEGIN; i <= invslot::GENERAL_END; i++) {
@@ -786,7 +786,7 @@ int16 EQEmu::InventoryProfile::FindFreeSlot(bool for_bag, bool try_cursor, uint8
 }
 
 // This is a mix of HasSpaceForItem and FindFreeSlot..due to existing coding behavior, it was better to add a new helper function...
-int16 EQEmu::InventoryProfile::FindFreeSlotForTradeItem(const ItemInstance* inst, int16 general_start, uint8 bag_start) {
+int16 EQ::InventoryProfile::FindFreeSlotForTradeItem(const ItemInstance* inst, int16 general_start, uint8 bag_start) {
 	// Do not arbitrarily use this function..it is designed for use with Client::ResetTrade() and Client::FinishTrade().
 	// If you have a need, use it..but, understand it is not a suitable replacement for InventoryProfile::FindFreeSlot().
 	//
@@ -924,7 +924,7 @@ int16 EQEmu::InventoryProfile::FindFreeSlotForTradeItem(const ItemInstance* inst
 }
 
 // Opposite of below: Get parent bag slot_id from a slot inside of bag
-int16 EQEmu::InventoryProfile::CalcSlotId(int16 slot_id) {
+int16 EQ::InventoryProfile::CalcSlotId(int16 slot_id) {
 	int16 parent_slot_id = INVALID_INDEX;
 
 	// this is not a bag range... using this risks over-writing existing items
@@ -952,7 +952,7 @@ int16 EQEmu::InventoryProfile::CalcSlotId(int16 slot_id) {
 }
 
 // Calculate slot_id for an item within a bag
-int16 EQEmu::InventoryProfile::CalcSlotId(int16 bagslot_id, uint8 bagidx) {
+int16 EQ::InventoryProfile::CalcSlotId(int16 bagslot_id, uint8 bagidx) {
 	if (!InventoryProfile::SupportsContainers(bagslot_id))
 		return INVALID_INDEX;
 
@@ -977,7 +977,7 @@ int16 EQEmu::InventoryProfile::CalcSlotId(int16 bagslot_id, uint8 bagidx) {
 	return slot_id;
 }
 
-uint8 EQEmu::InventoryProfile::CalcBagIdx(int16 slot_id) {
+uint8 EQ::InventoryProfile::CalcBagIdx(int16 slot_id) {
 	uint8 index = 0;
 
 	// this is not a bag range... using this risks over-writing existing items
@@ -1006,7 +1006,7 @@ uint8 EQEmu::InventoryProfile::CalcBagIdx(int16 slot_id) {
 	return index;
 }
 
-int16 EQEmu::InventoryProfile::CalcSlotFromMaterial(uint8 material)
+int16 EQ::InventoryProfile::CalcSlotFromMaterial(uint8 material)
 {
 	switch (material)
 	{
@@ -1033,7 +1033,7 @@ int16 EQEmu::InventoryProfile::CalcSlotFromMaterial(uint8 material)
 	}
 }
 
-uint8 EQEmu::InventoryProfile::CalcMaterialFromSlot(int16 equipslot)
+uint8 EQ::InventoryProfile::CalcMaterialFromSlot(int16 equipslot)
 {
 	switch (equipslot)
 	{
@@ -1061,7 +1061,7 @@ uint8 EQEmu::InventoryProfile::CalcMaterialFromSlot(int16 equipslot)
 	}
 }
 
-bool EQEmu::InventoryProfile::CanItemFitInContainer(const ItemData *ItemToTry, const ItemData *Container) {
+bool EQ::InventoryProfile::CanItemFitInContainer(const ItemData *ItemToTry, const ItemData *Container) {
 
 	if (!ItemToTry || !Container)
 		return false;
@@ -1078,7 +1078,7 @@ bool EQEmu::InventoryProfile::CanItemFitInContainer(const ItemData *ItemToTry, c
 	return true;
 }
 
-bool EQEmu::InventoryProfile::SupportsClickCasting(int16 slot_id)
+bool EQ::InventoryProfile::SupportsClickCasting(int16 slot_id)
 {
 	// there are a few non-potion items that identify as ItemTypePotion..so, we still need to ubiquitously include the equipment range
 	if (slot_id >= invslot::EQUIPMENT_BEGIN && slot_id <= invslot::EQUIPMENT_END) {
@@ -1095,7 +1095,7 @@ bool EQEmu::InventoryProfile::SupportsClickCasting(int16 slot_id)
 	return false;
 }
 
-bool EQEmu::InventoryProfile::SupportsPotionBeltCasting(int16 slot_id)
+bool EQ::InventoryProfile::SupportsPotionBeltCasting(int16 slot_id)
 {
 	// does this have the same criteria as 'SupportsClickCasting' above? (bag clicking per client)
 	if (slot_id >= invslot::EQUIPMENT_BEGIN && slot_id <= invslot::EQUIPMENT_END) {
@@ -1112,7 +1112,7 @@ bool EQEmu::InventoryProfile::SupportsPotionBeltCasting(int16 slot_id)
 }
 
 // Test whether a given slot can support a container item
-bool EQEmu::InventoryProfile::SupportsContainers(int16 slot_id)
+bool EQ::InventoryProfile::SupportsContainers(int16 slot_id)
 {
 	if ((slot_id == invslot::slotCursor) ||
 		(slot_id >= invslot::GENERAL_BEGIN && slot_id <= invslot::GENERAL_END) ||
@@ -1126,7 +1126,7 @@ bool EQEmu::InventoryProfile::SupportsContainers(int16 slot_id)
 	return false;
 }
 
-int EQEmu::InventoryProfile::GetSlotByItemInst(ItemInstance *inst) {
+int EQ::InventoryProfile::GetSlotByItemInst(ItemInstance *inst) {
 	if (!inst)
 		return INVALID_INDEX;
 
@@ -1162,7 +1162,7 @@ int EQEmu::InventoryProfile::GetSlotByItemInst(ItemInstance *inst) {
 	return INVALID_INDEX;
 }
 
-uint8 EQEmu::InventoryProfile::FindBrightestLightType()
+uint8 EQ::InventoryProfile::FindBrightestLightType()
 {
 	uint8 brightest_light_type = 0;
 
@@ -1213,7 +1213,7 @@ uint8 EQEmu::InventoryProfile::FindBrightestLightType()
 	return brightest_light_type;
 }
 
-void EQEmu::InventoryProfile::dumpEntireInventory() {
+void EQ::InventoryProfile::dumpEntireInventory() {
 
 	dumpWornItems();
 	dumpInventory();
@@ -1223,29 +1223,29 @@ void EQEmu::InventoryProfile::dumpEntireInventory() {
 	std::cout << std::endl;
 }
 
-void EQEmu::InventoryProfile::dumpWornItems() {
+void EQ::InventoryProfile::dumpWornItems() {
 	std::cout << "Worn items:" << std::endl;
 	dumpItemCollection(m_worn);
 }
 
-void EQEmu::InventoryProfile::dumpInventory() {
+void EQ::InventoryProfile::dumpInventory() {
 	std::cout << "Inventory items:" << std::endl;
 	dumpItemCollection(m_inv);
 }
 
-void EQEmu::InventoryProfile::dumpBankItems() {
+void EQ::InventoryProfile::dumpBankItems() {
 
 	std::cout << "Bank items:" << std::endl;
 	dumpItemCollection(m_bank);
 }
 
-void EQEmu::InventoryProfile::dumpSharedBankItems() {
+void EQ::InventoryProfile::dumpSharedBankItems() {
 
 	std::cout << "Shared Bank items:" << std::endl;
 	dumpItemCollection(m_shbank);
 }
 
-int EQEmu::InventoryProfile::GetSlotByItemInstCollection(const std::map<int16, ItemInstance*> &collection, ItemInstance *inst) {
+int EQ::InventoryProfile::GetSlotByItemInstCollection(const std::map<int16, ItemInstance*> &collection, ItemInstance *inst) {
 	for (auto iter = collection.begin(); iter != collection.end(); ++iter) {
 		ItemInstance *t_inst = iter->second;
 		if (t_inst == inst) {
@@ -1261,10 +1261,10 @@ int EQEmu::InventoryProfile::GetSlotByItemInstCollection(const std::map<int16, I
 		}
 	}
 
-	return EQEmu::invslot::SLOT_INVALID;
+	return EQ::invslot::SLOT_INVALID;
 }
 
-void EQEmu::InventoryProfile::dumpItemCollection(const std::map<int16, ItemInstance*> &collection)
+void EQ::InventoryProfile::dumpItemCollection(const std::map<int16, ItemInstance*> &collection)
 {
 	for (auto it = collection.cbegin(); it != collection.cend(); ++it) {
 		auto inst = it->second;
@@ -1278,7 +1278,7 @@ void EQEmu::InventoryProfile::dumpItemCollection(const std::map<int16, ItemInsta
 	}
 }
 
-void EQEmu::InventoryProfile::dumpBagContents(ItemInstance *inst, std::map<int16, ItemInstance*>::const_iterator *it)
+void EQ::InventoryProfile::dumpBagContents(ItemInstance *inst, std::map<int16, ItemInstance*>::const_iterator *it)
 {
 	if (!inst || !inst->IsClassBag())
 		return;
@@ -1297,14 +1297,14 @@ void EQEmu::InventoryProfile::dumpBagContents(ItemInstance *inst, std::map<int16
 }
 
 // Internal Method: Retrieves item within an inventory bucket
-EQEmu::ItemInstance* EQEmu::InventoryProfile::_GetItem(const std::map<int16, ItemInstance*>& bucket, int16 slot_id) const
+EQ::ItemInstance* EQ::InventoryProfile::_GetItem(const std::map<int16, ItemInstance*>& bucket, int16 slot_id) const
 {
-	if (slot_id <= EQEmu::invslot::POSSESSIONS_END && slot_id >= EQEmu::invslot::POSSESSIONS_BEGIN) {
+	if (slot_id <= EQ::invslot::POSSESSIONS_END && slot_id >= EQ::invslot::POSSESSIONS_BEGIN) {
 		if ((((uint64)1 << slot_id) & m_lookup->PossessionsBitmask) == 0)
 			return nullptr;
 	}
-	else if (slot_id <= EQEmu::invslot::BANK_END && slot_id >= EQEmu::invslot::BANK_BEGIN) {
-		if (slot_id - EQEmu::invslot::BANK_BEGIN >= m_lookup->InventoryTypeSize.Bank)
+	else if (slot_id <= EQ::invslot::BANK_END && slot_id >= EQ::invslot::BANK_BEGIN) {
+		if (slot_id - EQ::invslot::BANK_BEGIN >= m_lookup->InventoryTypeSize.Bank)
 			return nullptr;
 	}
 	
@@ -1319,7 +1319,7 @@ EQEmu::ItemInstance* EQEmu::InventoryProfile::_GetItem(const std::map<int16, Ite
 
 // Internal Method: "put" item into bucket, without regard for what is currently in bucket
 // Assumes item has already been allocated
-int16 EQEmu::InventoryProfile::_PutItem(int16 slot_id, ItemInstance* inst)
+int16 EQ::InventoryProfile::_PutItem(int16 slot_id, ItemInstance* inst)
 {
 	// What happens here when we _PutItem(MainCursor)? Bad things..really bad things...
 	//
@@ -1356,7 +1356,7 @@ int16 EQEmu::InventoryProfile::_PutItem(int16 slot_id, ItemInstance* inst)
 		result = slot_id;
 	}
 	else if (slot_id >= invslot::BANK_BEGIN && slot_id <= invslot::BANK_END) {
-		if (slot_id - EQEmu::invslot::BANK_BEGIN < m_lookup->InventoryTypeSize.Bank) {
+		if (slot_id - EQ::invslot::BANK_BEGIN < m_lookup->InventoryTypeSize.Bank) {
 			m_bank[slot_id] = inst;
 			result = slot_id;
 		}
@@ -1389,17 +1389,17 @@ int16 EQEmu::InventoryProfile::_PutItem(int16 slot_id, ItemInstance* inst)
 }
 
 // Internal Method: Checks an inventory bucket for a particular item
-int16 EQEmu::InventoryProfile::_HasItem(std::map<int16, ItemInstance*>& bucket, uint32 item_id, uint8 quantity)
+int16 EQ::InventoryProfile::_HasItem(std::map<int16, ItemInstance*>& bucket, uint32 item_id, uint8 quantity)
 {
 	uint32 quantity_found = 0;
 
 	for (auto iter = bucket.begin(); iter != bucket.end(); ++iter) {
-		if (iter->first <= EQEmu::invslot::POSSESSIONS_END && iter->first >= EQEmu::invslot::POSSESSIONS_BEGIN) {
+		if (iter->first <= EQ::invslot::POSSESSIONS_END && iter->first >= EQ::invslot::POSSESSIONS_BEGIN) {
 			if ((((uint64)1 << iter->first) & m_lookup->PossessionsBitmask) == 0)
 				continue;
 		}
-		else if (iter->first <= EQEmu::invslot::BANK_END && iter->first >= EQEmu::invslot::BANK_BEGIN) {
-			if (iter->first - EQEmu::invslot::BANK_BEGIN >= m_lookup->InventoryTypeSize.Bank)
+		else if (iter->first <= EQ::invslot::BANK_END && iter->first >= EQ::invslot::BANK_BEGIN) {
+			if (iter->first - EQ::invslot::BANK_BEGIN >= m_lookup->InventoryTypeSize.Bank)
 				continue;
 		}
 
@@ -1440,7 +1440,7 @@ int16 EQEmu::InventoryProfile::_HasItem(std::map<int16, ItemInstance*>& bucket,
 }
 
 // Internal Method: Checks an inventory queue type bucket for a particular item
-int16 EQEmu::InventoryProfile::_HasItem(ItemInstQueue& iqueue, uint32 item_id, uint8 quantity)
+int16 EQ::InventoryProfile::_HasItem(ItemInstQueue& iqueue, uint32 item_id, uint8 quantity)
 {
 	// The downfall of this (these) queue procedure is that callers presume that when an item is
 	// found, it is presented as being available on the cursor. In cases of a parity check, this
@@ -1491,17 +1491,17 @@ int16 EQEmu::InventoryProfile::_HasItem(ItemInstQueue& iqueue, uint32 item_id, u
 }
 
 // Internal Method: Checks an inventory bucket for a particular item
-int16 EQEmu::InventoryProfile::_HasItemByUse(std::map<int16, ItemInstance*>& bucket, uint8 use, uint8 quantity)
+int16 EQ::InventoryProfile::_HasItemByUse(std::map<int16, ItemInstance*>& bucket, uint8 use, uint8 quantity)
 {
 	uint32 quantity_found = 0;
 
 	for (auto iter = bucket.begin(); iter != bucket.end(); ++iter) {
-		if (iter->first <= EQEmu::invslot::POSSESSIONS_END && iter->first >= EQEmu::invslot::POSSESSIONS_BEGIN) {
+		if (iter->first <= EQ::invslot::POSSESSIONS_END && iter->first >= EQ::invslot::POSSESSIONS_BEGIN) {
 			if ((((uint64)1 << iter->first) & m_lookup->PossessionsBitmask) == 0)
 				continue;
 		}
-		else if (iter->first <= EQEmu::invslot::BANK_END && iter->first >= EQEmu::invslot::BANK_BEGIN) {
-			if (iter->first - EQEmu::invslot::BANK_BEGIN >= m_lookup->InventoryTypeSize.Bank)
+		else if (iter->first <= EQ::invslot::BANK_END && iter->first >= EQ::invslot::BANK_BEGIN) {
+			if (iter->first - EQ::invslot::BANK_BEGIN >= m_lookup->InventoryTypeSize.Bank)
 				continue;
 		}
 
@@ -1532,7 +1532,7 @@ int16 EQEmu::InventoryProfile::_HasItemByUse(std::map<int16, ItemInstance*>& buc
 }
 
 // Internal Method: Checks an inventory queue type bucket for a particular item
-int16 EQEmu::InventoryProfile::_HasItemByUse(ItemInstQueue& iqueue, uint8 use, uint8 quantity)
+int16 EQ::InventoryProfile::_HasItemByUse(ItemInstQueue& iqueue, uint8 use, uint8 quantity)
 {
 	uint32 quantity_found = 0;
 
@@ -1566,15 +1566,15 @@ int16 EQEmu::InventoryProfile::_HasItemByUse(ItemInstQueue& iqueue, uint8 use, u
 	return INVALID_INDEX;
 }
 
-int16 EQEmu::InventoryProfile::_HasItemByLoreGroup(std::map<int16, ItemInstance*>& bucket, uint32 loregroup)
+int16 EQ::InventoryProfile::_HasItemByLoreGroup(std::map<int16, ItemInstance*>& bucket, uint32 loregroup)
 {
 	for (auto iter = bucket.begin(); iter != bucket.end(); ++iter) {
-		if (iter->first <= EQEmu::invslot::POSSESSIONS_END && iter->first >= EQEmu::invslot::POSSESSIONS_BEGIN) {
+		if (iter->first <= EQ::invslot::POSSESSIONS_END && iter->first >= EQ::invslot::POSSESSIONS_BEGIN) {
 			if ((((uint64)1 << iter->first) & m_lookup->PossessionsBitmask) == 0)
 				continue;
 		}
-		else if (iter->first <= EQEmu::invslot::BANK_END && iter->first >= EQEmu::invslot::BANK_BEGIN) {
-			if (iter->first - EQEmu::invslot::BANK_BEGIN >= m_lookup->InventoryTypeSize.Bank)
+		else if (iter->first <= EQ::invslot::BANK_END && iter->first >= EQ::invslot::BANK_BEGIN) {
+			if (iter->first - EQ::invslot::BANK_BEGIN >= m_lookup->InventoryTypeSize.Bank)
 				continue;
 		}
 
@@ -1611,11 +1611,11 @@ int16 EQEmu::InventoryProfile::_HasItemByLoreGroup(std::map<int16, ItemInstance*
 		}
 	}
 
-	return EQEmu::invslot::SLOT_INVALID;
+	return EQ::invslot::SLOT_INVALID;
 }
 
 // Internal Method: Checks an inventory queue type bucket for a particular item
-int16 EQEmu::InventoryProfile::_HasItemByLoreGroup(ItemInstQueue& iqueue, uint32 loregroup)
+int16 EQ::InventoryProfile::_HasItemByLoreGroup(ItemInstQueue& iqueue, uint32 loregroup)
 {
 	for (auto iter = iqueue.cbegin(); iter != iqueue.cend(); ++iter) {
 		auto inst = *iter;
@@ -1654,5 +1654,5 @@ int16 EQEmu::InventoryProfile::_HasItemByLoreGroup(ItemInstQueue& iqueue, uint32
 		break;
 	}
 	
-	return EQEmu::invslot::SLOT_INVALID;
+	return EQ::invslot::SLOT_INVALID;
 }

common/inventory_profile.h

@@ -52,30 +52,30 @@ public:
 	// Public Methods
 	/////////////////////////
 
-	inline std::list<EQEmu::ItemInstance*>::const_iterator cbegin() { return m_list.cbegin(); }
-	inline std::list<EQEmu::ItemInstance*>::const_iterator cend() { return m_list.cend(); }
+	inline std::list<EQ::ItemInstance*>::const_iterator cbegin() { return m_list.cbegin(); }
+	inline std::list<EQ::ItemInstance*>::const_iterator cend() { return m_list.cend(); }
 
 	inline int size() { return static_cast<int>(m_list.size()); } // TODO: change to size_t
 	inline bool empty() { return m_list.empty(); }
 
-	void push(EQEmu::ItemInstance* inst);
-	void push_front(EQEmu::ItemInstance* inst);
-	EQEmu::ItemInstance* pop();
-	EQEmu::ItemInstance* pop_back();
-	EQEmu::ItemInstance* peek_front() const;
+	void push(EQ::ItemInstance* inst);
+	void push_front(EQ::ItemInstance* inst);
+	EQ::ItemInstance* pop();
+	EQ::ItemInstance* pop_back();
+	EQ::ItemInstance* peek_front() const;
 
 protected:
 	/////////////////////////
 	// Protected Members
 	/////////////////////////
 
-	std::list<EQEmu::ItemInstance*> m_list;
+	std::list<EQ::ItemInstance*> m_list;
 };
 
 // ########################################
-// Class: EQEmu::InventoryProfile
+// Class: EQ::InventoryProfile
 //	Character inventory
-namespace EQEmu
+namespace EQ
 {
 	class InventoryProfile
 	{

common/inventory_slot.cpp

@@ -22,7 +22,7 @@
 #include "string_util.h"
 
 
-int8 EQEmu::inventory::ConvertEquipmentIndexToTextureIndex(int16 slot_index)
+int8 EQ::inventory::ConvertEquipmentIndexToTextureIndex(int16 slot_index)
 {
 	switch (slot_index) {
 	case invslot::slotHead:
@@ -48,7 +48,7 @@ int8 EQEmu::inventory::ConvertEquipmentIndexToTextureIndex(int16 slot_index)
 	}
 }
 
-int8 EQEmu::inventory::ConvertEquipmentSlotToTextureIndex(const InventorySlot& inventory_slot)
+int8 EQ::inventory::ConvertEquipmentSlotToTextureIndex(const InventorySlot& inventory_slot)
 {
 	if ((!inventory_slot.Typeless() && !inventory_slot.IsTypeIndex(invtype::typePossessions)) || !inventory_slot.IsContainerIndex(invbag::SLOT_INVALID) || !inventory_slot.IsSocketIndex(invaug::SOCKET_INVALID))
 		return textures::textureInvalid;
@@ -56,7 +56,7 @@ int8 EQEmu::inventory::ConvertEquipmentSlotToTextureIndex(const InventorySlot& i
 	return ConvertEquipmentIndexToTextureIndex(inventory_slot.SlotIndex());
 }
 
-int16 EQEmu::inventory::ConvertTextureIndexToEquipmentIndex(int8 texture_index)
+int16 EQ::inventory::ConvertTextureIndexToEquipmentIndex(int8 texture_index)
 {
 	switch (texture_index) {
 	case textures::armorHead:
@@ -82,7 +82,7 @@ int16 EQEmu::inventory::ConvertTextureIndexToEquipmentIndex(int8 texture_index)
 	}
 }
 
-bool EQEmu::InventorySlot::IsValidSlot() const
+bool EQ::InventorySlot::IsValidSlot() const
 {
 	if (_typeless)
 		return false;
@@ -100,7 +100,7 @@ bool EQEmu::InventorySlot::IsValidSlot() const
 	return true;
 }
 
-bool EQEmu::InventorySlot::IsDeleteSlot() const
+bool EQ::InventorySlot::IsDeleteSlot() const
 {
 	if (_typeless)
 		return (_slot_index == invslot::SLOT_INVALID && _container_index == invbag::SLOT_INVALID && _socket_index == invaug::SOCKET_INVALID);
@@ -108,7 +108,7 @@ bool EQEmu::InventorySlot::IsDeleteSlot() const
 		return (_type_index == invtype::TYPE_INVALID && _slot_index == invslot::SLOT_INVALID && _container_index == invbag::SLOT_INVALID && _socket_index == invaug::SOCKET_INVALID);
 }
 
-bool EQEmu::InventorySlot::IsEquipmentIndex(int16 slot_index)
+bool EQ::InventorySlot::IsEquipmentIndex(int16 slot_index)
 {
 	if (slot_index < invslot::EQUIPMENT_BEGIN || slot_index > invslot::EQUIPMENT_END)
 		return false;
@@ -116,7 +116,7 @@ bool EQEmu::InventorySlot::IsEquipmentIndex(int16 slot_index)
 	return true;
 }
 
-bool EQEmu::InventorySlot::IsGeneralIndex(int16 slot_index)
+bool EQ::InventorySlot::IsGeneralIndex(int16 slot_index)
 {
 	if (slot_index < invslot::GENERAL_BEGIN || slot_index > invslot::GENERAL_END)
 		return false;
@@ -124,7 +124,7 @@ bool EQEmu::InventorySlot::IsGeneralIndex(int16 slot_index)
 	return true;
 }
 
-bool EQEmu::InventorySlot::IsCursorIndex(int16 slot_index)
+bool EQ::InventorySlot::IsCursorIndex(int16 slot_index)
 {
 	if (slot_index == invslot::slotCursor)
 		return true;
@@ -132,7 +132,7 @@ bool EQEmu::InventorySlot::IsCursorIndex(int16 slot_index)
 	return false;
 }
 
-bool EQEmu::InventorySlot::IsWeaponIndex(int16 slot_index)
+bool EQ::InventorySlot::IsWeaponIndex(int16 slot_index)
 {
 	if (slot_index == invslot::slotPrimary || slot_index == invslot::slotSecondary || slot_index == invslot::slotRange)
 		return true;
@@ -140,7 +140,7 @@ bool EQEmu::InventorySlot::IsWeaponIndex(int16 slot_index)
 	return false;
 }
 
-bool EQEmu::InventorySlot::IsTextureIndex(int16 slot_index)
+bool EQ::InventorySlot::IsTextureIndex(int16 slot_index)
 {
 	switch (slot_index) {
 	case invslot::slotHead:
@@ -158,7 +158,7 @@ bool EQEmu::InventorySlot::IsTextureIndex(int16 slot_index)
 	}
 }
 
-bool EQEmu::InventorySlot::IsTintableIndex(int16 slot_index)
+bool EQ::InventorySlot::IsTintableIndex(int16 slot_index)
 {
 	switch (slot_index) {
 	case invslot::slotHead:
@@ -174,7 +174,7 @@ bool EQEmu::InventorySlot::IsTintableIndex(int16 slot_index)
 	}
 }
 
-bool EQEmu::InventorySlot::IsEquipmentSlot() const
+bool EQ::InventorySlot::IsEquipmentSlot() const
 {
 	if (!_typeless && (_type_index != invtype::typePossessions))
 		return false;
@@ -185,7 +185,7 @@ bool EQEmu::InventorySlot::IsEquipmentSlot() const
 	return IsEquipmentIndex(_slot_index);
 }
 
-bool EQEmu::InventorySlot::IsGeneralSlot() const
+bool EQ::InventorySlot::IsGeneralSlot() const
 {
 	if (!_typeless && (_type_index != invtype::typePossessions))
 		return false;
@@ -196,7 +196,7 @@ bool EQEmu::InventorySlot::IsGeneralSlot() const
 	return IsGeneralIndex(_socket_index);
 }
 
-bool EQEmu::InventorySlot::IsCursorSlot() const
+bool EQ::InventorySlot::IsCursorSlot() const
 {
 	if (!_typeless && (_type_index != invtype::typePossessions))
 		return false;
@@ -207,7 +207,7 @@ bool EQEmu::InventorySlot::IsCursorSlot() const
 	return IsCursorIndex(_slot_index);
 }
 
-bool EQEmu::InventorySlot::IsWeaponSlot() const
+bool EQ::InventorySlot::IsWeaponSlot() const
 {
 	if (!_typeless && (_type_index != invtype::typePossessions))
 		return false;
@@ -218,7 +218,7 @@ bool EQEmu::InventorySlot::IsWeaponSlot() const
 	return IsWeaponIndex(_slot_index);
 }
 
-bool EQEmu::InventorySlot::IsTextureSlot() const
+bool EQ::InventorySlot::IsTextureSlot() const
 {
 	if (!_typeless && (_type_index != invtype::typePossessions))
 		return false;
@@ -229,7 +229,7 @@ bool EQEmu::InventorySlot::IsTextureSlot() const
 	return IsTextureIndex(_slot_index);
 }
 
-bool EQEmu::InventorySlot::IsTintableSlot() const
+bool EQ::InventorySlot::IsTintableSlot() const
 {
 	if (!_typeless && (_type_index != invtype::typePossessions))
 		return false;
@@ -240,7 +240,7 @@ bool EQEmu::InventorySlot::IsTintableSlot() const
 	return IsTintableIndex(_slot_index);
 }
 
-bool EQEmu::InventorySlot::IsSlot() const
+bool EQ::InventorySlot::IsSlot() const
 {
 	if (!_typeless && (_type_index == invtype::TYPE_INVALID))
 		return false;
@@ -254,7 +254,7 @@ bool EQEmu::InventorySlot::IsSlot() const
 	return true;
 }
 
-bool EQEmu::InventorySlot::IsSlotSocket() const
+bool EQ::InventorySlot::IsSlotSocket() const
 {
 	if (!_typeless && (_type_index == invtype::TYPE_INVALID))
 		return false;
@@ -268,7 +268,7 @@ bool EQEmu::InventorySlot::IsSlotSocket() const
 	return true;
 }
 
-bool EQEmu::InventorySlot::IsContainer() const
+bool EQ::InventorySlot::IsContainer() const
 {
 	if (!_typeless && (_type_index == invtype::TYPE_INVALID))
 		return false;
@@ -282,7 +282,7 @@ bool EQEmu::InventorySlot::IsContainer() const
 	return true;
 }
 
-bool EQEmu::InventorySlot::IsContainerSocket() const
+bool EQ::InventorySlot::IsContainerSocket() const
 {
 	if (!_typeless && (_type_index == invtype::TYPE_INVALID))
 		return false;
@@ -296,12 +296,12 @@ bool EQEmu::InventorySlot::IsContainerSocket() const
 	return true;
 }
 
-EQEmu::InventorySlot EQEmu::InventorySlot::ToTopOwner() const
+EQ::InventorySlot EQ::InventorySlot::ToTopOwner() const
 {
 	return InventorySlot(_type_index, _slot_index);
 }
 
-EQEmu::InventorySlot EQEmu::InventorySlot::ToOwner() const
+EQ::InventorySlot EQ::InventorySlot::ToOwner() const
 {
 	if (IsSlot() || IsSlotSocket() || IsContainer())
 		return InventorySlot(_type_index, _slot_index);
@@ -312,17 +312,17 @@ EQEmu::InventorySlot EQEmu::InventorySlot::ToOwner() const
 	return InventorySlot();
 }
 
-const std::string EQEmu::InventorySlot::ToString() const
+const std::string EQ::InventorySlot::ToString() const
 {
 	return StringFormat("(%i%s, %i, %i, %i)", _type_index, (_typeless ? " [typeless]" : ""), _slot_index, _container_index, _socket_index);
 }
 
-const std::string EQEmu::InventorySlot::ToName() const
+const std::string EQ::InventorySlot::ToName() const
 {
 	return StringFormat("InventorySlot - _type_index: %i%s, _slot_index: %i, _container_index: %i, _socket_index: %i", _type_index, (_typeless ? " [typeless]" : ""), _slot_index, _container_index, _socket_index);
 }
 
-void EQEmu::InventorySlot::SetInvalidSlot()
+void EQ::InventorySlot::SetInvalidSlot()
 {
 	_type_index = invtype::TYPE_INVALID;
 	_slot_index = invslot::SLOT_INVALID;
@@ -330,7 +330,7 @@ void EQEmu::InventorySlot::SetInvalidSlot()
 	_socket_index = invaug::SOCKET_INVALID;
 }
 
-//bool EQEmu::InventorySlot::IsBonusIndex(int16 slot_index)
+//bool EQ::InventorySlot::IsBonusIndex(int16 slot_index)
 //{
 //	if ((slot_index >= inventory::EquipmentBegin) && (slot_index <= inventory::EquipmentEnd) && (slot_index != inventory::slotAmmo))
 //		return true;
@@ -338,7 +338,7 @@ void EQEmu::InventorySlot::SetInvalidSlot()
 //	return false;
 //}
 
-//bool EQEmu::InventorySlot::IsBonusSlot() const
+//bool EQ::InventorySlot::IsBonusSlot() const
 //{
 //	if ((_type_index != inventory::typePossessions) || (_container_index != inventory::containerInvalid) || (_socket_index != inventory::socketInvalid))
 //		return false;
@@ -346,7 +346,7 @@ void EQEmu::InventorySlot::SetInvalidSlot()
 //	return IsBonusIndex(_slot_index);
 //}
 
-bool inventory_slot_typeless_lessthan(const EQEmu::InventorySlot& lhs, const EQEmu::InventorySlot& rhs)
+bool inventory_slot_typeless_lessthan(const EQ::InventorySlot& lhs, const EQ::InventorySlot& rhs)
 {
 	if (lhs.SlotIndex() < rhs.SlotIndex())
 		return true;
@@ -360,7 +360,7 @@ bool inventory_slot_typeless_lessthan(const EQEmu::InventorySlot& lhs, const EQE
 	return false;
 }
 
-bool EQEmu::InventorySlot::operator<(const InventorySlot& rhs) const
+bool EQ::InventorySlot::operator<(const InventorySlot& rhs) const
 {
 	if (Typeless() || rhs.Typeless())
 		return inventory_slot_typeless_lessthan(*this, rhs);
@@ -380,7 +380,7 @@ bool EQEmu::InventorySlot::operator<(const InventorySlot& rhs) const
 	return false;
 }
 
-bool EQEmu::operator==(const InventorySlot& lhs, const InventorySlot& rhs)
+bool EQ::operator==(const InventorySlot& lhs, const InventorySlot& rhs)
 {
 	if (lhs.Typeless() || rhs.Typeless())
 		return ((lhs.SlotIndex() == rhs.SlotIndex()) && (lhs.ContainerIndex() == rhs.ContainerIndex()) && (lhs.SocketIndex() == rhs.SocketIndex()));

common/inventory_slot.h

@@ -23,7 +23,7 @@
 #include "emu_constants.h"
 
 
-namespace EQEmu
+namespace EQ
 {
 	class InventorySlot;
 

common/ipc_mutex.cpp

@@ -31,7 +31,7 @@
 #include "eqemu_exception.h"
 #include "eqemu_config.h"
 
-namespace EQEmu {
+namespace EQ {
 	struct IPCMutex::Implementation {
 #ifdef _WINDOWS
 		HANDLE mut_;

common/ipc_mutex.h

@@ -21,7 +21,7 @@
 
 #include <string>
 
-namespace EQEmu {
+namespace EQ {
 
 	//! Interprocess Named Binary Semaphore (Mutex)
 	/*!

common/item_data.cpp

@@ -23,7 +23,7 @@
 //#include "deity.h"
 
 
-uint32 EQEmu::item::ConvertAugTypeToAugTypeBit(uint8 aug_type)
+uint32 EQ::item::ConvertAugTypeToAugTypeBit(uint8 aug_type)
 {
 	switch (aug_type) {
 	case AugTypeGeneralSingleStat:
@@ -95,7 +95,7 @@ uint32 EQEmu::item::ConvertAugTypeToAugTypeBit(uint8 aug_type)
 	}
 }
 
-uint8 EQEmu::item::ConvertAugTypeBitToAugType(uint32 aug_type_bit)
+uint8 EQ::item::ConvertAugTypeBitToAugType(uint32 aug_type_bit)
 {
 	switch (aug_type_bit) {
 	case bit_AugTypeGeneralSingleStat:
@@ -167,7 +167,7 @@ uint8 EQEmu::item::ConvertAugTypeBitToAugType(uint32 aug_type_bit)
 	}
 }
 
-bool EQEmu::ItemData::IsEquipable(uint16 race_id, uint16 class_id) const
+bool EQ::ItemData::IsEquipable(uint16 race_id, uint16 class_id) const
 {
 	if (!(Races & GetPlayerRaceBit(race_id)))
 		return false;
@@ -178,37 +178,37 @@ bool EQEmu::ItemData::IsEquipable(uint16 race_id, uint16 class_id) const
 	return true;
 }
 
-bool EQEmu::ItemData::IsClassCommon() const
+bool EQ::ItemData::IsClassCommon() const
 {
 	return (ItemClass == item::ItemClassCommon);
 }
 
-bool EQEmu::ItemData::IsClassBag() const
+bool EQ::ItemData::IsClassBag() const
 {
 	return (ItemClass == item::ItemClassBag);
 }
 
-bool EQEmu::ItemData::IsClassBook() const
+bool EQ::ItemData::IsClassBook() const
 {
 	return (ItemClass == item::ItemClassBook);
 }
 
-bool EQEmu::ItemData::IsType1HWeapon() const
+bool EQ::ItemData::IsType1HWeapon() const
 {
 	return ((ItemType == item::ItemType1HBlunt) || (ItemType == item::ItemType1HSlash) || (ItemType == item::ItemType1HPiercing) || (ItemType == item::ItemTypeMartial));
 }
 
-bool EQEmu::ItemData::IsType2HWeapon() const
+bool EQ::ItemData::IsType2HWeapon() const
 {
 	return ((ItemType == item::ItemType2HBlunt) || (ItemType == item::ItemType2HSlash) || (ItemType == item::ItemType2HPiercing));
 }
 
-bool EQEmu::ItemData::IsTypeShield() const
+bool EQ::ItemData::IsTypeShield() const
 {
 	return (ItemType == item::ItemTypeShield);
 }
 
-bool EQEmu::ItemData::CheckLoreConflict(const ItemData* l_item, const ItemData* r_item)
+bool EQ::ItemData::CheckLoreConflict(const ItemData* l_item, const ItemData* r_item)
 {
 	if (!l_item || !r_item)
 		return false;

common/item_data.h

@@ -47,7 +47,7 @@
 #include "emu_constants.h"
 
 
-namespace EQEmu
+namespace EQ
 {
 	namespace item {
 		enum ItemClass {
@@ -434,6 +434,7 @@ namespace EQEmu
 		//uint32	Unk054;
 		int16	MaxCharges;		// Maximum charges items can hold: -1 if not a chargeable item
 		uint8	ItemType;		// Item Type/Skill (itemClass* from above)
+		int32	SubType;		// Some items have sub types that can be used for other things (unbreakable fishing poles, SE_FFItemClass)
 		uint8	Material;		// Item material type
 		uint32	HerosForgeModel;// Hero's Forge Armor Model Type (2-13?)
 		float	SellRate;		// Sell rate

common/item_fieldlist.h

@@ -203,3 +203,4 @@ F(procname)
 F(wornname)
 F(focusname)
 F(scrollname)
+F(subtype)

common/item_instance.cpp

@@ -54,9 +54,9 @@ static inline int32 GetNextItemInstSerialNumber() {
 }
 
 //
-// class EQEmu::ItemInstance
+// class EQ::ItemInstance
 //
-EQEmu::ItemInstance::ItemInstance(const ItemData* item, int16 charges) {
+EQ::ItemInstance::ItemInstance(const ItemData* item, int16 charges) {
 	m_use_type = ItemInstNormal;
 	if(item) {
 		m_item = new ItemData(*item);
@@ -87,7 +87,7 @@ EQEmu::ItemInstance::ItemInstance(const ItemData* item, int16 charges) {
 	m_new_id_file = 0;
 }
 
-EQEmu::ItemInstance::ItemInstance(SharedDatabase *db, uint32 item_id, int16 charges) {
+EQ::ItemInstance::ItemInstance(SharedDatabase *db, uint32 item_id, int16 charges) {
 	m_use_type = ItemInstNormal;
 	m_item = db->GetItem(item_id);
 	if(m_item) {
@@ -121,7 +121,7 @@ EQEmu::ItemInstance::ItemInstance(SharedDatabase *db, uint32 item_id, int16 char
 	m_new_id_file = 0;
 }
 
-EQEmu::ItemInstance::ItemInstance(ItemInstTypes use_type) {
+EQ::ItemInstance::ItemInstance(ItemInstTypes use_type) {
 	m_use_type = use_type;
 	m_item = nullptr;
 	m_charges = 0;
@@ -143,8 +143,8 @@ EQEmu::ItemInstance::ItemInstance(ItemInstTypes use_type) {
 	m_new_id_file = 0;
 }
 
-// Make a copy of an EQEmu::ItemInstance object
-EQEmu::ItemInstance::ItemInstance(const ItemInstance& copy)
+// Make a copy of an EQ::ItemInstance object
+EQ::ItemInstance::ItemInstance(const ItemInstance& copy)
 {
 	m_use_type=copy.m_use_type;
 	if(copy.m_item)
@@ -202,7 +202,7 @@ EQEmu::ItemInstance::ItemInstance(const ItemInstance& copy)
 }
 
 // Clean up container contents
-EQEmu::ItemInstance::~ItemInstance()
+EQ::ItemInstance::~ItemInstance()
 {
 	Clear();
 	safe_delete(m_item);
@@ -211,7 +211,7 @@ EQEmu::ItemInstance::~ItemInstance()
 }
 
 // Query item type
-bool EQEmu::ItemInstance::IsType(item::ItemClass item_class) const
+bool EQ::ItemInstance::IsType(item::ItemClass item_class) const
 {
 	// IsType(<ItemClassTypes>) does not protect against 'm_item = nullptr'
 	
@@ -225,23 +225,23 @@ bool EQEmu::ItemInstance::IsType(item::ItemClass item_class) const
 	return (m_item->ItemClass == item_class);
 }
 
-bool EQEmu::ItemInstance::IsClassCommon() const
+bool EQ::ItemInstance::IsClassCommon() const
 {
 	return (m_item && m_item->IsClassCommon());
 }
 
-bool EQEmu::ItemInstance::IsClassBag() const
+bool EQ::ItemInstance::IsClassBag() const
 {
 	return (m_item && m_item->IsClassBag());
 }
 
-bool EQEmu::ItemInstance::IsClassBook() const
+bool EQ::ItemInstance::IsClassBook() const
 {
 	return (m_item && m_item->IsClassBook());
 }
 
 // Is item stackable?
-bool EQEmu::ItemInstance::IsStackable() const
+bool EQ::ItemInstance::IsStackable() const
 {
 	if (!m_item)
 		return false;
@@ -249,7 +249,7 @@ bool EQEmu::ItemInstance::IsStackable() const
 	return m_item->Stackable;
 }
 
-bool EQEmu::ItemInstance::IsCharged() const
+bool EQ::ItemInstance::IsCharged() const
 {
 	if (!m_item)
 		return false;
@@ -261,7 +261,7 @@ bool EQEmu::ItemInstance::IsCharged() const
 }
 
 // Can item be equipped?
-bool EQEmu::ItemInstance::IsEquipable(uint16 race, uint16 class_) const
+bool EQ::ItemInstance::IsEquipable(uint16 race, uint16 class_) const
 {
 	if (!m_item || (m_item->Slots == 0))
 		return false;
@@ -270,18 +270,18 @@ bool EQEmu::ItemInstance::IsEquipable(uint16 race, uint16 class_) const
 }
 
 // Can equip at this slot?
-bool EQEmu::ItemInstance::IsEquipable(int16 slot_id) const
+bool EQ::ItemInstance::IsEquipable(int16 slot_id) const
 {
 	if (!m_item)
 		return false;
 
-	if (slot_id < EQEmu::invslot::EQUIPMENT_BEGIN || slot_id > EQEmu::invslot::EQUIPMENT_END)
+	if (slot_id < EQ::invslot::EQUIPMENT_BEGIN || slot_id > EQ::invslot::EQUIPMENT_END)
 		return false;
 
 	return ((m_item->Slots & (1 << slot_id)) != 0);
 }
 
-bool EQEmu::ItemInstance::IsAugmentable() const
+bool EQ::ItemInstance::IsAugmentable() const
 {
 	if (!m_item)
 		return false;
@@ -294,7 +294,7 @@ bool EQEmu::ItemInstance::IsAugmentable() const
 	return false;
 }
 
-bool EQEmu::ItemInstance::AvailableWearSlot(uint32 aug_wear_slots) const {
+bool EQ::ItemInstance::AvailableWearSlot(uint32 aug_wear_slots) const {
 	if (!m_item || !m_item->IsClassCommon())
 		return false;
 
@@ -306,10 +306,10 @@ bool EQEmu::ItemInstance::AvailableWearSlot(uint32 aug_wear_slots) const {
 		}
 	}
 
-	return (index <= EQEmu::invslot::EQUIPMENT_END);
+	return (index <= EQ::invslot::EQUIPMENT_END);
 }
 
-int8 EQEmu::ItemInstance::AvailableAugmentSlot(int32 augtype) const
+int8 EQ::ItemInstance::AvailableAugmentSlot(int32 augtype) const
 {
 	if (!m_item || !m_item->IsClassCommon())
 		return INVALID_INDEX;
@@ -324,7 +324,7 @@ int8 EQEmu::ItemInstance::AvailableAugmentSlot(int32 augtype) const
 	return (index <= invaug::SOCKET_END) ? index : INVALID_INDEX;
 }
 
-bool EQEmu::ItemInstance::IsAugmentSlotAvailable(int32 augtype, uint8 slot) const
+bool EQ::ItemInstance::IsAugmentSlotAvailable(int32 augtype, uint8 slot) const
 {
 	if (!m_item || !m_item->IsClassCommon())
 		 return false;
@@ -336,7 +336,7 @@ bool EQEmu::ItemInstance::IsAugmentSlotAvailable(int32 augtype, uint8 slot) cons
 }
 
 // Retrieve item inside container
-EQEmu::ItemInstance* EQEmu::ItemInstance::GetItem(uint8 index) const
+EQ::ItemInstance* EQ::ItemInstance::GetItem(uint8 index) const
 {
 	auto it = m_contents.find(index);
 	if (it != m_contents.end()) {
@@ -346,7 +346,7 @@ EQEmu::ItemInstance* EQEmu::ItemInstance::GetItem(uint8 index) const
 	return nullptr;
 }
 
-uint32 EQEmu::ItemInstance::GetItemID(uint8 slot) const
+uint32 EQ::ItemInstance::GetItemID(uint8 slot) const
 {
 	ItemInstance *item = GetItem(slot);
 	if (item)
@@ -355,7 +355,7 @@ uint32 EQEmu::ItemInstance::GetItemID(uint8 slot) const
 	return 0;
 }
 
-void EQEmu::ItemInstance::PutItem(uint8 index, const ItemInstance& inst)
+void EQ::ItemInstance::PutItem(uint8 index, const ItemInstance& inst)
 {
 	// Clean up item already in slot (if exists)
 	DeleteItem(index);
@@ -365,7 +365,7 @@ void EQEmu::ItemInstance::PutItem(uint8 index, const ItemInstance& inst)
 }
 
 // Remove item inside container
-void EQEmu::ItemInstance::DeleteItem(uint8 index)
+void EQ::ItemInstance::DeleteItem(uint8 index)
 {
 	ItemInstance* inst = PopItem(index);
 	safe_delete(inst);
@@ -373,7 +373,7 @@ void EQEmu::ItemInstance::DeleteItem(uint8 index)
 
 // Remove item from container without memory delete
 // Hands over memory ownership to client of this function call
-EQEmu::ItemInstance* EQEmu::ItemInstance::PopItem(uint8 index)
+EQ::ItemInstance* EQ::ItemInstance::PopItem(uint8 index)
 {
 	auto iter = m_contents.find(index);
 	if (iter != m_contents.end()) {
@@ -386,7 +386,7 @@ EQEmu::ItemInstance* EQEmu::ItemInstance::PopItem(uint8 index)
 }
 
 // Remove all items from container
-void EQEmu::ItemInstance::Clear()
+void EQ::ItemInstance::Clear()
 {
 	// Destroy container contents
 	for (auto iter = m_contents.begin(); iter != m_contents.end(); ++iter) {
@@ -396,7 +396,7 @@ void EQEmu::ItemInstance::Clear()
 }
 
 // Remove all items from container
-void EQEmu::ItemInstance::ClearByFlags(byFlagSetting is_nodrop, byFlagSetting is_norent)
+void EQ::ItemInstance::ClearByFlags(byFlagSetting is_nodrop, byFlagSetting is_norent)
 {
 	// TODO: This needs work...
 
@@ -458,7 +458,7 @@ void EQEmu::ItemInstance::ClearByFlags(byFlagSetting is_nodrop, byFlagSetting is
 	}
 }
 
-uint8 EQEmu::ItemInstance::FirstOpenSlot() const
+uint8 EQ::ItemInstance::FirstOpenSlot() const
 {
 	if (!m_item)
 		return INVALID_INDEX;
@@ -472,7 +472,7 @@ uint8 EQEmu::ItemInstance::FirstOpenSlot() const
 	return (i < slots) ? i : INVALID_INDEX;
 }
 
-uint8 EQEmu::ItemInstance::GetTotalItemCount() const
+uint8 EQ::ItemInstance::GetTotalItemCount() const
 {
 	if (!m_item)
 		return 0;
@@ -486,7 +486,7 @@ uint8 EQEmu::ItemInstance::GetTotalItemCount() const
 	return item_count;
 }
 
-bool EQEmu::ItemInstance::IsNoneEmptyContainer()
+bool EQ::ItemInstance::IsNoneEmptyContainer()
 {
 	if (!m_item || !m_item->IsClassBag())
 		return false;
@@ -500,7 +500,7 @@ bool EQEmu::ItemInstance::IsNoneEmptyContainer()
 }
 
 // Retrieve augment inside item
-EQEmu::ItemInstance* EQEmu::ItemInstance::GetAugment(uint8 slot) const
+EQ::ItemInstance* EQ::ItemInstance::GetAugment(uint8 slot) const
 {
 	if (m_item && m_item->IsClassCommon())
 		return GetItem(slot);
@@ -508,7 +508,7 @@ EQEmu::ItemInstance* EQEmu::ItemInstance::GetAugment(uint8 slot) const
 	return nullptr;
 }
 
-EQEmu::ItemInstance* EQEmu::ItemInstance::GetOrnamentationAug(int32 ornamentationAugtype) const
+EQ::ItemInstance* EQ::ItemInstance::GetOrnamentationAug(int32 ornamentationAugtype) const
 {
 	if (!m_item || !m_item->IsClassCommon()) { return nullptr; }
 	if (ornamentationAugtype == 0) { return nullptr; }
@@ -533,7 +533,7 @@ EQEmu::ItemInstance* EQEmu::ItemInstance::GetOrnamentationAug(int32 ornamentatio
 	return nullptr;
 }
 
-uint32 EQEmu::ItemInstance::GetOrnamentHeroModel(int32 material_slot) const {
+uint32 EQ::ItemInstance::GetOrnamentHeroModel(int32 material_slot) const {
 	// Not a Hero Forge item.
 	if (m_ornament_hero_model == 0 || material_slot < 0)
 		return 0;
@@ -546,7 +546,7 @@ uint32 EQEmu::ItemInstance::GetOrnamentHeroModel(int32 material_slot) const {
 	return (m_ornament_hero_model * 100) + material_slot;
 }
 
-bool EQEmu::ItemInstance::UpdateOrnamentationInfo() {
+bool EQ::ItemInstance::UpdateOrnamentationInfo() {
 	if (!m_item || !m_item->IsClassCommon())
 		return false;
 	
@@ -582,7 +582,7 @@ bool EQEmu::ItemInstance::UpdateOrnamentationInfo() {
 	return ornamentSet;
 }
 
-bool EQEmu::ItemInstance::CanTransform(const ItemData *ItemToTry, const ItemData *Container, bool AllowAll) {
+bool EQ::ItemInstance::CanTransform(const ItemData *ItemToTry, const ItemData *Container, bool AllowAll) {
 	if (!ItemToTry || !Container) return false;
 
 	if (ItemToTry->ItemType == item::ItemTypeArrow || strnlen(Container->CharmFile, 30) == 0)
@@ -629,7 +629,7 @@ bool EQEmu::ItemInstance::CanTransform(const ItemData *ItemToTry, const ItemData
 	return false;
 }
 
-uint32 EQEmu::ItemInstance::GetAugmentItemID(uint8 slot) const
+uint32 EQ::ItemInstance::GetAugmentItemID(uint8 slot) const
 {
 	if (!m_item || !m_item->IsClassCommon())
 		return 0;
@@ -638,7 +638,7 @@ uint32 EQEmu::ItemInstance::GetAugmentItemID(uint8 slot) const
 }
 
 // Add an augment to the item
-void EQEmu::ItemInstance::PutAugment(uint8 slot, const ItemInstance& augment)
+void EQ::ItemInstance::PutAugment(uint8 slot, const ItemInstance& augment)
 {
 	if (!m_item || !m_item->IsClassCommon())
 		return;
@@ -646,7 +646,7 @@ void EQEmu::ItemInstance::PutAugment(uint8 slot, const ItemInstance& augment)
 	PutItem(slot, augment);
 }
 
-void EQEmu::ItemInstance::PutAugment(SharedDatabase *db, uint8 slot, uint32 item_id)
+void EQ::ItemInstance::PutAugment(SharedDatabase *db, uint8 slot, uint32 item_id)
 {
 	if (item_id == 0) { return; }
 	if (db == nullptr) { return; /* TODO: add log message for nullptr */ }
@@ -659,7 +659,7 @@ void EQEmu::ItemInstance::PutAugment(SharedDatabase *db, uint8 slot, uint32 item
 }
 
 // Remove augment from item and destroy it
-void EQEmu::ItemInstance::DeleteAugment(uint8 index)
+void EQ::ItemInstance::DeleteAugment(uint8 index)
 {
 	if (!m_item || !m_item->IsClassCommon())
 		return;
@@ -668,7 +668,7 @@ void EQEmu::ItemInstance::DeleteAugment(uint8 index)
 }
 
 // Remove augment from item and return it
-EQEmu::ItemInstance* EQEmu::ItemInstance::RemoveAugment(uint8 index)
+EQ::ItemInstance* EQ::ItemInstance::RemoveAugment(uint8 index)
 {
 	if (!m_item || !m_item->IsClassCommon())
 		return nullptr;
@@ -676,7 +676,7 @@ EQEmu::ItemInstance* EQEmu::ItemInstance::RemoveAugment(uint8 index)
 	return PopItem(index);
 }
 
-bool EQEmu::ItemInstance::IsAugmented()
+bool EQ::ItemInstance::IsAugmented()
 {
 	if (!m_item || !m_item->IsClassCommon())
 		return false;
@@ -690,7 +690,7 @@ bool EQEmu::ItemInstance::IsAugmented()
 }
 
 // Has attack/delay?
-bool EQEmu::ItemInstance::IsWeapon() const
+bool EQ::ItemInstance::IsWeapon() const
 {
 	if (!m_item || !m_item->IsClassCommon())
 		return false;
@@ -701,7 +701,7 @@ bool EQEmu::ItemInstance::IsWeapon() const
 		return ((m_item->Damage != 0) && (m_item->Delay != 0));
 }
 
-bool EQEmu::ItemInstance::IsAmmo() const
+bool EQ::ItemInstance::IsAmmo() const
 {
 	if (!m_item)
 		return false;
@@ -717,7 +717,7 @@ bool EQEmu::ItemInstance::IsAmmo() const
 
 }
 
-const EQEmu::ItemData* EQEmu::ItemInstance::GetItem() const
+const EQ::ItemData* EQ::ItemInstance::GetItem() const
 {
 	if (!m_item)
 		return nullptr;
@@ -728,13 +728,13 @@ const EQEmu::ItemData* EQEmu::ItemInstance::GetItem() const
 	return m_item;
 }
 
-const EQEmu::ItemData* EQEmu::ItemInstance::GetUnscaledItem() const
+const EQ::ItemData* EQ::ItemInstance::GetUnscaledItem() const
 {
 	// No operator calls and defaults to nullptr
 	return m_item;
 }
 
-std::string EQEmu::ItemInstance::GetCustomDataString() const {
+std::string EQ::ItemInstance::GetCustomDataString() const {
 	std::string ret_val;
 	auto iter = m_custom_data.begin();
 	while (iter != m_custom_data.end()) {
@@ -753,7 +753,7 @@ std::string EQEmu::ItemInstance::GetCustomDataString() const {
 	return ret_val;
 }
 
-std::string EQEmu::ItemInstance::GetCustomData(std::string identifier) {
+std::string EQ::ItemInstance::GetCustomData(std::string identifier) {
 	std::map<std::string, std::string>::const_iterator iter = m_custom_data.find(identifier);
 	if (iter != m_custom_data.end()) {
 		return iter->second;
@@ -762,49 +762,49 @@ std::string EQEmu::ItemInstance::GetCustomData(std::string identifier) {
 	return "";
 }
 
-void EQEmu::ItemInstance::SetCustomData(std::string identifier, std::string value) {
+void EQ::ItemInstance::SetCustomData(std::string identifier, std::string value) {
 	DeleteCustomData(identifier);
 	m_custom_data[identifier] = value;
 }
 
-void EQEmu::ItemInstance::SetCustomData(std::string identifier, int value) {
+void EQ::ItemInstance::SetCustomData(std::string identifier, int value) {
 	DeleteCustomData(identifier);
 	std::stringstream ss;
 	ss << value;
 	m_custom_data[identifier] = ss.str();
 }
 
-void EQEmu::ItemInstance::SetCustomData(std::string identifier, float value) {
+void EQ::ItemInstance::SetCustomData(std::string identifier, float value) {
 	DeleteCustomData(identifier);
 	std::stringstream ss;
 	ss << value;
 	m_custom_data[identifier] = ss.str();
 }
 
-void EQEmu::ItemInstance::SetCustomData(std::string identifier, bool value) {
+void EQ::ItemInstance::SetCustomData(std::string identifier, bool value) {
 	DeleteCustomData(identifier);
 	std::stringstream ss;
 	ss << value;
 	m_custom_data[identifier] = ss.str();
 }
 
-void EQEmu::ItemInstance::DeleteCustomData(std::string identifier) {
+void EQ::ItemInstance::DeleteCustomData(std::string identifier) {
 	auto iter = m_custom_data.find(identifier);
 	if (iter != m_custom_data.end()) {
 		m_custom_data.erase(iter);
 	}
 }
 
-// Clone a type of EQEmu::ItemInstance object
+// Clone a type of EQ::ItemInstance object
 // c++ doesn't allow a polymorphic copy constructor,
 // so we have to resort to a polymorphic Clone()
-EQEmu::ItemInstance* EQEmu::ItemInstance::Clone() const
+EQ::ItemInstance* EQ::ItemInstance::Clone() const
 {
 	// Pseudo-polymorphic copy constructor
 	return new ItemInstance(*this);
 }
 
-bool EQEmu::ItemInstance::IsSlotAllowed(int16 slot_id) const {
+bool EQ::ItemInstance::IsSlotAllowed(int16 slot_id) const {
 	if (!m_item) { return false; }
 	else if (InventoryProfile::SupportsContainers(slot_id)) { return true; }
 	else if (m_item->Slots & (1 << slot_id)) { return true; }
@@ -812,7 +812,7 @@ bool EQEmu::ItemInstance::IsSlotAllowed(int16 slot_id) const {
 	else { return false; }
 }
 
-bool EQEmu::ItemInstance::IsDroppable(bool recurse) const
+bool EQ::ItemInstance::IsDroppable(bool recurse) const
 {
 	if (!m_item)
 		return false;
@@ -838,7 +838,7 @@ bool EQEmu::ItemInstance::IsDroppable(bool recurse) const
 	return true;
 }
 
-void EQEmu::ItemInstance::Initialize(SharedDatabase *db) {
+void EQ::ItemInstance::Initialize(SharedDatabase *db) {
 	// if there's no actual item, don't do anything
 	if (!m_item)
 		return;
@@ -855,7 +855,7 @@ void EQEmu::ItemInstance::Initialize(SharedDatabase *db) {
 	}
 }
 
-void EQEmu::ItemInstance::ScaleItem() {
+void EQ::ItemInstance::ScaleItem() {
 	if (!m_item)
 		return;
 
@@ -939,18 +939,18 @@ void EQEmu::ItemInstance::ScaleItem() {
 	m_scaledItem->CharmFileID = 0;	// this stops the client from trying to scale the item itself.
 }
 
-bool EQEmu::ItemInstance::EvolveOnAllKills() const {
+bool EQ::ItemInstance::EvolveOnAllKills() const {
 	return (m_evolveInfo && m_evolveInfo->AllKills);
 }
 
-int8 EQEmu::ItemInstance::GetMaxEvolveLvl() const {
+int8 EQ::ItemInstance::GetMaxEvolveLvl() const {
 	if (m_evolveInfo)
 		return m_evolveInfo->MaxLvl;
 	else
 		return 0;
 }
 
-uint32 EQEmu::ItemInstance::GetKillsNeeded(uint8 currentlevel) {
+uint32 EQ::ItemInstance::GetKillsNeeded(uint8 currentlevel) {
 	uint32 kills = -1;	// default to -1 (max uint32 value) because this value is usually divided by, so we don't want to ever return zero.
 	if (m_evolveInfo)
 		if (currentlevel != m_evolveInfo->MaxLvl)
@@ -962,24 +962,24 @@ uint32 EQEmu::ItemInstance::GetKillsNeeded(uint8 currentlevel) {
 	return kills;
 }
 
-void EQEmu::ItemInstance::SetTimer(std::string name, uint32 time) {
+void EQ::ItemInstance::SetTimer(std::string name, uint32 time) {
 	Timer t(time);
 	t.Start(time, false);
 	m_timers[name] = t;
 }
 
-void EQEmu::ItemInstance::StopTimer(std::string name) {
+void EQ::ItemInstance::StopTimer(std::string name) {
 	auto iter = m_timers.find(name);
 	if(iter != m_timers.end()) {
 		m_timers.erase(iter);
 	}
 }
 
-void EQEmu::ItemInstance::ClearTimers() {
+void EQ::ItemInstance::ClearTimers() {
 	m_timers.clear();
 }
 
-int EQEmu::ItemInstance::GetItemArmorClass(bool augments) const
+int EQ::ItemInstance::GetItemArmorClass(bool augments) const
 {
 	int ac = 0;
 	const auto item = GetItem();
@@ -993,7 +993,7 @@ int EQEmu::ItemInstance::GetItemArmorClass(bool augments) const
 	return ac;
 }
 
-int EQEmu::ItemInstance::GetItemElementalDamage(int &magic, int &fire, int &cold, int &poison, int &disease, int &chromatic, int &prismatic, int &physical, int &corruption, bool augments) const
+int EQ::ItemInstance::GetItemElementalDamage(int &magic, int &fire, int &cold, int &poison, int &disease, int &chromatic, int &prismatic, int &physical, int &corruption, bool augments) const
 {
 	const auto item = GetItem();
 	if (item) {
@@ -1035,7 +1035,7 @@ int EQEmu::ItemInstance::GetItemElementalDamage(int &magic, int &fire, int &cold
 	return magic + fire + cold + poison + disease + chromatic + prismatic + physical + corruption;
 }
 
-int EQEmu::ItemInstance::GetItemElementalFlag(bool augments) const
+int EQ::ItemInstance::GetItemElementalFlag(bool augments) const
 {
 	int flag = 0;
 	const auto item = GetItem();
@@ -1056,7 +1056,7 @@ int EQEmu::ItemInstance::GetItemElementalFlag(bool augments) const
 	return flag;
 }
 
-int EQEmu::ItemInstance::GetItemElementalDamage(bool augments) const
+int EQ::ItemInstance::GetItemElementalDamage(bool augments) const
 {
 	int damage = 0;
 	const auto item = GetItem();
@@ -1077,7 +1077,7 @@ int EQEmu::ItemInstance::GetItemElementalDamage(bool augments) const
 	return damage;
 }
 
-int EQEmu::ItemInstance::GetItemRecommendedLevel(bool augments) const
+int EQ::ItemInstance::GetItemRecommendedLevel(bool augments) const
 {
 	int level = 0;
 	const auto item = GetItem();
@@ -1099,7 +1099,7 @@ int EQEmu::ItemInstance::GetItemRecommendedLevel(bool augments) const
 	return level;
 }
 
-int EQEmu::ItemInstance::GetItemRequiredLevel(bool augments) const
+int EQ::ItemInstance::GetItemRequiredLevel(bool augments) const
 {
 	int level = 0;
 	const auto item = GetItem();
@@ -1121,7 +1121,7 @@ int EQEmu::ItemInstance::GetItemRequiredLevel(bool augments) const
 	return level;
 }
 
-int EQEmu::ItemInstance::GetItemWeaponDamage(bool augments) const
+int EQ::ItemInstance::GetItemWeaponDamage(bool augments) const
 {
 	int damage = 0;
 	const auto item = GetItem();
@@ -1137,7 +1137,7 @@ int EQEmu::ItemInstance::GetItemWeaponDamage(bool augments) const
 	return damage;
 }
 
-int EQEmu::ItemInstance::GetItemBackstabDamage(bool augments) const
+int EQ::ItemInstance::GetItemBackstabDamage(bool augments) const
 {
 	int damage = 0;
 	const auto item = GetItem();
@@ -1153,7 +1153,7 @@ int EQEmu::ItemInstance::GetItemBackstabDamage(bool augments) const
 	return damage;
 }
 
-int EQEmu::ItemInstance::GetItemBaneDamageBody(bool augments) const
+int EQ::ItemInstance::GetItemBaneDamageBody(bool augments) const
 {
 	int body = 0;
 	const auto item = GetItem();
@@ -1174,7 +1174,7 @@ int EQEmu::ItemInstance::GetItemBaneDamageBody(bool augments) const
 	return body;
 }
 
-int EQEmu::ItemInstance::GetItemBaneDamageRace(bool augments) const
+int EQ::ItemInstance::GetItemBaneDamageRace(bool augments) const
 {
 	int race = 0;
 	const auto item = GetItem();
@@ -1195,7 +1195,7 @@ int EQEmu::ItemInstance::GetItemBaneDamageRace(bool augments) const
 	return race;
 }
 
-int EQEmu::ItemInstance::GetItemBaneDamageBody(bodyType against, bool augments) const
+int EQ::ItemInstance::GetItemBaneDamageBody(bodyType against, bool augments) const
 {
 	int damage = 0;
 	const auto item = GetItem();
@@ -1212,7 +1212,7 @@ int EQEmu::ItemInstance::GetItemBaneDamageBody(bodyType against, bool augments)
 	return damage;
 }
 
-int EQEmu::ItemInstance::GetItemBaneDamageRace(uint16 against, bool augments) const
+int EQ::ItemInstance::GetItemBaneDamageRace(uint16 against, bool augments) const
 {
 	int damage = 0;
 	const auto item = GetItem();
@@ -1229,7 +1229,7 @@ int EQEmu::ItemInstance::GetItemBaneDamageRace(uint16 against, bool augments) co
 	return damage;
 }
 
-int EQEmu::ItemInstance::GetItemMagical(bool augments) const
+int EQ::ItemInstance::GetItemMagical(bool augments) const
 {
 	const auto item = GetItem();
 	if (item) {
@@ -1245,7 +1245,7 @@ int EQEmu::ItemInstance::GetItemMagical(bool augments) const
 	return 0;
 }
 
-int EQEmu::ItemInstance::GetItemHP(bool augments) const
+int EQ::ItemInstance::GetItemHP(bool augments) const
 {
 	int hp = 0;
 	const auto item = GetItem();
@@ -1259,7 +1259,7 @@ int EQEmu::ItemInstance::GetItemHP(bool augments) const
 	return hp;
 }
 
-int EQEmu::ItemInstance::GetItemMana(bool augments) const
+int EQ::ItemInstance::GetItemMana(bool augments) const
 {
 	int mana = 0;
 	const auto item = GetItem();
@@ -1273,7 +1273,7 @@ int EQEmu::ItemInstance::GetItemMana(bool augments) const
 	return mana;
 }
 
-int EQEmu::ItemInstance::GetItemEndur(bool augments) const
+int EQ::ItemInstance::GetItemEndur(bool augments) const
 {
 	int endur = 0;
 	const auto item = GetItem();
@@ -1287,7 +1287,7 @@ int EQEmu::ItemInstance::GetItemEndur(bool augments) const
 	return endur;
 }
 
-int EQEmu::ItemInstance::GetItemAttack(bool augments) const
+int EQ::ItemInstance::GetItemAttack(bool augments) const
 {
 	int atk = 0;
 	const auto item = GetItem();
@@ -1301,7 +1301,7 @@ int EQEmu::ItemInstance::GetItemAttack(bool augments) const
 	return atk;
 }
 
-int EQEmu::ItemInstance::GetItemStr(bool augments) const
+int EQ::ItemInstance::GetItemStr(bool augments) const
 {
 	int str = 0;
 	const auto item = GetItem();
@@ -1315,7 +1315,7 @@ int EQEmu::ItemInstance::GetItemStr(bool augments) const
 	return str;
 }
 
-int EQEmu::ItemInstance::GetItemSta(bool augments) const
+int EQ::ItemInstance::GetItemSta(bool augments) const
 {
 	int sta = 0;
 	const auto item = GetItem();
@@ -1329,7 +1329,7 @@ int EQEmu::ItemInstance::GetItemSta(bool augments) const
 	return sta;
 }
 
-int EQEmu::ItemInstance::GetItemDex(bool augments) const
+int EQ::ItemInstance::GetItemDex(bool augments) const
 {
 	int total = 0;
 	const auto item = GetItem();
@@ -1343,7 +1343,7 @@ int EQEmu::ItemInstance::GetItemDex(bool augments) const
 	return total;
 }
 
-int EQEmu::ItemInstance::GetItemAgi(bool augments) const
+int EQ::ItemInstance::GetItemAgi(bool augments) const
 {
 	int total = 0;
 	const auto item = GetItem();
@@ -1357,7 +1357,7 @@ int EQEmu::ItemInstance::GetItemAgi(bool augments) const
 	return total;
 }
 
-int EQEmu::ItemInstance::GetItemInt(bool augments) const
+int EQ::ItemInstance::GetItemInt(bool augments) const
 {
 	int total = 0;
 	const auto item = GetItem();
@@ -1371,7 +1371,7 @@ int EQEmu::ItemInstance::GetItemInt(bool augments) const
 	return total;
 }
 
-int EQEmu::ItemInstance::GetItemWis(bool augments) const
+int EQ::ItemInstance::GetItemWis(bool augments) const
 {
 	int total = 0;
 	const auto item = GetItem();
@@ -1385,7 +1385,7 @@ int EQEmu::ItemInstance::GetItemWis(bool augments) const
 	return total;
 }
 
-int EQEmu::ItemInstance::GetItemCha(bool augments) const
+int EQ::ItemInstance::GetItemCha(bool augments) const
 {
 	int total = 0;
 	const auto item = GetItem();
@@ -1399,7 +1399,7 @@ int EQEmu::ItemInstance::GetItemCha(bool augments) const
 	return total;
 }
 
-int EQEmu::ItemInstance::GetItemMR(bool augments) const
+int EQ::ItemInstance::GetItemMR(bool augments) const
 {
 	int total = 0;
 	const auto item = GetItem();
@@ -1413,7 +1413,7 @@ int EQEmu::ItemInstance::GetItemMR(bool augments) const
 	return total;
 }
 
-int EQEmu::ItemInstance::GetItemFR(bool augments) const
+int EQ::ItemInstance::GetItemFR(bool augments) const
 {
 	int total = 0;
 	const auto item = GetItem();
@@ -1427,7 +1427,7 @@ int EQEmu::ItemInstance::GetItemFR(bool augments) const
 	return total;
 }
 
-int EQEmu::ItemInstance::GetItemCR(bool augments) const
+int EQ::ItemInstance::GetItemCR(bool augments) const
 {
 	int total = 0;
 	const auto item = GetItem();
@@ -1441,7 +1441,7 @@ int EQEmu::ItemInstance::GetItemCR(bool augments) const
 	return total;
 }
 
-int EQEmu::ItemInstance::GetItemPR(bool augments) const
+int EQ::ItemInstance::GetItemPR(bool augments) const
 {
 	int total = 0;
 	const auto item = GetItem();
@@ -1455,7 +1455,7 @@ int EQEmu::ItemInstance::GetItemPR(bool augments) const
 	return total;
 }
 
-int EQEmu::ItemInstance::GetItemDR(bool augments) const
+int EQ::ItemInstance::GetItemDR(bool augments) const
 {
 	int total = 0;
 	const auto item = GetItem();
@@ -1469,7 +1469,7 @@ int EQEmu::ItemInstance::GetItemDR(bool augments) const
 	return total;
 }
 
-int EQEmu::ItemInstance::GetItemCorrup(bool augments) const
+int EQ::ItemInstance::GetItemCorrup(bool augments) const
 {
 	int total = 0;
 	const auto item = GetItem();
@@ -1483,7 +1483,7 @@ int EQEmu::ItemInstance::GetItemCorrup(bool augments) const
 	return total;
 }
 
-int EQEmu::ItemInstance::GetItemHeroicStr(bool augments) const
+int EQ::ItemInstance::GetItemHeroicStr(bool augments) const
 {
 	int total = 0;
 	const auto item = GetItem();
@@ -1497,7 +1497,7 @@ int EQEmu::ItemInstance::GetItemHeroicStr(bool augments) const
 	return total;
 }
 
-int EQEmu::ItemInstance::GetItemHeroicSta(bool augments) const
+int EQ::ItemInstance::GetItemHeroicSta(bool augments) const
 {
 	int total = 0;
 	const auto item = GetItem();
@@ -1511,7 +1511,7 @@ int EQEmu::ItemInstance::GetItemHeroicSta(bool augments) const
 	return total;
 }
 
-int EQEmu::ItemInstance::GetItemHeroicDex(bool augments) const
+int EQ::ItemInstance::GetItemHeroicDex(bool augments) const
 {
 	int total = 0;
 	const auto item = GetItem();
@@ -1525,7 +1525,7 @@ int EQEmu::ItemInstance::GetItemHeroicDex(bool augments) const
 	return total;
 }
 
-int EQEmu::ItemInstance::GetItemHeroicAgi(bool augments) const
+int EQ::ItemInstance::GetItemHeroicAgi(bool augments) const
 {
 	int total = 0;
 	const auto item = GetItem();
@@ -1539,7 +1539,7 @@ int EQEmu::ItemInstance::GetItemHeroicAgi(bool augments) const
 	return total;
 }
 
-int EQEmu::ItemInstance::GetItemHeroicInt(bool augments) const
+int EQ::ItemInstance::GetItemHeroicInt(bool augments) const
 {
 	int total = 0;
 	const auto item = GetItem();
@@ -1553,7 +1553,7 @@ int EQEmu::ItemInstance::GetItemHeroicInt(bool augments) const
 	return total;
 }
 
-int EQEmu::ItemInstance::GetItemHeroicWis(bool augments) const
+int EQ::ItemInstance::GetItemHeroicWis(bool augments) const
 {
 	int total = 0;
 	const auto item = GetItem();
@@ -1567,7 +1567,7 @@ int EQEmu::ItemInstance::GetItemHeroicWis(bool augments) const
 	return total;
 }
 
-int EQEmu::ItemInstance::GetItemHeroicCha(bool augments) const
+int EQ::ItemInstance::GetItemHeroicCha(bool augments) const
 {
 	int total = 0;
 	const auto item = GetItem();
@@ -1581,7 +1581,7 @@ int EQEmu::ItemInstance::GetItemHeroicCha(bool augments) const
 	return total;
 }
 
-int EQEmu::ItemInstance::GetItemHeroicMR(bool augments) const
+int EQ::ItemInstance::GetItemHeroicMR(bool augments) const
 {
 	int total = 0;
 	const auto item = GetItem();
@@ -1595,7 +1595,7 @@ int EQEmu::ItemInstance::GetItemHeroicMR(bool augments) const
 	return total;
 }
 
-int EQEmu::ItemInstance::GetItemHeroicFR(bool augments) const
+int EQ::ItemInstance::GetItemHeroicFR(bool augments) const
 {
 	int total = 0;
 	const auto item = GetItem();
@@ -1609,7 +1609,7 @@ int EQEmu::ItemInstance::GetItemHeroicFR(bool augments) const
 	return total;
 }
 
-int EQEmu::ItemInstance::GetItemHeroicCR(bool augments) const
+int EQ::ItemInstance::GetItemHeroicCR(bool augments) const
 {
 	int total = 0;
 	const auto item = GetItem();
@@ -1623,7 +1623,7 @@ int EQEmu::ItemInstance::GetItemHeroicCR(bool augments) const
 	return total;
 }
 
-int EQEmu::ItemInstance::GetItemHeroicPR(bool augments) const
+int EQ::ItemInstance::GetItemHeroicPR(bool augments) const
 {
 	int total = 0;
 	const auto item = GetItem();
@@ -1637,7 +1637,7 @@ int EQEmu::ItemInstance::GetItemHeroicPR(bool augments) const
 	return total;
 }
 
-int EQEmu::ItemInstance::GetItemHeroicDR(bool augments) const
+int EQ::ItemInstance::GetItemHeroicDR(bool augments) const
 {
 	int total = 0;
 	const auto item = GetItem();
@@ -1651,7 +1651,7 @@ int EQEmu::ItemInstance::GetItemHeroicDR(bool augments) const
 	return total;
 }
 
-int EQEmu::ItemInstance::GetItemHeroicCorrup(bool augments) const
+int EQ::ItemInstance::GetItemHeroicCorrup(bool augments) const
 {
 	int total = 0;
 	const auto item = GetItem();
@@ -1665,7 +1665,7 @@ int EQEmu::ItemInstance::GetItemHeroicCorrup(bool augments) const
 	return total;
 }
 
-int EQEmu::ItemInstance::GetItemHaste(bool augments) const
+int EQ::ItemInstance::GetItemHaste(bool augments) const
 {
 	int total = 0;
 	const auto item = GetItem();

common/item_instance.h

@@ -38,7 +38,7 @@ class EvolveInfo;			// Stores information about an evolving item family
 #include <map>
 
 
-// Specifies usage type for item inside EQEmu::ItemInstance
+// Specifies usage type for item inside EQ::ItemInstance
 enum ItemInstTypes
 {
 	ItemInstNormal = 0,
@@ -54,14 +54,14 @@ typedef enum {
 class SharedDatabase;
 
 // ########################################
-// Class: EQEmu::ItemInstance
+// Class: EQ::ItemInstance
 //	Base class for an instance of an item
 //	An item instance encapsulates item data + data specific
 //	to an item instance (includes dye, augments, charges, etc)
-namespace EQEmu
+namespace EQ
 {
 	class InventoryProfile;
-	
+
 	class ItemInstance {
 	public:
 		/////////////////////////
@@ -222,7 +222,7 @@ namespace EQEmu
 		inline int32 GetSerialNumber() const { return m_SerialNumber; }
 		inline void SetSerialNumber(int32 id) { m_SerialNumber = id; }
 
-		std::map<std::string, Timer>& GetTimers() { return m_timers; }
+		std::map<std::string, ::Timer>& GetTimers() { return m_timers; }
 		void SetTimer(std::string name, uint32 time);
 		void StopTimer(std::string name);
 		void ClearTimers();
@@ -316,13 +316,13 @@ namespace EQEmu
 		// Items inside of this item (augs or contents);
 		std::map<uint8, ItemInstance*>		m_contents; // Zero-based index: min=0, max=9
 		std::map<std::string, std::string>	m_custom_data;
-		std::map<std::string, Timer>		m_timers;
+		std::map<std::string, ::Timer>		m_timers;
 	};
 }
 
 class EvolveInfo {
 public:
-	friend class EQEmu::ItemInstance;
+	friend class EQ::ItemInstance;
 	//temporary
 	uint16				LvlKills[9];
 	uint32				FirstItem;

common/light_source.cpp

@@ -22,7 +22,7 @@
 #include <string.h>
 
 
-uint8 EQEmu::lightsource::TypeToLevel(uint8 light_type)
+uint8 EQ::lightsource::TypeToLevel(uint8 light_type)
 {
 	switch (light_type) {
 	case LightTypeGlobeOfStars:
@@ -55,7 +55,7 @@ uint8 EQEmu::lightsource::TypeToLevel(uint8 light_type)
 	}
 }
 
-bool EQEmu::lightsource::IsLevelGreater(uint8 left_type, uint8 right_type)
+bool EQ::lightsource::IsLevelGreater(uint8 left_type, uint8 right_type)
 {
 	static const uint8 light_levels[LightTypeCount] = {
 		LightLevelUnlit,			/* LightTypeNone */
@@ -82,17 +82,17 @@ bool EQEmu::lightsource::IsLevelGreater(uint8 left_type, uint8 right_type)
 	return (light_levels[left_type] > light_levels[right_type]);
 }
 
-EQEmu::LightSource_Struct::LightSource_Struct()
+EQ::LightSource_Struct::LightSource_Struct()
 {
 	Clear();
 }
 
-void EQEmu::LightSource_Struct::Clear()
+void EQ::LightSource_Struct::Clear()
 {
 	memset(&Slot, 0, (sizeof(uint8) * lightsource::LightCount));
 }
 
-void EQEmu::LightSourceProfile::Clear()
+void EQ::LightSourceProfile::Clear()
 {
 	Type.Clear();
 	Level.Clear();

common/light_source.h

@@ -23,7 +23,7 @@
 #include "types.h"
 
 
-namespace EQEmu
+namespace EQ
 {
 	namespace lightsource {
 		enum LightSlot {

common/loottable.h

@@ -39,13 +39,15 @@ struct LootTable_Struct {
 };
 
 struct LootDropEntries_Struct {
-	uint32	item_id;
-	int8	item_charges;
-	uint8	equip_item;
-	float	chance;
-	uint8	minlevel;
-	uint8	maxlevel;
-	uint8	multiplier;
+	uint32 item_id;
+	int8   item_charges;
+	uint8  equip_item;
+	float  chance;
+	uint16 trivial_min_level;
+	uint16 trivial_max_level;
+	uint16 npc_min_level;
+	uint16 npc_max_level;
+	uint8  multiplier;
 };
 
 struct LootDrop_Struct {

common/memory_buffer.cpp

@@ -20,7 +20,7 @@
 #include "memory_buffer.h"
 
 
-EQEmu::MemoryBuffer::MemoryBuffer()
+EQ::MemoryBuffer::MemoryBuffer()
 {
 	buffer_ = nullptr;
 	size_ = 0;
@@ -29,7 +29,7 @@ EQEmu::MemoryBuffer::MemoryBuffer()
 	write_pos_ = 0;
 }
 
-EQEmu::MemoryBuffer::MemoryBuffer(size_t sz)
+EQ::MemoryBuffer::MemoryBuffer(size_t sz)
 {
 	buffer_ = nullptr;
 	size_ = 0;
@@ -39,7 +39,7 @@ EQEmu::MemoryBuffer::MemoryBuffer(size_t sz)
 	Resize(sz);
 }
 
-EQEmu::MemoryBuffer::MemoryBuffer(const MemoryBuffer &other)
+EQ::MemoryBuffer::MemoryBuffer(const MemoryBuffer &other)
 {
 	if(other.capacity_) {
 		buffer_ = new uchar[other.capacity_];
@@ -54,7 +54,7 @@ EQEmu::MemoryBuffer::MemoryBuffer(const MemoryBuffer &other)
 	read_pos_ = other.read_pos_;
 }
 
-EQEmu::MemoryBuffer::MemoryBuffer(MemoryBuffer &&other)
+EQ::MemoryBuffer::MemoryBuffer(MemoryBuffer &&other)
 {
 	uchar *tbuf = other.buffer_;
 	size_t tsz = other.size_;
@@ -75,7 +75,7 @@ EQEmu::MemoryBuffer::MemoryBuffer(MemoryBuffer &&other)
 	read_pos_ = tread_pos;
 }
 
-EQEmu::MemoryBuffer& EQEmu::MemoryBuffer::operator=(const MemoryBuffer &other)
+EQ::MemoryBuffer& EQ::MemoryBuffer::operator=(const MemoryBuffer &other)
 {
 	if(this == &other) {
 		return *this;
@@ -100,7 +100,7 @@ EQEmu::MemoryBuffer& EQEmu::MemoryBuffer::operator=(const MemoryBuffer &other)
 	return *this;
 }
 
-EQEmu::MemoryBuffer& EQEmu::MemoryBuffer::operator=(MemoryBuffer &&other)
+EQ::MemoryBuffer& EQ::MemoryBuffer::operator=(MemoryBuffer &&other)
 {
 	uchar *tbuf = other.buffer_;
 	size_t tsz = other.size_;
@@ -122,7 +122,7 @@ EQEmu::MemoryBuffer& EQEmu::MemoryBuffer::operator=(MemoryBuffer &&other)
 	return *this;
 }
 
-EQEmu::MemoryBuffer& EQEmu::MemoryBuffer::operator+=(const MemoryBuffer &rhs)
+EQ::MemoryBuffer& EQ::MemoryBuffer::operator+=(const MemoryBuffer &rhs)
 {
 	if(!rhs.buffer_) {
 		return *this;
@@ -142,52 +142,52 @@ EQEmu::MemoryBuffer& EQEmu::MemoryBuffer::operator+=(const MemoryBuffer &rhs)
 	return *this;
 }
 
-EQEmu::MemoryBuffer::~MemoryBuffer()
+EQ::MemoryBuffer::~MemoryBuffer()
 {
 	Clear();
 }
 
-uchar& EQEmu::MemoryBuffer::operator[](size_t pos)
+uchar& EQ::MemoryBuffer::operator[](size_t pos)
 {
 	return buffer_[pos];
 }
 
-const uchar& EQEmu::MemoryBuffer::operator[](size_t pos) const
+const uchar& EQ::MemoryBuffer::operator[](size_t pos) const
 {
 	return buffer_[pos];
 }
 
-bool EQEmu::MemoryBuffer::Empty()
+bool EQ::MemoryBuffer::Empty()
 {
 	return size_ == 0;
 }
 
-bool EQEmu::MemoryBuffer::Empty() const
+bool EQ::MemoryBuffer::Empty() const
 {
 	return size_ == 0;
 }
 
-size_t EQEmu::MemoryBuffer::Size()
+size_t EQ::MemoryBuffer::Size()
 {
 	return size_;
 }
 
-size_t EQEmu::MemoryBuffer::Size() const
+size_t EQ::MemoryBuffer::Size() const
 {
 	return size_;
 }
 
-size_t EQEmu::MemoryBuffer::Capacity()
+size_t EQ::MemoryBuffer::Capacity()
 {
 	return capacity_;
 }
 
-size_t EQEmu::MemoryBuffer::Capacity() const
+size_t EQ::MemoryBuffer::Capacity() const
 {
 	return capacity_;
 }
 
-void EQEmu::MemoryBuffer::Resize(size_t sz)
+void EQ::MemoryBuffer::Resize(size_t sz)
 {
 	if(!buffer_) {
 		size_t new_size = sz + 64;
@@ -213,7 +213,7 @@ void EQEmu::MemoryBuffer::Resize(size_t sz)
 	}
 }
 
-void EQEmu::MemoryBuffer::Clear()
+void EQ::MemoryBuffer::Clear()
 {
 	if(buffer_) {
 		delete[] buffer_;
@@ -226,14 +226,14 @@ void EQEmu::MemoryBuffer::Clear()
 	read_pos_ = 0;
 }
 
-void EQEmu::MemoryBuffer::Zero()
+void EQ::MemoryBuffer::Zero()
 {
 	if(buffer_) {
 		memset(buffer_, 0, capacity_);
 	}
 }
 
-void EQEmu::MemoryBuffer::Write(const char *val, size_t len)
+void EQ::MemoryBuffer::Write(const char *val, size_t len)
 {
 	size_t size_needed = write_pos_ + len;
 	Resize(size_needed);
@@ -242,20 +242,20 @@ void EQEmu::MemoryBuffer::Write(const char *val, size_t len)
 	write_pos_ += len;
 }
 
-void EQEmu::MemoryBuffer::Read(uchar *buf, size_t len)
+void EQ::MemoryBuffer::Read(uchar *buf, size_t len)
 {
 	memcpy(buf, &buffer_[read_pos_], len);
 	read_pos_ += len;
 }
 
-void EQEmu::MemoryBuffer::Read(char *str)
+void EQ::MemoryBuffer::Read(char *str)
 {
 	size_t len = strlen((const char*)&buffer_[read_pos_]);
 	memcpy(str, &buffer_[read_pos_], len);
 	read_pos_ += len;
 }
 
-void EQEmu::OutBuffer::overwrite(OutBuffer::pos_type position, const char *_Str, std::streamsize _Count)
+void EQ::OutBuffer::overwrite(OutBuffer::pos_type position, const char *_Str, std::streamsize _Count)
 {
 	auto last_pos = tellp();
 	seekp(position);
@@ -263,7 +263,7 @@ void EQEmu::OutBuffer::overwrite(OutBuffer::pos_type position, const char *_Str,
 	seekp(last_pos);
 }
 
-uchar* EQEmu::OutBuffer::detach()
+uchar* EQ::OutBuffer::detach()
 {
 	size_t buffer_size = tellp();
 	if (buffer_size == 0)

common/memory_buffer.h

@@ -28,7 +28,7 @@
 #include <sstream>
 
 
-namespace EQEmu
+namespace EQ
 {
 	class MemoryBuffer {
 	public:

common/memory_mapped_file.cpp

@@ -33,7 +33,7 @@
 #include <sys/stat.h>
 #endif
 
-namespace EQEmu {
+namespace EQ {
 
 	struct MemoryMappedFile::Implementation {
 #ifdef _WINDOWS

common/memory_mapped_file.h

@@ -22,7 +22,7 @@
 #include <string>
 #include "types.h"
 
-namespace EQEmu {
+namespace EQ {
 
 	//! Memory Backed Shared Memory
 	/*!

common/net/daybreak_connection.cpp

@@ -605,6 +605,8 @@ void EQ::Net::DaybreakConnection::ProcessDecodedPacket(const Packet &p)
 					ProcessDecodedPacket(StaticPacket(current, subpacket_length));
 					current += subpacket_length;
 				}
+
+				break;
 			}
 
 			case OP_SessionRequest:
@@ -1101,7 +1103,7 @@ void EQ::Net::DaybreakConnection::ProcessResend(int stream)
 				InternalBufferedSend(p);
 				entry.second.last_sent = now;
 				entry.second.times_resent++;
-				entry.second.resend_delay = EQEmu::Clamp(entry.second.resend_delay * 2, m_owner->m_options.resend_delay_min, m_owner->m_options.resend_delay_max);
+				entry.second.resend_delay = EQ::Clamp(entry.second.resend_delay * 2, m_owner->m_options.resend_delay_min, m_owner->m_options.resend_delay_max);
 				resends++;
 			}
 		}
@@ -1130,7 +1132,7 @@ void EQ::Net::DaybreakConnection::ProcessResend(int stream)
 				InternalBufferedSend(p);
 				entry.second.last_sent = now;
 				entry.second.times_resent++;
-				entry.second.resend_delay = EQEmu::Clamp(entry.second.resend_delay * 2, m_owner->m_options.resend_delay_min, m_owner->m_options.resend_delay_max);
+				entry.second.resend_delay = EQ::Clamp(entry.second.resend_delay * 2, m_owner->m_options.resend_delay_min, m_owner->m_options.resend_delay_max);
 				resends++;
 			}
 		}
@@ -1182,7 +1184,7 @@ void EQ::Net::DaybreakConnection::OutOfOrderAck(int stream, uint16_t seq)
 void EQ::Net::DaybreakConnection::UpdateDataBudget(double budget_add)
 {
 	auto outgoing_data_rate = m_owner->m_options.outgoing_data_rate;
-	m_outgoing_budget = EQEmu::ClampUpper(m_outgoing_budget + budget_add, outgoing_data_rate);
+	m_outgoing_budget = EQ::ClampUpper(m_outgoing_budget + budget_add, outgoing_data_rate);
 }
 
 void EQ::Net::DaybreakConnection::SendAck(int stream_id, uint16_t seq)
@@ -1403,7 +1405,7 @@ void EQ::Net::DaybreakConnection::InternalQueuePacket(Packet &p, int stream_id,
 		sent.last_sent = Clock::now();
 		sent.first_sent = Clock::now();
 		sent.times_resent = 0;
-		sent.resend_delay = EQEmu::Clamp(
+		sent.resend_delay = EQ::Clamp(
 			static_cast<size_t>((m_rolling_ping * m_owner->m_options.resend_delay_factor) + m_owner->m_options.resend_delay_ms), 
 			m_owner->m_options.resend_delay_min, 
 			m_owner->m_options.resend_delay_max);
@@ -1435,7 +1437,7 @@ void EQ::Net::DaybreakConnection::InternalQueuePacket(Packet &p, int stream_id,
 			sent.last_sent = Clock::now();
 			sent.first_sent = Clock::now();
 			sent.times_resent = 0;
-			sent.resend_delay = EQEmu::Clamp(
+			sent.resend_delay = EQ::Clamp(
 				static_cast<size_t>((m_rolling_ping * m_owner->m_options.resend_delay_factor) + m_owner->m_options.resend_delay_ms),
 				m_owner->m_options.resend_delay_min,
 				m_owner->m_options.resend_delay_max);
@@ -1459,7 +1461,7 @@ void EQ::Net::DaybreakConnection::InternalQueuePacket(Packet &p, int stream_id,
 		sent.last_sent = Clock::now();
 		sent.first_sent = Clock::now();
 		sent.times_resent = 0;
-		sent.resend_delay = EQEmu::Clamp(
+		sent.resend_delay = EQ::Clamp(
 			static_cast<size_t>((m_rolling_ping * m_owner->m_options.resend_delay_factor) + m_owner->m_options.resend_delay_ms),
 			m_owner->m_options.resend_delay_min,
 			m_owner->m_options.resend_delay_max);

common/net/daybreak_connection.h

@@ -318,7 +318,7 @@ namespace EQ
 			void Attach(uv_loop_t *loop);
 			void Detach();
 
-			EQEmu::Random m_rand;
+			EQ::Random m_rand;
 			uv_timer_t m_timer;
 			uv_udp_t m_socket;
 			uv_loop_t *m_attached;

common/patches/rof.h

@@ -43,7 +43,7 @@ namespace RoF
 	protected:
 
 		virtual std::string Describe() const;
-		virtual const EQEmu::versions::ClientVersion ClientVersion() const;
+		virtual const EQ::versions::ClientVersion ClientVersion() const;
 
 		//magic macro to declare our opcode processors
 		#include "ss_declare.h"

common/patches/rof2.h

@@ -43,7 +43,7 @@ namespace RoF2
 	protected:
 
 		virtual std::string Describe() const;
-		virtual const EQEmu::versions::ClientVersion ClientVersion() const;
+		virtual const EQ::versions::ClientVersion ClientVersion() const;
 
 		//magic macro to declare our opcode processors
 		#include "ss_declare.h"

common/patches/rof2_limits.h

@@ -31,7 +31,7 @@ namespace RoF2
 	const int16 INULL = 0;
 
 	namespace inventory {
-		inline EQEmu::versions::ClientVersion GetInventoryRef() { return EQEmu::versions::ClientVersion::RoF2; }
+		inline EQ::versions::ClientVersion GetInventoryRef() { return EQ::versions::ClientVersion::RoF2; }
 
 		const bool ConcatenateInvTypeLimbo = false;
 
@@ -43,7 +43,7 @@ namespace RoF2
 	} /*inventory*/
 
 	namespace invtype {
-		inline EQEmu::versions::ClientVersion GetInvTypeRef() { return EQEmu::versions::ClientVersion::RoF2; }
+		inline EQ::versions::ClientVersion GetInvTypeRef() { return EQ::versions::ClientVersion::RoF2; }
 
 		namespace enum_ {
 			enum InventoryTypes : int16 {
@@ -118,7 +118,7 @@ namespace RoF2
 	} /*invtype*/
 
 	namespace invslot {
-		inline EQEmu::versions::ClientVersion GetInvSlotRef() { return EQEmu::versions::ClientVersion::RoF2; }
+		inline EQ::versions::ClientVersion GetInvSlotRef() { return EQ::versions::ClientVersion::RoF2; }
 
 		namespace enum_ {
 			enum InventorySlots : int16 {
@@ -196,7 +196,7 @@ namespace RoF2
 	} /*invslot*/
 
 	namespace invbag {
-		inline EQEmu::versions::ClientVersion GetInvBagRef() { return EQEmu::versions::ClientVersion::RoF2; }
+		inline EQ::versions::ClientVersion GetInvBagRef() { return EQ::versions::ClientVersion::RoF2; }
 
 		const int16 SLOT_INVALID = IINVALID;
 		const int16 SLOT_BEGIN = INULL;
@@ -208,7 +208,7 @@ namespace RoF2
 	} /*invbag*/
 
 	namespace invaug {
-		inline EQEmu::versions::ClientVersion GetInvAugRef() { return EQEmu::versions::ClientVersion::RoF2; }
+		inline EQ::versions::ClientVersion GetInvAugRef() { return EQ::versions::ClientVersion::RoF2; }
 
 		const int16 SOCKET_INVALID = IINVALID;
 		const int16 SOCKET_BEGIN = INULL;
@@ -220,7 +220,7 @@ namespace RoF2
 	} /*invaug*/
 
 	namespace item {
-		inline EQEmu::versions::ClientVersion GetItemRef() { return EQEmu::versions::ClientVersion::RoF2; }
+		inline EQ::versions::ClientVersion GetItemRef() { return EQ::versions::ClientVersion::RoF2; }
 
 		//enum Unknown : int { // looks like item class..but, RoF has it too - nothing in UF-
 		//	Unknown1 = 0,
@@ -249,7 +249,7 @@ namespace RoF2
 	} /*item*/
 
 	namespace profile {
-		inline EQEmu::versions::ClientVersion GetProfileRef() { return EQEmu::versions::ClientVersion::RoF2; }
+		inline EQ::versions::ClientVersion GetProfileRef() { return EQ::versions::ClientVersion::RoF2; }
 
 		const int16 BANDOLIERS_SIZE = 20;		// number of bandolier instances
 		const int16 BANDOLIER_ITEM_COUNT = 4;	// number of equipment slots in bandolier instance
@@ -261,11 +261,11 @@ namespace RoF2
 	} /*profile*/
 
 	namespace constants {
-		inline EQEmu::versions::ClientVersion GetConstantsRef() { return EQEmu::versions::ClientVersion::RoF2; }
+		inline EQ::versions::ClientVersion GetConstantsRef() { return EQ::versions::ClientVersion::RoF2; }
 
-		const EQEmu::expansions::Expansion EXPANSION = EQEmu::expansions::Expansion::RoF;
-		const uint32 EXPANSION_BIT = EQEmu::expansions::bitRoF;
-		const uint32 EXPANSIONS_MASK = EQEmu::expansions::maskRoF;
+		const EQ::expansions::Expansion EXPANSION = EQ::expansions::Expansion::RoF;
+		const uint32 EXPANSION_BIT = EQ::expansions::bitRoF;
+		const uint32 EXPANSIONS_MASK = EQ::expansions::maskRoF;
 
 		const size_t CHARACTER_CREATION_LIMIT = 12;
 
@@ -274,21 +274,21 @@ namespace RoF2
 	} /*constants*/
 
 	namespace behavior {
-		inline EQEmu::versions::ClientVersion GetBehaviorRef() { return EQEmu::versions::ClientVersion::RoF2; }
+		inline EQ::versions::ClientVersion GetBehaviorRef() { return EQ::versions::ClientVersion::RoF2; }
 
 		const bool CoinHasWeight = false;
 
 	} /*behavior*/
 
 	namespace skills {
-		inline EQEmu::versions::ClientVersion GetSkillsRef() { return EQEmu::versions::ClientVersion::RoF2; }
+		inline EQ::versions::ClientVersion GetSkillsRef() { return EQ::versions::ClientVersion::RoF2; }
 
-		const size_t LastUsableSkill = EQEmu::skills::Skill2HPiercing;
+		const size_t LastUsableSkill = EQ::skills::Skill2HPiercing;
 
 	} /*skills*/
 
 	namespace spells {
-		inline EQEmu::versions::ClientVersion GetSkillsRef() { return EQEmu::versions::ClientVersion::RoF2; }
+		inline EQ::versions::ClientVersion GetSkillsRef() { return EQ::versions::ClientVersion::RoF2; }
 		
 		enum class CastingSlot : uint32 {
 			Gem1 = 0,

common/patches/rof2_ops.h

@@ -58,13 +58,16 @@ E(OP_DeleteCharge)
 E(OP_DeleteItem)
 E(OP_DeleteSpawn)
 E(OP_DisciplineUpdate)
+E(OP_DzChooseZone)
 E(OP_DzCompass)
 E(OP_DzExpeditionEndsWarning)
 E(OP_DzExpeditionInfo)
-E(OP_DzExpeditionList)
-E(OP_DzJoinExpeditionConfirm)
-E(OP_DzLeaderStatus)
+E(OP_DzExpeditionInvite)
+E(OP_DzExpeditionLockoutTimers)
 E(OP_DzMemberList)
+E(OP_DzMemberListName)
+E(OP_DzMemberListStatus)
+E(OP_DzSetLeaderName)
 E(OP_Emote)
 E(OP_ExpansionInfo)
 E(OP_FormattedMessage)
@@ -159,6 +162,12 @@ D(OP_ConsiderCorpse)
 D(OP_Consume)
 D(OP_Damage)
 D(OP_DeleteItem)
+D(OP_DzAddPlayer)
+D(OP_DzChooseZoneReply)
+D(OP_DzExpeditionInviteResponse)
+D(OP_DzMakeLeader)
+D(OP_DzRemovePlayer)
+D(OP_DzSwapPlayer)
 D(OP_Emote)
 D(OP_EnvDamage)
 D(OP_FaceChange)

common/patches/rof2_structs.h

@@ -190,7 +190,7 @@ struct TintProfile
 			Tint_Struct Primary;
 			Tint_Struct Secondary;
 		};
-		Tint_Struct Slot[EQEmu::textures::materialCount];
+		Tint_Struct Slot[EQ::textures::materialCount];
 	};
 };
 
@@ -222,7 +222,7 @@ struct Texture_Struct
 //			Texture_Struct Primary;
 //			Texture_Struct Secondary;
 //		};
-//		Texture_Struct Slot[EQEmu::textures::TextureCount];
+//		Texture_Struct Slot[EQ::textures::TextureCount];
 //	};
 //
 //	TextureProfile();
@@ -628,7 +628,7 @@ struct NewZone_Struct {
 	/*0856*/	uint32	scriptNPCReceivedanItem;
 	/*0860*/	uint32	bCheck;					// padded bool
 	/*0864*/	uint32	scriptIDSomething;
-	/*0868*/	uint32	scriptIDSomething2;
+	/*0868*/	uint32	underworld_teleport_index; // > 0 teleports w/ zone point index, invalid succors, -1 affects some collisions
 	/*0872*/	uint32	scriptIDSomething3;
 	/*0876*/	uint32	SuspendBuffs;			// padded bool
 	/*0880*/	uint32	LavaDamage;				// LavaDamage value
@@ -1113,7 +1113,7 @@ union
 	/*00184*/ Texture_Struct equipment[22];		// Total Slots
 };
 /*00624*/ uint32 equip2_count;			// Seen 9
-/*00628*/ Texture_Struct equipment2[EQEmu::textures::materialCount];	// Appears to be Visible slots, but all 0s
+/*00628*/ Texture_Struct equipment2[EQ::textures::materialCount];	// Appears to be Visible slots, but all 0s
 /*00808*/ uint32 tint_count;			// Seen 9
 /*00812*/ TintProfile item_tint;		// RR GG BB 00
 /*00848*/ uint32 tint_count2;			// Seen 9
@@ -4804,8 +4804,8 @@ struct ItemQuaternaryBodyStruct
 	int32 HealAmt;
 	int32 SpellDmg;
 	int32 Clairvoyance;
-	uint8 unknown18;	//Power Source Capacity or evolve filename?
-	uint32 evolve_string; // Some String, but being evolution related is just a guess
+	int32 SubType;
+	uint8 evolve_string; // Some String, but being evolution related is just a guess
 	uint8 unknown19;
 	uint16 unknown20;
 	uint8 unknown21;
@@ -4882,52 +4882,169 @@ struct VeteranClaim
 /*076*/	uint32 action;
 };
 
-struct ExpeditionEntryHeader_Struct
+struct ExpeditionInvite_Struct
+{
+/*000*/ uint32 client_id;            // unique character id
+/*004*/ uint32 unknown004;
+/*008*/ char   inviter_name[64];
+/*072*/ char   expedition_name[128];
+/*200*/ uint8  swapping;             // 0: adding 1: swapping
+/*201*/ char   swap_name[64];        // if swapping, swap name being removed
+/*265*/ uint8  padding[3];
+/*268*/ uint16 dz_zone_id;           // dz_id zone/instance pair, sent back in reply
+/*270*/ uint16 dz_instance_id;
+};
+
+struct ExpeditionInviteResponse_Struct
 {
 /*000*/ uint32 unknown000;
-/*000*/ uint32 number_of_entries;
-};
-
-struct ExpeditionJoinPrompt_Struct
-{
-/*000*/ uint32 clientid;
 /*004*/ uint32 unknown004;
-/*008*/ char player_name[64];
-/*072*/ char expedition_name[64];
-};
-
-struct ExpeditionExpireWarning
-{
-/*000*/ uint32 clientid;
-/*004*/ uint32 unknown004;
-/*008*/ uint32 minutes_remaining;
+/*008*/ uint16 dz_zone_id;     // dz_id pair sent in invite
+/*010*/ uint16 dz_instance_id;
+/*012*/ uint8  accepted;       // 0: declined 1: accepted
+/*013*/ uint8  swapping;       // 0: adding 1: swapping (sent in invite)
+/*014*/ char   swap_name[64];  // swap name sent in invite
+/*078*/ uint8  unknown078;     // padding garbage?
+/*079*/ uint8  unknown079;     // padding garbage?
 };
 
 struct ExpeditionInfo_Struct
 {
-/*000*/ uint32 clientid;
+/*000*/ uint32 client_id;
 /*004*/ uint32 unknown004;
-/*008*/ uint32 unknown008;
+/*008*/ uint32 assigned; // padded bool, 0: not in expedition (clear data), 1: in expedition
 /*012*/ uint32 max_players;
-/*016*/ char expedition_name[128];
-/*142*/ char leader_name[64];
+/*016*/ char   expedition_name[128];
+/*144*/ char   leader_name[64];
+//*208*/ uint32 unknown208; // live sends 01 00 00 00 here but client doesn't read it
 };
 
-struct ExpeditionCompassEntry_Struct
+struct ExpeditionMemberEntry_Struct
 {
-/*000*/ float unknown000; //seen *((uint32*)) = 1584791871
-/*004*/ uint32 enabled; //guess
-/*008*/ uint32 unknown008; //seen 1019
+/*000*/ char name[1];            // variable length, null terminated, max 0x40 (64)
+/*000*/ uint8 expedition_status; // 0: unknown 1: Online, 2: Offline, 3: In Dynamic Zone, 4: Link Dead
+};
+
+struct ExpeditionMemberList_Struct
+{
+/*000*/ uint32 client_id;
+/*004*/ uint32 member_count; // number of players in window
+/*008*/ ExpeditionMemberEntry_Struct members[0]; // variable length
+};
+
+struct ExpeditionMemberListName_Struct
+{
+/*000*/ uint32 client_id;
+/*004*/ uint32 unknown004;
+/*008*/ uint32 add_name;   // padded bool, 0: remove name, 1: add name with unknown status
+/*012*/ char   name[64];
+};
+
+struct ExpeditionLockoutTimerEntry_Struct
+{
+/*000*/ char   expedition_name[1]; // variable length, null terminated, max 0x80 (128)
+/*000*/ uint32 seconds_remaining;
+/*000*/ int32  event_type;         // seen -1 (0xffffffff) for replay timers and 1 for event timers
+/*000*/ char   event_name[1];      // variable length, null terminated, max 0x100 (256)
+};
+
+struct ExpeditionLockoutTimers_Struct
+{
+/*000*/ uint32 client_id;
+/*004*/ uint32 count;
+/*008*/ ExpeditionLockoutTimerEntry_Struct timers[0];
+};
+
+struct ExpeditionSetLeaderName_Struct
+{
+/*000*/ uint32 client_id;
+/*004*/ uint32 unknown004;
+/*008*/ char   leader_name[64];
+};
+
+struct ExpeditionCommand_Struct
+{
+/*000*/ uint32 unknown000;
+/*004*/ uint32 unknown004;
+/*008*/ char   name[64];
+};
+
+struct ExpeditionCommandSwap_Struct
+{
+/*000*/ uint32 unknown000;
+/*004*/ uint32 unknown004;
+/*008*/ char   add_player_name[64]; // swap to (player must confirm)
+/*072*/ char   rem_player_name[64]; // swap from
+};
+
+struct ExpeditionExpireWarning
+{
+/*000*/ uint32 client_id;
+/*004*/ uint32 unknown004;
+/*008*/ uint32 minutes_remaining;
+};
+
+struct DynamicZoneCompassEntry_Struct
+{
+/*000*/ uint16 dz_zone_id;      // target dz id pair
+/*002*/ uint16 dz_instance_id;
+/*004*/ uint32 dz_type;         // 1: Expedition, 2: Tutorial (purple), 3: Task, 4: Mission, 5: Quest (green)
+/*008*/ uint32 unknown008;
 /*012*/ float y;
 /*016*/ float x;
 /*020*/ float z;
 };
 
-struct ExpeditionCompass_Struct
+struct DynamicZoneCompass_Struct
 {
-/*000*/ uint32 clientid;
+/*000*/ uint32 client_id;
 /*004*/ uint32 count;
-/*008*/ ExpeditionCompassEntry_Struct entries[0];
+/*008*/ DynamicZoneCompassEntry_Struct entries[0];
+};
+
+struct DynamicZoneChooseZoneEntry_Struct
+{
+/*000*/ uint16 dz_zone_id;     // dz_id pair
+/*002*/ uint16 dz_instance_id;
+/*004*/ uint32 unknown_id1;    // seen 28 00 00 00 (40), sent back in reply
+/*008*/ uint32 dz_type;        // 1: Expedition, 2: Tutorial, 3: Task, 4: Mission, 5: Quest -- sent back in reply
+/*012*/ uint32 unknown_id2;    // possibly an id based on dz type, for expeditions this was same as dz_id (zone|instance) but task dz was different
+/*016*/ char   description[1]; // variable length, null terminated, max 0x80 (128)
+/*000*/ char   leader_name[1]; // variable length, null terminated, max 0x40 (64)
+};
+
+struct DynamicZoneChooseZone_Struct
+{
+/*000*/ uint32 client_id;
+/*004*/ uint32 count;
+/*008*/ DynamicZoneChooseZoneEntry_Struct choices[0];
+};
+
+struct DynamicZoneChooseZoneReply_Struct
+{
+/*000*/ uint32 unknown000;     // ff ff ff ff
+/*004*/ uint32 unknown004;     // seen 69 00 00 00
+/*008*/ uint32 unknown008;     // ff ff ff ff
+/*012*/ uint32 unknown_id1;    // from choose zone entry message
+/*016*/ uint16 dz_zone_id;     // dz_id pair
+/*018*/ uint16 dz_instance_id;
+/*020*/ uint32 dz_type;        // 1: Expedition, 2: Tutorial, 3: Task, 4: Mission, 5: Quest
+/*024*/ uint32 unknown_id2;    // from choose zone entry message
+/*028*/ uint32 unknown028;     // 00 00 00 00
+/*032*/ uint32 unknown032;     // always same as unknown044
+/*036*/ uint32 unknown036;
+/*040*/ uint32 unknown040;
+/*044*/ uint32 unknown044;     // always same as unknown032
+/*048*/ uint32 unknown048;     // seen 01 00 00 00 and 02 00 00 00
+};
+
+struct KickPlayers_Struct
+{
+/*000*/ char   char_name[64];
+/*064*/ uint32 unknown064;      // always 0
+/*068*/ uint8  kick_expedition; // true if /kickplayers exp
+/*069*/ uint8  kick_task;       // true if /kickplayers task
+/*070*/ uint8  padding[2];
 };
 
 struct MaxCharacters_Struct

common/patches/rof_limits.h

@@ -31,7 +31,7 @@ namespace RoF
 	const int16 INULL = 0;
 
 	namespace inventory {
-		inline EQEmu::versions::ClientVersion GetInventoryRef() { return EQEmu::versions::ClientVersion::RoF; }
+		inline EQ::versions::ClientVersion GetInventoryRef() { return EQ::versions::ClientVersion::RoF; }
 
 		const bool ConcatenateInvTypeLimbo = false;
 
@@ -43,7 +43,7 @@ namespace RoF
 	} /*inventory*/
 
 	namespace invtype {
-		inline EQEmu::versions::ClientVersion GetInvTypeRef() { return EQEmu::versions::ClientVersion::RoF; }
+		inline EQ::versions::ClientVersion GetInvTypeRef() { return EQ::versions::ClientVersion::RoF; }
 
 		namespace enum_ {
 			enum InventoryTypes : int16 {
@@ -116,7 +116,7 @@ namespace RoF
 	} /*invtype*/
 
 	namespace invslot {
-		inline EQEmu::versions::ClientVersion GetInvSlotRef() { return EQEmu::versions::ClientVersion::RoF; }
+		inline EQ::versions::ClientVersion GetInvSlotRef() { return EQ::versions::ClientVersion::RoF; }
 
 		namespace enum_ {
 			enum InventorySlots : int16 {
@@ -194,7 +194,7 @@ namespace RoF
 	} /*invslot*/
 
 	namespace invbag {
-		inline EQEmu::versions::ClientVersion GetInvBagRef() { return EQEmu::versions::ClientVersion::RoF; }
+		inline EQ::versions::ClientVersion GetInvBagRef() { return EQ::versions::ClientVersion::RoF; }
 
 		const int16 SLOT_INVALID = IINVALID;
 		const int16 SLOT_BEGIN = INULL;
@@ -206,7 +206,7 @@ namespace RoF
 	} /*invbag*/
 
 	namespace invaug {
-		inline EQEmu::versions::ClientVersion GetInvAugRef() { return EQEmu::versions::ClientVersion::RoF; }
+		inline EQ::versions::ClientVersion GetInvAugRef() { return EQ::versions::ClientVersion::RoF; }
 
 		const int16 SOCKET_INVALID = IINVALID;
 		const int16 SOCKET_BEGIN = INULL;
@@ -218,7 +218,7 @@ namespace RoF
 	} /*invaug*/
 
 	namespace item {
-		inline EQEmu::versions::ClientVersion GetItemRef() { return EQEmu::versions::ClientVersion::RoF; }
+		inline EQ::versions::ClientVersion GetItemRef() { return EQ::versions::ClientVersion::RoF; }
 
 		enum ItemPacketType : int {
 			ItemPacketMerchant = 100,
@@ -240,7 +240,7 @@ namespace RoF
 	} /*item*/
 
 	namespace profile {
-		inline EQEmu::versions::ClientVersion GetProfileRef() { return EQEmu::versions::ClientVersion::RoF; }
+		inline EQ::versions::ClientVersion GetProfileRef() { return EQ::versions::ClientVersion::RoF; }
 
 		const int16 BANDOLIERS_SIZE = 20;		// number of bandolier instances
 		const int16 BANDOLIER_ITEM_COUNT = 4;	// number of equipment slots in bandolier instance
@@ -252,11 +252,11 @@ namespace RoF
 	} /*profile*/
 
 	namespace constants {
-		inline EQEmu::versions::ClientVersion GetConstantsRef() { return EQEmu::versions::ClientVersion::RoF; }
+		inline EQ::versions::ClientVersion GetConstantsRef() { return EQ::versions::ClientVersion::RoF; }
 
-		const EQEmu::expansions::Expansion EXPANSION = EQEmu::expansions::Expansion::RoF;
-		const uint32 EXPANSION_BIT = EQEmu::expansions::bitRoF;
-		const uint32 EXPANSIONS_MASK = EQEmu::expansions::maskRoF;
+		const EQ::expansions::Expansion EXPANSION = EQ::expansions::Expansion::RoF;
+		const uint32 EXPANSION_BIT = EQ::expansions::bitRoF;
+		const uint32 EXPANSIONS_MASK = EQ::expansions::maskRoF;
 
 		const size_t CHARACTER_CREATION_LIMIT = 12;
 
@@ -265,21 +265,21 @@ namespace RoF
 	} /*constants*/
 
 	namespace behavior {
-		inline EQEmu::versions::ClientVersion GetBehaviorRef() { return EQEmu::versions::ClientVersion::RoF; }
+		inline EQ::versions::ClientVersion GetBehaviorRef() { return EQ::versions::ClientVersion::RoF; }
 
 		const bool CoinHasWeight = false;
 
 	} /*behavior*/
 
 	namespace skills {
-		inline EQEmu::versions::ClientVersion GetSkillsRef() { return EQEmu::versions::ClientVersion::RoF; }
+		inline EQ::versions::ClientVersion GetSkillsRef() { return EQ::versions::ClientVersion::RoF; }
 
-		const size_t LastUsableSkill = EQEmu::skills::SkillTripleAttack;
+		const size_t LastUsableSkill = EQ::skills::SkillTripleAttack;
 
 	} /*skills*/
 
 	namespace spells {
-		inline EQEmu::versions::ClientVersion GetSkillsRef() { return EQEmu::versions::ClientVersion::RoF; }
+		inline EQ::versions::ClientVersion GetSkillsRef() { return EQ::versions::ClientVersion::RoF; }
 		
 		enum class CastingSlot : uint32 {
 			Gem1 = 0,

common/patches/rof_ops.h

@@ -44,13 +44,16 @@ E(OP_DeleteCharge)
 E(OP_DeleteItem)
 E(OP_DeleteSpawn)
 E(OP_DisciplineUpdate)
+E(OP_DzChooseZone)
 E(OP_DzCompass)
 E(OP_DzExpeditionEndsWarning)
 E(OP_DzExpeditionInfo)
-E(OP_DzExpeditionList)
-E(OP_DzJoinExpeditionConfirm)
-E(OP_DzLeaderStatus)
+E(OP_DzExpeditionInvite)
+E(OP_DzExpeditionLockoutTimers)
 E(OP_DzMemberList)
+E(OP_DzMemberListName)
+E(OP_DzMemberListStatus)
+E(OP_DzSetLeaderName)
 E(OP_Emote)
 E(OP_ExpansionInfo)
 E(OP_FormattedMessage)
@@ -145,6 +148,12 @@ D(OP_ConsiderCorpse)
 D(OP_Consume)
 D(OP_Damage)
 D(OP_DeleteItem)
+D(OP_DzAddPlayer)
+D(OP_DzChooseZoneReply)
+D(OP_DzExpeditionInviteResponse)
+D(OP_DzMakeLeader)
+D(OP_DzRemovePlayer)
+D(OP_DzSwapPlayer)
 D(OP_Emote)
 D(OP_EnvDamage)
 D(OP_FaceChange)

common/patches/rof_structs.h

@@ -190,7 +190,7 @@ struct TintProfile
 			Tint_Struct Primary;
 			Tint_Struct Secondary;
 		};
-		Tint_Struct Slot[EQEmu::textures::materialCount];
+		Tint_Struct Slot[EQ::textures::materialCount];
 	};
 };
 
@@ -222,7 +222,7 @@ struct Texture_Struct
 //			Texture_Struct Primary;
 //			Texture_Struct Secondary;
 //		};
-//		Texture_Struct Slot[EQEmu::textures::TextureCount];
+//		Texture_Struct Slot[EQ::textures::TextureCount];
 //	};
 //
 //	TextureProfile();
@@ -575,7 +575,11 @@ struct NewZone_Struct {
 /*0848*/	int32	unknown848;
 /*0852*/	uint16	zone_id;
 /*0854*/	uint16	zone_instance;
-/*0856*/	char	unknown856[20];
+/*0856*/	uint32	scriptNPCReceivedanItem;
+/*0860*/	uint32	bCheck;					// padded bool
+/*0864*/	uint32	scriptIDSomething;
+/*0868*/	uint32	underworld_teleport_index; // > 0 teleports w/ zone point index, invalid succors, -1 affects some collisions
+/*0872*/	uint32	scriptIDSomething3;
 /*0876*/	uint32	SuspendBuffs;
 /*0880*/	uint32	unknown880;		// Seen 50
 /*0884*/	uint32	unknown884;		// Seen 10
@@ -4744,8 +4748,8 @@ struct ItemQuaternaryBodyStruct
 	int32 HealAmt;
 	int32 SpellDmg;
 	int32 Clairvoyance;
-	uint8 unknown18;	//Power Source Capacity or evolve filename?
-	uint32 evolve_string; // Some String, but being evolution related is just a guess
+	int32 SubType;
+	uint8 evolve_string; // Some String, but being evolution related is just a guess
 	uint8 unknown19;
 	uint32 unknown20;	// Bard Stuff?
 	//uint32 unknown21;
@@ -4811,52 +4815,159 @@ struct VeteranClaim
 /*076*/	uint32 action;
 };
 
-struct ExpeditionEntryHeader_Struct
+struct ExpeditionInvite_Struct
+{
+/*000*/ uint32 client_id;            // unique character id
+/*004*/ uint32 unknown004;
+/*008*/ char   inviter_name[64];
+/*072*/ char   expedition_name[128];
+/*200*/ uint8  swapping;             // 0: adding 1: swapping
+/*201*/ char   swap_name[64];        // if swapping, swap name being removed
+/*265*/ uint8  padding[3];
+/*268*/ uint16 dz_zone_id;           // dz_id zone/instance pair, sent back in reply
+/*270*/ uint16 dz_instance_id;
+};
+
+struct ExpeditionInviteResponse_Struct
 {
 /*000*/ uint32 unknown000;
-/*000*/ uint32 number_of_entries;
-};
-
-struct ExpeditionJoinPrompt_Struct
-{
-/*000*/ uint32 clientid;
 /*004*/ uint32 unknown004;
-/*008*/ char player_name[64];
-/*072*/ char expedition_name[64];
-};
-
-struct ExpeditionExpireWarning
-{
-/*000*/ uint32 clientid;
-/*004*/ uint32 unknown004;
-/*008*/ uint32 minutes_remaining;
+/*008*/ uint16 dz_zone_id;     // dz_id pair sent in invite
+/*010*/ uint16 dz_instance_id;
+/*012*/ uint8  accepted;       // 0: declined 1: accepted
+/*013*/ uint8  swapping;       // 0: adding 1: swapping (sent in invite)
+/*014*/ char   swap_name[64];  // swap name sent in invite
+/*078*/ uint8  unknown078;     // padding garbage?
+/*079*/ uint8  unknown079;     // padding garbage?
 };
 
 struct ExpeditionInfo_Struct
 {
-/*000*/ uint32 clientid;
+/*000*/ uint32 client_id;
 /*004*/ uint32 unknown004;
-/*008*/ uint32 unknown008;
+/*008*/ uint32 assigned; // padded bool
 /*012*/ uint32 max_players;
-/*016*/ char expedition_name[128];
-/*142*/ char leader_name[64];
+/*016*/ char   expedition_name[128];
+/*144*/ char   leader_name[64];
 };
 
-struct ExpeditionCompassEntry_Struct
+struct ExpeditionMemberEntry_Struct
 {
-/*000*/ float unknown000; //seen *((uint32*)) = 1584791871
-/*004*/ uint32 enabled; //guess
-/*008*/ uint32 unknown008; //seen 1019
+/*000*/ char name[1];            // variable length, null terminated, max 0x40 (64)
+/*000*/ uint8 expedition_status; // 0: unknown 1: Online, 2: Offline, 3: In Dynamic Zone, 4: Link Dead
+};
+
+struct ExpeditionMemberList_Struct
+{
+/*000*/ uint32 client_id;
+/*004*/ uint32 member_count; // number of players in window
+/*008*/ ExpeditionMemberEntry_Struct members[0]; // variable length
+};
+
+struct ExpeditionMemberListName_Struct
+{
+/*000*/ uint32 client_id;
+/*004*/ uint32 unknown004;
+/*008*/ uint32 add_name;   // padded bool, 0: remove name, 1: add name with unknown status
+/*012*/ char   name[64];
+};
+
+struct ExpeditionLockoutTimerEntry_Struct
+{
+/*000*/ char   expedition_name[1]; // variable length, null terminated, max 0x80 (128)
+/*000*/ uint32 seconds_remaining;
+/*000*/ int32  event_type;         // seen -1 (0xffffffff) for replay timers and 1 for event timers
+/*000*/ char   event_name[1];      // variable length, null terminated, max 0x100 (256)
+};
+
+struct ExpeditionLockoutTimers_Struct
+{
+/*000*/ uint32 client_id;
+/*004*/ uint32 count;
+/*008*/ ExpeditionLockoutTimerEntry_Struct timers[0];
+};
+
+struct ExpeditionSetLeaderName_Struct
+{
+/*000*/ uint32 client_id;
+/*004*/ uint32 unknown004;
+/*008*/ char   leader_name[64];
+};
+
+struct ExpeditionCommand_Struct
+{
+/*000*/ uint32 unknown000;
+/*004*/ uint32 unknown004;
+/*008*/ char   name[64];
+};
+
+struct ExpeditionCommandSwap_Struct
+{
+/*000*/ uint32 unknown000;
+/*004*/ uint32 unknown004;
+/*008*/ char   add_player_name[64]; // swap to (player must confirm)
+/*072*/ char   rem_player_name[64]; // swap from
+};
+
+struct ExpeditionExpireWarning
+{
+/*000*/ uint32 client_id;
+/*004*/ uint32 unknown004;
+/*008*/ uint32 minutes_remaining;
+};
+
+struct DynamicZoneCompassEntry_Struct
+{
+/*000*/ uint16 dz_zone_id;      // target dz id pair
+/*002*/ uint16 dz_instance_id;
+/*004*/ uint32 dz_type;         // 1: Expedition, 2: Tutorial (purple), 3: Task, 4: Mission, 5: Quest (green)
+/*008*/ uint32 unknown008;
 /*012*/ float y;
 /*016*/ float x;
 /*020*/ float z;
 };
 
-struct ExpeditionCompass_Struct
+struct DynamicZoneCompass_Struct
 {
-/*000*/ uint32 clientid;
+/*000*/ uint32 client_id;
 /*004*/ uint32 count;
-/*008*/ ExpeditionCompassEntry_Struct entries[0];
+/*008*/ DynamicZoneCompassEntry_Struct entries[0];
+};
+
+struct DynamicZoneChooseZoneEntry_Struct
+{
+/*000*/ uint16 dz_zone_id;     // dz_id pair
+/*002*/ uint16 dz_instance_id;
+/*004*/ uint32 unknown_id1;    // sent back in reply
+/*008*/ uint32 dz_type;        // 1: Expedition, 2: Tutorial, 3: Task, 4: Mission, 5: Quest -- sent back in reply
+/*012*/ uint32 unknown_id2;    // possibly an id based on dz type, for expeditions this was same as dz_id (zone|instance) but task dz was different
+/*016*/ char   description[1]; // variable length, null terminated, max 0x80 (128)
+/*000*/ char   leader_name[1]; // variable length, null terminated, max 0x40 (64)
+};
+
+struct DynamicZoneChooseZone_Struct
+{
+/*000*/ uint32 client_id;
+/*004*/ uint32 count;
+/*008*/ DynamicZoneChooseZoneEntry_Struct choices[0];
+};
+
+struct DynamicZoneChooseZoneReply_Struct
+{
+/*000*/ uint32 unknown000;     // ff ff ff ff
+/*004*/ uint32 unknown004;     // seen 69 00 00 00
+/*008*/ uint32 unknown008;     // ff ff ff ff
+/*012*/ uint32 unknown_id1;    // from choose zone entry message
+/*016*/ uint16 dz_zone_id;     // dz_id pair
+/*018*/ uint16 dz_instance_id;
+/*020*/ uint32 dz_type;        // 1: Expedition, 2: Tutorial, 3: Task, 4: Mission, 5: Quest
+/*024*/ uint32 unknown_id2;    // from choose zone entry message
+/*028*/ uint32 unknown028;     // 00 00 00 00
+/*032*/ uint32 unknown032;     // always same as unknown044
+/*036*/ uint32 unknown036;
+/*040*/ uint32 unknown040;
+/*044*/ uint32 unknown044;     // always same as unknown032
+/*048*/ uint32 unknown048;     // seen 01 00 00 00 and 02 00 00 00
 };
 
 struct MaxCharacters_Struct

common/patches/sod.cpp

@@ -43,7 +43,7 @@ namespace SoD
 	static OpcodeManager *opcodes = nullptr;
 	static Strategy struct_strategy;
 
-	void SerializeItem(EQEmu::OutBuffer& ob, const EQEmu::ItemInstance *inst, int16 slot_id, uint8 depth);
+	void SerializeItem(EQ::OutBuffer& ob, const EQ::ItemInstance *inst, int16 slot_id, uint8 depth);
 
 	// server to client inventory location converters
 	static inline uint32 ServerToSoDSlot(uint32 server_slot);
@@ -59,8 +59,8 @@ namespace SoD
 	// client to server say link converter
 	static inline void SoDToServerSayLink(std::string &server_saylink, const std::string &sod_saylink);
 
-	static inline spells::CastingSlot ServerToSoDCastingSlot(EQEmu::spells::CastingSlot slot);
-	static inline EQEmu::spells::CastingSlot SoDToServerCastingSlot(spells::CastingSlot slot);
+	static inline spells::CastingSlot ServerToSoDCastingSlot(EQ::spells::CastingSlot slot);
+	static inline EQ::spells::CastingSlot SoDToServerCastingSlot(spells::CastingSlot slot);
 
 	static inline int ServerToSoDBuffSlot(int index);
 	static inline int SoDToServerBuffSlot(int index);
@@ -144,9 +144,9 @@ namespace SoD
 		return(r);
 	}
 
-	const EQEmu::versions::ClientVersion Strategy::ClientVersion() const
+	const EQ::versions::ClientVersion Strategy::ClientVersion() const
 	{
-		return EQEmu::versions::ClientVersion::SoD;
+		return EQ::versions::ClientVersion::SoD;
 	}
 
 #include "ss_define.h"
@@ -381,24 +381,24 @@ namespace SoD
 		//store away the emu struct
 		uchar* __emu_buffer = in->pBuffer;
 
-		int item_count = in->size / sizeof(EQEmu::InternalSerializedItem_Struct);
-		if (!item_count || (in->size % sizeof(EQEmu::InternalSerializedItem_Struct)) != 0) {
+		int item_count = in->size / sizeof(EQ::InternalSerializedItem_Struct);
+		if (!item_count || (in->size % sizeof(EQ::InternalSerializedItem_Struct)) != 0) {
 			Log(Logs::General, Logs::Netcode, "[STRUCTS] Wrong size on outbound %s: Got %d, expected multiple of %d",
-				opcodes->EmuToName(in->GetOpcode()), in->size, sizeof(EQEmu::InternalSerializedItem_Struct));
+				opcodes->EmuToName(in->GetOpcode()), in->size, sizeof(EQ::InternalSerializedItem_Struct));
 
 			delete in;
 			return;
 		}
 
-		EQEmu::InternalSerializedItem_Struct* eq = (EQEmu::InternalSerializedItem_Struct*)in->pBuffer;
+		EQ::InternalSerializedItem_Struct* eq = (EQ::InternalSerializedItem_Struct*)in->pBuffer;
 
-		EQEmu::OutBuffer ob;
-		EQEmu::OutBuffer::pos_type last_pos = ob.tellp();
+		EQ::OutBuffer ob;
+		EQ::OutBuffer::pos_type last_pos = ob.tellp();
 
 		ob.write((const char*)&item_count, sizeof(uint32));
 
 		for (int index = 0; index < item_count; ++index, ++eq) {
-			SerializeItem(ob, (const EQEmu::ItemInstance*)eq->inst, eq->slot_id, 0);
+			SerializeItem(ob, (const EQ::ItemInstance*)eq->inst, eq->slot_id, 0);
 			if (ob.tellp() == last_pos)
 				LogNetcode("SoD::ENCODE(OP_CharInventory) Serialization failed on item slot [{}] during OP_CharInventory.  Item skipped", eq->slot_id);
 
@@ -483,15 +483,48 @@ namespace SoD
 		FINISH_ENCODE();
 	}
 
+	ENCODE(OP_DzChooseZone)
+	{
+		SETUP_VAR_ENCODE(DynamicZoneChooseZone_Struct);
+
+		SerializeBuffer buf;
+		buf.WriteUInt32(emu->client_id);
+		buf.WriteUInt32(emu->count);
+
+		for (uint32 i = 0; i < emu->count; ++i)
+		{
+			buf.WriteUInt16(emu->choices[i].dz_zone_id);
+			buf.WriteUInt16(emu->choices[i].dz_instance_id);
+			buf.WriteUInt32(emu->choices[i].unknown_id1);
+			buf.WriteUInt32(emu->choices[i].dz_type);
+			buf.WriteUInt32(emu->choices[i].unknown_id2);
+			buf.WriteString(emu->choices[i].description);
+			buf.WriteString(emu->choices[i].leader_name);
+		}
+
+		__packet->size = buf.size();
+		__packet->pBuffer = new unsigned char[__packet->size];
+		memcpy(__packet->pBuffer, buf.buffer(), __packet->size);
+
+		FINISH_ENCODE();
+	}
+
 	ENCODE(OP_DzCompass)
 	{
-		SETUP_VAR_ENCODE(ExpeditionCompass_Struct);
-		ALLOC_VAR_ENCODE(structs::ExpeditionCompass_Struct, sizeof(structs::ExpeditionInfo_Struct) + sizeof(structs::ExpeditionCompassEntry_Struct) * emu->count);
+		SETUP_VAR_ENCODE(DynamicZoneCompass_Struct);
+		ALLOC_VAR_ENCODE(structs::DynamicZoneCompass_Struct,
+			sizeof(structs::DynamicZoneCompass_Struct) +
+			sizeof(structs::DynamicZoneCompassEntry_Struct) * emu->count
+		);
 
+		OUT(client_id);
 		OUT(count);
 
 		for (uint32 i = 0; i < emu->count; ++i)
 		{
+			OUT(entries[i].dz_zone_id);
+			OUT(entries[i].dz_instance_id);
+			OUT(entries[i].dz_type);
 			OUT(entries[i].x);
 			OUT(entries[i].y);
 			OUT(entries[i].z);
@@ -515,81 +548,60 @@ namespace SoD
 		ENCODE_LENGTH_EXACT(ExpeditionInfo_Struct);
 		SETUP_DIRECT_ENCODE(ExpeditionInfo_Struct, structs::ExpeditionInfo_Struct);
 
+		OUT(client_id);
+		OUT(assigned);
 		OUT(max_players);
-		eq->unknown004 = 785316192;
-		eq->unknown008 = 435601;
-		strcpy(eq->expedition_name, emu->expedition_name);
-		strcpy(eq->leader_name, emu->leader_name);
+		strn0cpy(eq->expedition_name, emu->expedition_name, sizeof(eq->expedition_name));
+		strn0cpy(eq->leader_name, emu->leader_name, sizeof(eq->leader_name));
 
 		FINISH_ENCODE();
 	}
 
-	ENCODE(OP_DzExpeditionList)
+	ENCODE(OP_DzExpeditionInvite)
 	{
-		SETUP_VAR_ENCODE(ExpeditionLockoutList_Struct);
+		ENCODE_LENGTH_EXACT(ExpeditionInvite_Struct);
+		SETUP_DIRECT_ENCODE(ExpeditionInvite_Struct, structs::ExpeditionInvite_Struct);
 
-		std::stringstream ss(std::stringstream::in | std::stringstream::out | std::stringstream::binary);
-		uint32 client_id = 0;
-		uint8 null_term = 0;
-		ss.write((const char*)&client_id, sizeof(uint32));
-		ss.write((const char*)&emu->count, sizeof(uint32));
+		OUT(client_id);
+		strn0cpy(eq->inviter_name, emu->inviter_name, sizeof(eq->inviter_name));
+		strn0cpy(eq->expedition_name, emu->expedition_name, sizeof(eq->expedition_name));
+		OUT(swapping);
+		strn0cpy(eq->swap_name, emu->swap_name, sizeof(eq->swap_name));
+		OUT(dz_zone_id);
+		OUT(dz_instance_id);
+
+		FINISH_ENCODE();
+	}
+
+	ENCODE(OP_DzExpeditionLockoutTimers)
+	{
+		SETUP_VAR_ENCODE(ExpeditionLockoutTimers_Struct);
+
+		SerializeBuffer buf;
+		buf.WriteUInt32(emu->client_id);
+		buf.WriteUInt32(emu->count);
 		for (uint32 i = 0; i < emu->count; ++i)
 		{
-			ss.write(emu->entries[i].expedition, strlen(emu->entries[i].expedition));
-			ss.write((const char*)&null_term, sizeof(char));
-			ss.write((const char*)&emu->entries[i].time_left, sizeof(uint32));
-			ss.write((const char*)&client_id, sizeof(uint32));
-			ss.write(emu->entries[i].expedition_event, strlen(emu->entries[i].expedition_event));
-			ss.write((const char*)&null_term, sizeof(char));
+			buf.WriteString(emu->timers[i].expedition_name);
+			buf.WriteUInt32(emu->timers[i].seconds_remaining);
+			buf.WriteInt32(emu->timers[i].event_type);
+			buf.WriteString(emu->timers[i].event_name);
 		}
 
-		__packet->size = ss.str().length();
+		__packet->size = buf.size();
 		__packet->pBuffer = new unsigned char[__packet->size];
-		memcpy(__packet->pBuffer, ss.str().c_str(), __packet->size);
+		memcpy(__packet->pBuffer, buf.buffer(), __packet->size);
 
 		FINISH_ENCODE();
 	}
 
-	ENCODE(OP_DzJoinExpeditionConfirm)
+	ENCODE(OP_DzSetLeaderName)
 	{
-		ENCODE_LENGTH_EXACT(ExpeditionJoinPrompt_Struct);
-		SETUP_DIRECT_ENCODE(ExpeditionJoinPrompt_Struct, structs::ExpeditionJoinPrompt_Struct);
+		ENCODE_LENGTH_EXACT(ExpeditionSetLeaderName_Struct);
+		SETUP_DIRECT_ENCODE(ExpeditionSetLeaderName_Struct, structs::ExpeditionSetLeaderName_Struct);
 
-		strcpy(eq->expedition_name, emu->expedition_name);
-		strcpy(eq->player_name, emu->player_name);
-
-		FINISH_ENCODE();
-	}
-
-	ENCODE(OP_DzLeaderStatus)
-	{
-		SETUP_VAR_ENCODE(ExpeditionLeaderSet_Struct);
-
-		std::stringstream ss(std::stringstream::in | std::stringstream::out | std::stringstream::binary);
-		uint32 client_id = 0;
-		uint8 null_term = 0;
-
-		ss.write((const char*)&client_id, sizeof(uint32));
-		ss.write((const char*)&client_id, sizeof(uint32));
-		ss.write(emu->leader_name, strlen(emu->leader_name));
-		ss.write((const char*)&null_term, sizeof(char));
-		ss.write((const char*)&client_id, sizeof(uint32));
-		ss.write((const char*)&client_id, sizeof(uint32));//0xffffffff
-		ss.write((const char*)&client_id, sizeof(uint32));
-		ss.write((const char*)&client_id, sizeof(uint32));
-		ss.write((const char*)&client_id, sizeof(uint32));
-		ss.write((const char*)&client_id, sizeof(uint32));
-		ss.write((const char*)&client_id, sizeof(uint32));
-		ss.write((const char*)&client_id, sizeof(uint32));
-		ss.write((const char*)&client_id, sizeof(uint32));
-		ss.write((const char*)&client_id, sizeof(uint32));
-		ss.write((const char*)&client_id, sizeof(uint32));
-		ss.write((const char*)&client_id, sizeof(uint32));//1
-		ss.write((const char*)&client_id, sizeof(uint32));
-
-		__packet->size = ss.str().length();
-		__packet->pBuffer = new unsigned char[__packet->size];
-		memcpy(__packet->pBuffer, ss.str().c_str(), __packet->size);
+		OUT(client_id);
+		strn0cpy(eq->leader_name, emu->leader_name, sizeof(eq->leader_name));
 
 		FINISH_ENCODE();
 	}
@@ -598,26 +610,44 @@ namespace SoD
 	{
 		SETUP_VAR_ENCODE(ExpeditionMemberList_Struct);
 
-		std::stringstream ss(std::stringstream::in | std::stringstream::out | std::stringstream::binary);
-
-		uint32 client_id = 0;
-		uint8 null_term = 0;
-		ss.write((const char*)&client_id, sizeof(uint32));
-		ss.write((const char*)&emu->count, sizeof(uint32));
-		for (uint32 i = 0; i < emu->count; ++i)
+		SerializeBuffer buf;
+		buf.WriteUInt32(emu->client_id);
+		buf.WriteUInt32(emu->member_count);
+		for (uint32 i = 0; i < emu->member_count; ++i)
 		{
-			ss.write(emu->entries[i].name, strlen(emu->entries[i].name));
-			ss.write((const char*)&null_term, sizeof(char));
-			ss.write((const char*)&emu->entries[i].status, sizeof(char));
+			buf.WriteString(emu->members[i].name);
+			buf.WriteUInt8(emu->members[i].expedition_status);
 		}
 
-		__packet->size = ss.str().length();
+		__packet->size = buf.size();
 		__packet->pBuffer = new unsigned char[__packet->size];
-		memcpy(__packet->pBuffer, ss.str().c_str(), __packet->size);
+		memcpy(__packet->pBuffer, buf.buffer(), __packet->size);
 
 		FINISH_ENCODE();
 	}
 
+	ENCODE(OP_DzMemberListName)
+	{
+		ENCODE_LENGTH_EXACT(ExpeditionMemberListName_Struct);
+		SETUP_DIRECT_ENCODE(ExpeditionMemberListName_Struct, structs::ExpeditionMemberListName_Struct);
+
+		OUT(client_id);
+		OUT(add_name);
+		strn0cpy(eq->name, emu->name, sizeof(eq->name));
+
+		FINISH_ENCODE();
+	}
+
+	ENCODE(OP_DzMemberListStatus)
+	{
+		auto emu = reinterpret_cast<ExpeditionMemberList_Struct*>((*p)->pBuffer);
+		if (emu->member_count == 1)
+		{
+			ENCODE_FORWARD(OP_DzMemberList);
+		}
+	}
+
+
 	ENCODE(OP_Emote)
 	{
 		EQApplicationPacket *in = *p;
@@ -1060,14 +1090,14 @@ namespace SoD
 		//store away the emu struct
 		uchar* __emu_buffer = in->pBuffer;
 		
-		EQEmu::InternalSerializedItem_Struct* int_struct = (EQEmu::InternalSerializedItem_Struct*)(&__emu_buffer[4]);
+		EQ::InternalSerializedItem_Struct* int_struct = (EQ::InternalSerializedItem_Struct*)(&__emu_buffer[4]);
 
-		EQEmu::OutBuffer ob;
-		EQEmu::OutBuffer::pos_type last_pos = ob.tellp();
+		EQ::OutBuffer ob;
+		EQ::OutBuffer::pos_type last_pos = ob.tellp();
 
 		ob.write((const char*)__emu_buffer, 4);
 
-		SerializeItem(ob, (const EQEmu::ItemInstance*)int_struct->inst, int_struct->slot_id, 0);
+		SerializeItem(ob, (const EQ::ItemInstance*)int_struct->inst, int_struct->slot_id, 0);
 		if (ob.tellp() == last_pos) {
 			LogNetcode("SoD::ENCODE(OP_ItemPacket) Serialization failed on item slot [{}]", int_struct->slot_id);
 			delete in;
@@ -1353,6 +1383,7 @@ namespace SoD
 		OUT(FastRegenHP);
 		OUT(FastRegenMana);
 		OUT(FastRegenEndurance);
+		OUT(underworld_teleport_index);
 
 		/*fill in some unknowns with observed values, hopefully it will help */
 		eq->unknown800 = -1;
@@ -1463,7 +1494,7 @@ namespace SoD
 		OUT(hairstyle);
 		OUT(beard);
 		//	OUT(unknown00178[10]);
-		for (r = EQEmu::textures::textureBegin; r < EQEmu::textures::materialCount; r++) {
+		for (r = EQ::textures::textureBegin; r < EQ::textures::materialCount; r++) {
 			eq->equipment.Slot[r].Material = emu->item_material.Slot[r].Material;
 			eq->equipment.Slot[r].Unknown1 = 0;
 			eq->equipment.Slot[r].EliteMaterial = 0;
@@ -1493,7 +1524,7 @@ namespace SoD
 		OUT(face);
 		//	OUT(unknown02264[47]);
 
-		if (spells::SPELLBOOK_SIZE <= EQEmu::spells::SPELLBOOK_SIZE) {
+		if (spells::SPELLBOOK_SIZE <= EQ::spells::SPELLBOOK_SIZE) {
 			for (uint32 r = 0; r < spells::SPELLBOOK_SIZE; r++) {
 				if (emu->spell_book[r] <= spells::SPELL_ID_MAX)
 					eq->spell_book[r] = emu->spell_book[r];
@@ -1502,14 +1533,14 @@ namespace SoD
 			}
 		}
 		else {
-			for (uint32 r = 0; r < EQEmu::spells::SPELLBOOK_SIZE; r++) {
+			for (uint32 r = 0; r < EQ::spells::SPELLBOOK_SIZE; r++) {
 				if (emu->spell_book[r] <= spells::SPELL_ID_MAX)
 					eq->spell_book[r] = emu->spell_book[r];
 				else
 					eq->spell_book[r] = 0xFFFFFFFFU;
 			}
 			// invalidate the rest of the spellbook slots
-			memset(&eq->spell_book[EQEmu::spells::SPELLBOOK_SIZE], 0xFF, (sizeof(uint32) * (spells::SPELLBOOK_SIZE - EQEmu::spells::SPELLBOOK_SIZE)));
+			memset(&eq->spell_book[EQ::spells::SPELLBOOK_SIZE], 0xFF, (sizeof(uint32) * (spells::SPELLBOOK_SIZE - EQ::spells::SPELLBOOK_SIZE)));
 		}
 
 		//	OUT(unknown4184[128]);
@@ -1553,7 +1584,7 @@ namespace SoD
 		//	OUT(unknown06160[4]);
 
 		// Copy bandoliers where server and client indices converge
-		for (r = 0; r < EQEmu::profile::BANDOLIERS_SIZE && r < profile::BANDOLIERS_SIZE; ++r) {
+		for (r = 0; r < EQ::profile::BANDOLIERS_SIZE && r < profile::BANDOLIERS_SIZE; ++r) {
 			OUT_str(bandoliers[r].Name);
 			for (uint32 k = 0; k < profile::BANDOLIER_ITEM_COUNT; ++k) { // Will need adjusting if 'server != client' is ever true
 				OUT(bandoliers[r].Items[k].ID);
@@ -1562,7 +1593,7 @@ namespace SoD
 			}
 		}
 		// Nullify bandoliers where server and client indices diverge, with a client bias
-		for (r = EQEmu::profile::BANDOLIERS_SIZE; r < profile::BANDOLIERS_SIZE; ++r) {
+		for (r = EQ::profile::BANDOLIERS_SIZE; r < profile::BANDOLIERS_SIZE; ++r) {
 			eq->bandoliers[r].Name[0] = '\0';
 			for (uint32 k = 0; k < profile::BANDOLIER_ITEM_COUNT; ++k) { // Will need adjusting if 'server != client' is ever true
 				eq->bandoliers[r].Items[k].ID = 0;
@@ -1574,13 +1605,13 @@ namespace SoD
 		//	OUT(unknown07444[5120]);
 
 		// Copy potion belt where server and client indices converge
-		for (r = 0; r < EQEmu::profile::POTION_BELT_SIZE && r < profile::POTION_BELT_SIZE; ++r) {
+		for (r = 0; r < EQ::profile::POTION_BELT_SIZE && r < profile::POTION_BELT_SIZE; ++r) {
 			OUT(potionbelt.Items[r].ID);
 			OUT(potionbelt.Items[r].Icon);
 			OUT_str(potionbelt.Items[r].Name);
 		}
 		// Nullify potion belt where server and client indices diverge, with a client bias
-		for (r = EQEmu::profile::POTION_BELT_SIZE; r < profile::POTION_BELT_SIZE; ++r) {
+		for (r = EQ::profile::POTION_BELT_SIZE; r < profile::POTION_BELT_SIZE; ++r) {
 			eq->potionbelt.Items[r].ID = 0;
 			eq->potionbelt.Items[r].Icon = 0;
 			eq->potionbelt.Items[r].Name[0] = '\0';
@@ -1923,7 +1954,7 @@ namespace SoD
 			eq_cse->HairColor = emu_cse->HairColor;
 			eq_cse->Face = emu_cse->Face;
 
-			for (int equip_index = EQEmu::textures::textureBegin; equip_index < EQEmu::textures::materialCount; equip_index++) {
+			for (int equip_index = EQ::textures::textureBegin; equip_index < EQ::textures::materialCount; equip_index++) {
 				eq_cse->Equip[equip_index].Material = emu_cse->Equip[equip_index].Material;
 				eq_cse->Equip[equip_index].Unknown1 = emu_cse->Equip[equip_index].Unknown1;
 				eq_cse->Equip[equip_index].EliteMaterial = emu_cse->Equip[equip_index].EliteModel;
@@ -2484,7 +2515,7 @@ namespace SoD
 			float SpawnSize = emu->size;
 			if (!((emu->NPC == 0) || (emu->race <= 12) || (emu->race == 128) || (emu->race == 130) || (emu->race == 330) || (emu->race == 522)))
 			{
-				PacketSize -= (sizeof(structs::Texture_Struct) * EQEmu::textures::materialCount);
+				PacketSize -= (sizeof(structs::Texture_Struct) * EQ::textures::materialCount);
 
 				if (emu->size == 0)
 				{
@@ -2681,7 +2712,7 @@ namespace SoD
 
 			if ((emu->NPC == 0) || (emu->race <= 12) || (emu->race == 128) || (emu->race == 130) || (emu->race == 330) || (emu->race == 522))
 			{
-				for (k = EQEmu::textures::textureBegin; k < EQEmu::textures::materialCount; ++k)
+				for (k = EQ::textures::textureBegin; k < EQ::textures::materialCount; ++k)
 				{
 					{
 						VARSTRUCT_ENCODE_TYPE(uint32, Buffer, emu->equipment_tint.Slot[k].Color);
@@ -2708,13 +2739,13 @@ namespace SoD
 			{
 				structs::Texture_Struct *Equipment = (structs::Texture_Struct *)Buffer;
 
-				for (k = EQEmu::textures::textureBegin; k < EQEmu::textures::materialCount; k++) {
+				for (k = EQ::textures::textureBegin; k < EQ::textures::materialCount; k++) {
 					Equipment[k].Material = emu->equipment.Slot[k].Material;
 					Equipment[k].Unknown1 = emu->equipment.Slot[k].Unknown1;
 					Equipment[k].EliteMaterial = emu->equipment.Slot[k].EliteModel;
 				}
 
-				Buffer += (sizeof(structs::Texture_Struct) * EQEmu::textures::materialCount);
+				Buffer += (sizeof(structs::Texture_Struct) * EQ::textures::materialCount);
 			}
 			if (strlen(emu->title))
 			{
@@ -2973,6 +3004,84 @@ namespace SoD
 		FINISH_DIRECT_DECODE();
 	}
 
+	DECODE(OP_DzAddPlayer)
+	{
+		DECODE_LENGTH_EXACT(structs::ExpeditionCommand_Struct);
+		SETUP_DIRECT_DECODE(ExpeditionCommand_Struct, structs::ExpeditionCommand_Struct);
+
+		strn0cpy(emu->name, eq->name, sizeof(emu->name));
+
+		FINISH_DIRECT_DECODE();
+	}
+
+	DECODE(OP_DzChooseZoneReply)
+	{
+		DECODE_LENGTH_EXACT(structs::DynamicZoneChooseZoneReply_Struct);
+		SETUP_DIRECT_DECODE(DynamicZoneChooseZoneReply_Struct, structs::DynamicZoneChooseZoneReply_Struct);
+
+		IN(unknown000);
+		IN(unknown004);
+		IN(unknown008);
+		IN(unknown_id1);
+		IN(dz_zone_id);
+		IN(dz_instance_id);
+		IN(dz_type);
+		IN(unknown_id2);
+		IN(unknown028);
+		IN(unknown032);
+		IN(unknown036);
+		IN(unknown040);
+		IN(unknown044);
+		IN(unknown048);
+
+		FINISH_DIRECT_DECODE();
+	}
+
+	DECODE(OP_DzExpeditionInviteResponse)
+	{
+		DECODE_LENGTH_EXACT(structs::ExpeditionInviteResponse_Struct);
+		SETUP_DIRECT_DECODE(ExpeditionInviteResponse_Struct, structs::ExpeditionInviteResponse_Struct);
+
+		IN(dz_zone_id);
+		IN(dz_instance_id);
+		IN(accepted);
+		IN(swapping);
+		strn0cpy(emu->swap_name, eq->swap_name, sizeof(emu->swap_name));
+
+		FINISH_DIRECT_DECODE();
+	}
+
+	DECODE(OP_DzMakeLeader)
+	{
+		DECODE_LENGTH_EXACT(structs::ExpeditionCommand_Struct);
+		SETUP_DIRECT_DECODE(ExpeditionCommand_Struct, structs::ExpeditionCommand_Struct);
+
+		strn0cpy(emu->name, eq->name, sizeof(emu->name));
+
+		FINISH_DIRECT_DECODE();
+	}
+
+	DECODE(OP_DzRemovePlayer)
+	{
+		DECODE_LENGTH_EXACT(structs::ExpeditionCommand_Struct);
+		SETUP_DIRECT_DECODE(ExpeditionCommand_Struct, structs::ExpeditionCommand_Struct);
+
+		strn0cpy(emu->name, eq->name, sizeof(emu->name));
+
+		FINISH_DIRECT_DECODE();
+	}
+
+	DECODE(OP_DzSwapPlayer)
+	{
+		DECODE_LENGTH_EXACT(structs::ExpeditionCommandSwap_Struct);
+		SETUP_DIRECT_DECODE(ExpeditionCommandSwap_Struct, structs::ExpeditionCommandSwap_Struct);
+
+		strn0cpy(emu->add_player_name, eq->add_player_name, sizeof(emu->add_player_name));
+		strn0cpy(emu->rem_player_name, eq->rem_player_name, sizeof(emu->rem_player_name));
+
+		FINISH_DIRECT_DECODE();
+	}
+
 	DECODE(OP_Emote)
 	{
 		unsigned char *__eq_buffer = __packet->pBuffer;
@@ -3146,7 +3255,7 @@ namespace SoD
 
 		for (int i = 0; i < spells::SPELL_GEM_COUNT; ++i)
 			emu->spell[i] = eq->spell[i];
-		for (int i = spells::SPELL_GEM_COUNT; i < EQEmu::spells::SPELL_GEM_COUNT; ++i)
+		for (int i = spells::SPELL_GEM_COUNT; i < EQ::spells::SPELL_GEM_COUNT; ++i)
 			emu->spell[i] = 0xFFFFFFFF;
 
 		FINISH_DIRECT_DECODE();
@@ -3440,9 +3549,9 @@ namespace SoD
 		return NextItemInstSerialNumber;
 	}
 
-	void SerializeItem(EQEmu::OutBuffer& ob, const EQEmu::ItemInstance *inst, int16 slot_id_in, uint8 depth)
+	void SerializeItem(EQ::OutBuffer& ob, const EQ::ItemInstance *inst, int16 slot_id_in, uint8 depth)
 	{
-		const EQEmu::ItemData *item = inst->GetUnscaledItem();
+		const EQ::ItemData *item = inst->GetUnscaledItem();
 		
 		SoD::structs::ItemSerializationHeader hdr;
 
@@ -3631,6 +3740,12 @@ namespace SoD
 		itbs.no_transfer = item->NoTransfer;
 		itbs.expendablearrow = item->ExpendableArrow;
 
+		// Done to hack older clients to label expendable fishing poles as such
+		// July 28th, 2018 patch
+		if (item->ItemType == EQ::item::ItemTypeFishingPole && item->SubType == 0) {
+			itbs.expendablearrow = 1;
+		}
+
 		ob.write((const char*)&itbs, sizeof(SoD::structs::ItemTertiaryBodyStruct));
 
 		// Effect Structures Broken down to allow variable length strings for effect names
@@ -3751,30 +3866,30 @@ namespace SoD
 		
 		ob.write((const char*)&iqbs, sizeof(SoD::structs::ItemQuaternaryBodyStruct));
 
-		EQEmu::OutBuffer::pos_type count_pos = ob.tellp();
+		EQ::OutBuffer::pos_type count_pos = ob.tellp();
 		uint32 subitem_count = 0;
 
 		ob.write((const char*)&subitem_count, sizeof(uint32));
 
 		// moved outside of loop since it is not modified within that scope
-		int16 SubSlotNumber = EQEmu::invbag::SLOT_INVALID;
+		int16 SubSlotNumber = EQ::invbag::SLOT_INVALID;
 
-		if (slot_id_in <= EQEmu::invslot::slotGeneral8 && slot_id_in >= EQEmu::invslot::GENERAL_BEGIN)
-			SubSlotNumber = EQEmu::invbag::GENERAL_BAGS_BEGIN + ((slot_id_in - EQEmu::invslot::GENERAL_BEGIN) * EQEmu::invbag::SLOT_COUNT);
-		else if (slot_id_in <= EQEmu::invslot::GENERAL_END && slot_id_in >= EQEmu::invslot::slotGeneral9)
-			SubSlotNumber = EQEmu::invbag::SLOT_INVALID;
-		else if (slot_id_in == EQEmu::invslot::slotCursor)
-			SubSlotNumber = EQEmu::invbag::CURSOR_BAG_BEGIN;
-		else if (slot_id_in <= EQEmu::invslot::BANK_END && slot_id_in >= EQEmu::invslot::BANK_BEGIN)
-			SubSlotNumber = EQEmu::invbag::BANK_BAGS_BEGIN + ((slot_id_in - EQEmu::invslot::BANK_BEGIN) * EQEmu::invbag::SLOT_COUNT);
-		else if (slot_id_in <= EQEmu::invslot::SHARED_BANK_END && slot_id_in >= EQEmu::invslot::SHARED_BANK_BEGIN)
-			SubSlotNumber = EQEmu::invbag::SHARED_BANK_BAGS_BEGIN + ((slot_id_in - EQEmu::invslot::SHARED_BANK_BEGIN) * EQEmu::invbag::SLOT_COUNT);
+		if (slot_id_in <= EQ::invslot::slotGeneral8 && slot_id_in >= EQ::invslot::GENERAL_BEGIN)
+			SubSlotNumber = EQ::invbag::GENERAL_BAGS_BEGIN + ((slot_id_in - EQ::invslot::GENERAL_BEGIN) * EQ::invbag::SLOT_COUNT);
+		else if (slot_id_in <= EQ::invslot::GENERAL_END && slot_id_in >= EQ::invslot::slotGeneral9)
+			SubSlotNumber = EQ::invbag::SLOT_INVALID;
+		else if (slot_id_in == EQ::invslot::slotCursor)
+			SubSlotNumber = EQ::invbag::CURSOR_BAG_BEGIN;
+		else if (slot_id_in <= EQ::invslot::BANK_END && slot_id_in >= EQ::invslot::BANK_BEGIN)
+			SubSlotNumber = EQ::invbag::BANK_BAGS_BEGIN + ((slot_id_in - EQ::invslot::BANK_BEGIN) * EQ::invbag::SLOT_COUNT);
+		else if (slot_id_in <= EQ::invslot::SHARED_BANK_END && slot_id_in >= EQ::invslot::SHARED_BANK_BEGIN)
+			SubSlotNumber = EQ::invbag::SHARED_BANK_BAGS_BEGIN + ((slot_id_in - EQ::invslot::SHARED_BANK_BEGIN) * EQ::invbag::SLOT_COUNT);
 		else
 			SubSlotNumber = slot_id_in; // not sure if this is the best way to handle this..leaving for now
 
-		if (SubSlotNumber != EQEmu::invbag::SLOT_INVALID) {
-			for (uint32 index = EQEmu::invbag::SLOT_BEGIN; index <= EQEmu::invbag::SLOT_END; ++index) {
-				EQEmu::ItemInstance* sub = inst->GetItem(index);
+		if (SubSlotNumber != EQ::invbag::SLOT_INVALID) {
+			for (uint32 index = EQ::invbag::SLOT_BEGIN; index <= EQ::invbag::SLOT_END; ++index) {
+				EQ::ItemInstance* sub = inst->GetItem(index);
 				if (!sub)
 					continue;
 
@@ -3793,59 +3908,59 @@ namespace SoD
 	{
 		uint32 SoDSlot = invslot::SLOT_INVALID;
 
-		if (serverSlot <= EQEmu::invslot::slotGeneral8) {
+		if (serverSlot <= EQ::invslot::slotGeneral8) {
 			SoDSlot = serverSlot;
 		}
 
-		else if (serverSlot <= EQEmu::invslot::CORPSE_END && serverSlot >= EQEmu::invslot::slotCursor) {
+		else if (serverSlot <= EQ::invslot::CORPSE_END && serverSlot >= EQ::invslot::slotCursor) {
 			SoDSlot = serverSlot - 2;
 		}
 
-		else if (serverSlot <= EQEmu::invbag::GENERAL_BAGS_8_END && serverSlot >= EQEmu::invbag::GENERAL_BAGS_BEGIN) {
+		else if (serverSlot <= EQ::invbag::GENERAL_BAGS_8_END && serverSlot >= EQ::invbag::GENERAL_BAGS_BEGIN) {
 			SoDSlot = serverSlot + 11;
 		}
 
-		else if (serverSlot <= EQEmu::invbag::CURSOR_BAG_END && serverSlot >= EQEmu::invbag::CURSOR_BAG_BEGIN) {
+		else if (serverSlot <= EQ::invbag::CURSOR_BAG_END && serverSlot >= EQ::invbag::CURSOR_BAG_BEGIN) {
 			SoDSlot = serverSlot - 9;
 		}
 
-		else if (serverSlot <= EQEmu::invslot::TRIBUTE_END && serverSlot >= EQEmu::invslot::TRIBUTE_BEGIN) {
+		else if (serverSlot <= EQ::invslot::TRIBUTE_END && serverSlot >= EQ::invslot::TRIBUTE_BEGIN) {
 			SoDSlot = serverSlot;
 		}
 
-		else if (serverSlot <= EQEmu::invslot::GUILD_TRIBUTE_END && serverSlot >= EQEmu::invslot::GUILD_TRIBUTE_BEGIN) {
+		else if (serverSlot <= EQ::invslot::GUILD_TRIBUTE_END && serverSlot >= EQ::invslot::GUILD_TRIBUTE_BEGIN) {
 			SoDSlot = serverSlot;
 		}
 
-		else if (serverSlot == EQEmu::invslot::SLOT_TRADESKILL_EXPERIMENT_COMBINE) {
+		else if (serverSlot == EQ::invslot::SLOT_TRADESKILL_EXPERIMENT_COMBINE) {
 			SoDSlot = serverSlot;
 		}
 
-		else if (serverSlot <= EQEmu::invslot::BANK_END && serverSlot >= EQEmu::invslot::BANK_BEGIN) {
+		else if (serverSlot <= EQ::invslot::BANK_END && serverSlot >= EQ::invslot::BANK_BEGIN) {
 			SoDSlot = serverSlot;
 		}
 
-		else if (serverSlot <= EQEmu::invbag::BANK_BAGS_END && serverSlot >= EQEmu::invbag::BANK_BAGS_BEGIN) {
+		else if (serverSlot <= EQ::invbag::BANK_BAGS_END && serverSlot >= EQ::invbag::BANK_BAGS_BEGIN) {
 			SoDSlot = serverSlot + 1;
 		}
 
-		else if (serverSlot <= EQEmu::invslot::SHARED_BANK_END && serverSlot >= EQEmu::invslot::SHARED_BANK_BEGIN) {
+		else if (serverSlot <= EQ::invslot::SHARED_BANK_END && serverSlot >= EQ::invslot::SHARED_BANK_BEGIN) {
 			SoDSlot = serverSlot;
 		}
 
-		else if (serverSlot <= EQEmu::invbag::SHARED_BANK_BAGS_END && serverSlot >= EQEmu::invbag::SHARED_BANK_BAGS_BEGIN) {
+		else if (serverSlot <= EQ::invbag::SHARED_BANK_BAGS_END && serverSlot >= EQ::invbag::SHARED_BANK_BAGS_BEGIN) {
 			SoDSlot = serverSlot + 1;
 		}
 
-		else if (serverSlot <= EQEmu::invslot::TRADE_END && serverSlot >= EQEmu::invslot::TRADE_BEGIN) {
+		else if (serverSlot <= EQ::invslot::TRADE_END && serverSlot >= EQ::invslot::TRADE_BEGIN) {
 			SoDSlot = serverSlot;
 		}
 
-		else if (serverSlot <= EQEmu::invbag::TRADE_BAGS_END && serverSlot >= EQEmu::invbag::TRADE_BAGS_BEGIN) {
+		else if (serverSlot <= EQ::invbag::TRADE_BAGS_END && serverSlot >= EQ::invbag::TRADE_BAGS_BEGIN) {
 			SoDSlot = serverSlot;
 		}
 
-		else if (serverSlot <= EQEmu::invslot::WORLD_END && serverSlot >= EQEmu::invslot::WORLD_BEGIN) {
+		else if (serverSlot <= EQ::invslot::WORLD_END && serverSlot >= EQ::invslot::WORLD_BEGIN) {
 			SoDSlot = serverSlot;
 		}
 
@@ -3858,11 +3973,11 @@ namespace SoD
 	{
 		uint32 SoDSlot = invslot::SLOT_INVALID;
 
-		if (server_corpse_slot <= EQEmu::invslot::slotGeneral8 && server_corpse_slot >= EQEmu::invslot::slotGeneral1) {
+		if (server_corpse_slot <= EQ::invslot::slotGeneral8 && server_corpse_slot >= EQ::invslot::slotGeneral1) {
 			SoDSlot = server_corpse_slot;
 		}
 
-		else if (server_corpse_slot <= EQEmu::invslot::CORPSE_END && server_corpse_slot >= EQEmu::invslot::slotCursor) {
+		else if (server_corpse_slot <= EQ::invslot::CORPSE_END && server_corpse_slot >= EQ::invslot::slotCursor) {
 			SoDSlot = server_corpse_slot - 2;
 		}
 
@@ -3873,7 +3988,7 @@ namespace SoD
 
 	static inline uint32 SoDToServerSlot(uint32 sod_slot)
 	{
-		uint32 server_slot = EQEmu::invslot::SLOT_INVALID;
+		uint32 server_slot = EQ::invslot::SLOT_INVALID;
 
 		if (sod_slot <= invslot::slotGeneral8) {
 			server_slot = sod_slot;
@@ -3938,7 +4053,7 @@ namespace SoD
 
 	static inline uint32 SoDToServerCorpseSlot(uint32 sod_corpse_slot)
 	{
-		uint32 server_slot = EQEmu::invslot::SLOT_INVALID;
+		uint32 server_slot = EQ::invslot::SLOT_INVALID;
 
 		if (sod_corpse_slot <= invslot::slotGeneral8 && sod_corpse_slot >= invslot::slotGeneral1) {
 			server_slot = sod_corpse_slot;
@@ -3955,7 +4070,7 @@ namespace SoD
 
 	static inline void ServerToSoDSayLink(std::string &sod_saylink, const std::string &server_saylink)
 	{
-		if ((constants::SAY_LINK_BODY_SIZE == EQEmu::constants::SAY_LINK_BODY_SIZE) || (server_saylink.find('\x12') == std::string::npos)) {
+		if ((constants::SAY_LINK_BODY_SIZE == EQ::constants::SAY_LINK_BODY_SIZE) || (server_saylink.find('\x12') == std::string::npos)) {
 			sod_saylink = server_saylink;
 			return;
 		}
@@ -3964,7 +4079,7 @@ namespace SoD
 
 		for (size_t segment_iter = 0; segment_iter < segments.size(); ++segment_iter) {
 			if (segment_iter & 1) {
-				if (segments[segment_iter].length() <= EQEmu::constants::SAY_LINK_BODY_SIZE) {
+				if (segments[segment_iter].length() <= EQ::constants::SAY_LINK_BODY_SIZE) {
 					sod_saylink.append(segments[segment_iter]);
 					// TODO: log size mismatch error
 					continue;
@@ -3995,7 +4110,7 @@ namespace SoD
 
 	static inline void SoDToServerSayLink(std::string &server_saylink, const std::string &sod_saylink)
 	{
-		if ((EQEmu::constants::SAY_LINK_BODY_SIZE == constants::SAY_LINK_BODY_SIZE) || (sod_saylink.find('\x12') == std::string::npos)) {
+		if ((EQ::constants::SAY_LINK_BODY_SIZE == constants::SAY_LINK_BODY_SIZE) || (sod_saylink.find('\x12') == std::string::npos)) {
 			server_saylink = sod_saylink;
 			return;
 		}
@@ -4029,84 +4144,84 @@ namespace SoD
 		}
 	}
 
-	static inline spells::CastingSlot ServerToSoDCastingSlot(EQEmu::spells::CastingSlot slot)
+	static inline spells::CastingSlot ServerToSoDCastingSlot(EQ::spells::CastingSlot slot)
 	{
 		switch (slot) {
-		case EQEmu::spells::CastingSlot::Gem1:
+		case EQ::spells::CastingSlot::Gem1:
 			return spells::CastingSlot::Gem1;
-		case EQEmu::spells::CastingSlot::Gem2:
+		case EQ::spells::CastingSlot::Gem2:
 			return spells::CastingSlot::Gem2;
-		case EQEmu::spells::CastingSlot::Gem3:
+		case EQ::spells::CastingSlot::Gem3:
 			return spells::CastingSlot::Gem3;
-		case EQEmu::spells::CastingSlot::Gem4:
+		case EQ::spells::CastingSlot::Gem4:
 			return spells::CastingSlot::Gem4;
-		case EQEmu::spells::CastingSlot::Gem5:
+		case EQ::spells::CastingSlot::Gem5:
 			return spells::CastingSlot::Gem5;
-		case EQEmu::spells::CastingSlot::Gem6:
+		case EQ::spells::CastingSlot::Gem6:
 			return spells::CastingSlot::Gem6;
-		case EQEmu::spells::CastingSlot::Gem7:
+		case EQ::spells::CastingSlot::Gem7:
 			return spells::CastingSlot::Gem7;
-		case EQEmu::spells::CastingSlot::Gem8:
+		case EQ::spells::CastingSlot::Gem8:
 			return spells::CastingSlot::Gem8;
-		case EQEmu::spells::CastingSlot::Gem9:
+		case EQ::spells::CastingSlot::Gem9:
 			return spells::CastingSlot::Gem9;
-		case EQEmu::spells::CastingSlot::Gem10:
+		case EQ::spells::CastingSlot::Gem10:
 			return spells::CastingSlot::Gem10;
-		case EQEmu::spells::CastingSlot::Item:
-		case EQEmu::spells::CastingSlot::PotionBelt:
+		case EQ::spells::CastingSlot::Item:
+		case EQ::spells::CastingSlot::PotionBelt:
 			return spells::CastingSlot::Item;
-		case EQEmu::spells::CastingSlot::Discipline:
+		case EQ::spells::CastingSlot::Discipline:
 			return spells::CastingSlot::Discipline;
-		case EQEmu::spells::CastingSlot::AltAbility:
+		case EQ::spells::CastingSlot::AltAbility:
 			return spells::CastingSlot::AltAbility;
 		default: // we shouldn't have any issues with other slots ... just return something
 			return spells::CastingSlot::Discipline;
 		}
 	}
 
-	static inline EQEmu::spells::CastingSlot SoDToServerCastingSlot(spells::CastingSlot slot)
+	static inline EQ::spells::CastingSlot SoDToServerCastingSlot(spells::CastingSlot slot)
 	{
 		switch (slot) {
 		case spells::CastingSlot::Gem1:
-			return EQEmu::spells::CastingSlot::Gem1;
+			return EQ::spells::CastingSlot::Gem1;
 		case spells::CastingSlot::Gem2:
-			return EQEmu::spells::CastingSlot::Gem2;
+			return EQ::spells::CastingSlot::Gem2;
 		case spells::CastingSlot::Gem3:
-			return EQEmu::spells::CastingSlot::Gem3;
+			return EQ::spells::CastingSlot::Gem3;
 		case spells::CastingSlot::Gem4:
-			return EQEmu::spells::CastingSlot::Gem4;
+			return EQ::spells::CastingSlot::Gem4;
 		case spells::CastingSlot::Gem5:
-			return EQEmu::spells::CastingSlot::Gem5;
+			return EQ::spells::CastingSlot::Gem5;
 		case spells::CastingSlot::Gem6:
-			return EQEmu::spells::CastingSlot::Gem6;
+			return EQ::spells::CastingSlot::Gem6;
 		case spells::CastingSlot::Gem7:
-			return EQEmu::spells::CastingSlot::Gem7;
+			return EQ::spells::CastingSlot::Gem7;
 		case spells::CastingSlot::Gem8:
-			return EQEmu::spells::CastingSlot::Gem8;
+			return EQ::spells::CastingSlot::Gem8;
 		case spells::CastingSlot::Gem9:
-			return EQEmu::spells::CastingSlot::Gem9;
+			return EQ::spells::CastingSlot::Gem9;
 		case spells::CastingSlot::Gem10:
-			return EQEmu::spells::CastingSlot::Gem10;
+			return EQ::spells::CastingSlot::Gem10;
 		case spells::CastingSlot::Discipline:
-			return EQEmu::spells::CastingSlot::Discipline;
+			return EQ::spells::CastingSlot::Discipline;
 		case spells::CastingSlot::Item:
-			return EQEmu::spells::CastingSlot::Item;
+			return EQ::spells::CastingSlot::Item;
 		case spells::CastingSlot::AltAbility:
-			return EQEmu::spells::CastingSlot::AltAbility;
+			return EQ::spells::CastingSlot::AltAbility;
 		default: // we shouldn't have any issues with other slots ... just return something
-			return EQEmu::spells::CastingSlot::Discipline;
+			return EQ::spells::CastingSlot::Discipline;
 		}
 	}
 
 	static inline int ServerToSoDBuffSlot(int index)
 	{
 		// we're a disc
-		if (index >= EQEmu::spells::LONG_BUFFS + EQEmu::spells::SHORT_BUFFS)
-			return index - EQEmu::spells::LONG_BUFFS - EQEmu::spells::SHORT_BUFFS +
+		if (index >= EQ::spells::LONG_BUFFS + EQ::spells::SHORT_BUFFS)
+			return index - EQ::spells::LONG_BUFFS - EQ::spells::SHORT_BUFFS +
 			       spells::LONG_BUFFS + spells::SHORT_BUFFS;
 		// we're a song
-		if (index >= EQEmu::spells::LONG_BUFFS)
-			return index - EQEmu::spells::LONG_BUFFS + spells::LONG_BUFFS;
+		if (index >= EQ::spells::LONG_BUFFS)
+			return index - EQ::spells::LONG_BUFFS + spells::LONG_BUFFS;
 		// we're a normal buff
 		return index; // as long as we guard against bad slots server side, we should be fine
 	}
@@ -4115,11 +4230,11 @@ namespace SoD
 	{
 		// we're a disc
 		if (index >= spells::LONG_BUFFS + spells::SHORT_BUFFS)
-			return index - spells::LONG_BUFFS - spells::SHORT_BUFFS + EQEmu::spells::LONG_BUFFS +
-			       EQEmu::spells::SHORT_BUFFS;
+			return index - spells::LONG_BUFFS - spells::SHORT_BUFFS + EQ::spells::LONG_BUFFS +
+			       EQ::spells::SHORT_BUFFS;
 		// we're a song
 		if (index >= spells::LONG_BUFFS)
-			return index - spells::LONG_BUFFS + EQEmu::spells::LONG_BUFFS;
+			return index - spells::LONG_BUFFS + EQ::spells::LONG_BUFFS;
 		// we're a normal buff
 		return index; // as long as we guard against bad slots server side, we should be fine
 	}

common/patches/sod.h

@@ -43,7 +43,7 @@ namespace SoD
 	protected:
 
 		virtual std::string Describe() const;
-		virtual const EQEmu::versions::ClientVersion ClientVersion() const;
+		virtual const EQ::versions::ClientVersion ClientVersion() const;
 
 		//magic macro to declare our opcode processors
 		#include "ss_declare.h"

common/patches/sod_limits.h

@@ -31,7 +31,7 @@ namespace SoD
 	const int16 INULL = 0;
 
 	namespace inventory {
-		inline EQEmu::versions::ClientVersion GetInventoryRef() { return EQEmu::versions::ClientVersion::SoD; }
+		inline EQ::versions::ClientVersion GetInventoryRef() { return EQ::versions::ClientVersion::SoD; }
 
 		const bool ConcatenateInvTypeLimbo = true;
 
@@ -43,7 +43,7 @@ namespace SoD
 	} /*inventory*/
 
 	namespace invtype {
-		inline EQEmu::versions::ClientVersion GetInvTypeRef() { return EQEmu::versions::ClientVersion::SoD; }
+		inline EQ::versions::ClientVersion GetInvTypeRef() { return EQ::versions::ClientVersion::SoD; }
 
 		namespace enum_ {
 			enum InventoryTypes : int16 {
@@ -106,7 +106,7 @@ namespace SoD
 	} /*invtype*/
 
 	namespace invslot {
-		inline EQEmu::versions::ClientVersion GetInvSlotRef() { return EQEmu::versions::ClientVersion::SoD; }
+		inline EQ::versions::ClientVersion GetInvSlotRef() { return EQ::versions::ClientVersion::SoD; }
 
 		namespace enum_ {
 			enum InventorySlots : int16 {
@@ -205,7 +205,7 @@ namespace SoD
 	} /*invslot*/
 
 	namespace invbag {
-		inline EQEmu::versions::ClientVersion GetInvBagRef() { return EQEmu::versions::ClientVersion::SoD; }
+		inline EQ::versions::ClientVersion GetInvBagRef() { return EQ::versions::ClientVersion::SoD; }
 
 		const int16 SLOT_INVALID = IINVALID;
 		const int16 SLOT_BEGIN = INULL;
@@ -237,7 +237,7 @@ namespace SoD
 	} /*invbag*/
 
 	namespace invaug {
-		inline EQEmu::versions::ClientVersion GetInvAugRef() { return EQEmu::versions::ClientVersion::SoD; }
+		inline EQ::versions::ClientVersion GetInvAugRef() { return EQ::versions::ClientVersion::SoD; }
 
 		const int16 SOCKET_INVALID = IINVALID;
 		const int16 SOCKET_BEGIN = INULL;
@@ -249,7 +249,7 @@ namespace SoD
 	} /*invaug*/
 
 	namespace item {
-		inline EQEmu::versions::ClientVersion GetItemRef() { return EQEmu::versions::ClientVersion::SoD; }
+		inline EQ::versions::ClientVersion GetItemRef() { return EQ::versions::ClientVersion::SoD; }
 
 		enum ItemPacketType : int {
 			ItemPacketMerchant = 100,
@@ -267,7 +267,7 @@ namespace SoD
 	} /*item*/
 
 	namespace profile {
-		inline EQEmu::versions::ClientVersion GetProfileRef() { return EQEmu::versions::ClientVersion::SoD; }
+		inline EQ::versions::ClientVersion GetProfileRef() { return EQ::versions::ClientVersion::SoD; }
 
 		const int16 BANDOLIERS_SIZE = 20;		// number of bandolier instances
 		const int16 BANDOLIER_ITEM_COUNT = 4;	// number of equipment slots in bandolier instance
@@ -279,11 +279,11 @@ namespace SoD
 	} /*profile*/
 
 	namespace constants {
-		inline EQEmu::versions::ClientVersion GetConstantsRef() { return EQEmu::versions::ClientVersion::SoD; }
+		inline EQ::versions::ClientVersion GetConstantsRef() { return EQ::versions::ClientVersion::SoD; }
 
-		const EQEmu::expansions::Expansion EXPANSION = EQEmu::expansions::Expansion::SoD;
-		const uint32 EXPANSION_BIT = EQEmu::expansions::bitSoD;
-		const uint32 EXPANSIONS_MASK = EQEmu::expansions::maskSoD;
+		const EQ::expansions::Expansion EXPANSION = EQ::expansions::Expansion::SoD;
+		const uint32 EXPANSION_BIT = EQ::expansions::bitSoD;
+		const uint32 EXPANSIONS_MASK = EQ::expansions::maskSoD;
 
 		const size_t CHARACTER_CREATION_LIMIT = 12;
 
@@ -292,21 +292,21 @@ namespace SoD
 	} /*constants*/
 
 	namespace behavior {
-		inline EQEmu::versions::ClientVersion GetBehaviorRef() { return EQEmu::versions::ClientVersion::SoD; }
+		inline EQ::versions::ClientVersion GetBehaviorRef() { return EQ::versions::ClientVersion::SoD; }
 
 		const bool CoinHasWeight = false;
 
 	} /*behavior*/
 
 	namespace skills {
-		inline EQEmu::versions::ClientVersion GetSkillsRef() { return EQEmu::versions::ClientVersion::SoD; }
+		inline EQ::versions::ClientVersion GetSkillsRef() { return EQ::versions::ClientVersion::SoD; }
 
-		const size_t LastUsableSkill = EQEmu::skills::SkillTripleAttack;
+		const size_t LastUsableSkill = EQ::skills::SkillTripleAttack;
 
 	} /*skills*/
 
 	namespace spells {
-		inline EQEmu::versions::ClientVersion GetSkillsRef() { return EQEmu::versions::ClientVersion::SoD; }
+		inline EQ::versions::ClientVersion GetSkillsRef() { return EQ::versions::ClientVersion::SoD; }
 		
 		enum class CastingSlot : uint32 {
 			Gem1 = 0,

common/patches/sod_ops.h

@@ -35,13 +35,16 @@ E(OP_Consider)
 E(OP_Damage)
 E(OP_DeleteCharge)
 E(OP_DeleteItem)
+E(OP_DzChooseZone)
 E(OP_DzCompass)
 E(OP_DzExpeditionEndsWarning)
 E(OP_DzExpeditionInfo)
-E(OP_DzExpeditionList)
-E(OP_DzJoinExpeditionConfirm)
-E(OP_DzLeaderStatus)
+E(OP_DzExpeditionInvite)
+E(OP_DzExpeditionLockoutTimers)
 E(OP_DzMemberList)
+E(OP_DzMemberListName)
+E(OP_DzMemberListStatus)
+E(OP_DzSetLeaderName)
 E(OP_Emote)
 E(OP_ExpansionInfo)
 E(OP_FormattedMessage)
@@ -111,6 +114,12 @@ D(OP_Consider)
 D(OP_ConsiderCorpse)
 D(OP_Consume)
 D(OP_DeleteItem)
+D(OP_DzAddPlayer)
+D(OP_DzChooseZoneReply)
+D(OP_DzExpeditionInviteResponse)
+D(OP_DzMakeLeader)
+D(OP_DzRemovePlayer)
+D(OP_DzSwapPlayer)
 D(OP_Emote)
 D(OP_FaceChange)
 D(OP_FindPersonRequest)

common/patches/sod_structs.h

@@ -149,7 +149,7 @@ struct TintProfile
 			Tint_Struct Primary;
 			Tint_Struct Secondary;
 		};
-		Tint_Struct Slot[EQEmu::textures::materialCount];
+		Tint_Struct Slot[EQ::textures::materialCount];
 	};
 };
 
@@ -178,7 +178,7 @@ struct TextureProfile
 			Texture_Struct Primary;
 			Texture_Struct Secondary;
 		};
-		Texture_Struct Slot[EQEmu::textures::materialCount];
+		Texture_Struct Slot[EQ::textures::materialCount];
 	};
 
 	TextureProfile();
@@ -195,7 +195,7 @@ struct CharacterSelectEntry_Struct
 /*0000*/	uint8 Beard;				//
 /*0001*/	uint8 HairColor;			//
 /*0000*/	uint8 Face;					//
-/*0000*/	CharSelectEquip	Equip[EQEmu::textures::materialCount];
+/*0000*/	CharSelectEquip	Equip[EQ::textures::materialCount];
 /*0000*/	uint32 PrimaryIDFile;		//
 /*0000*/	uint32 SecondaryIDFile;		//
 /*0000*/	uint8 Unknown15;			// 0xff
@@ -444,7 +444,11 @@ struct NewZone_Struct {
 /*0848*/	int32	unknown848;
 /*0852*/	uint16	zone_id;
 /*0854*/	uint16	zone_instance;
-/*0856*/	char	unknown856[20];
+/*0856*/	uint32	scriptNPCReceivedanItem;
+/*0860*/	uint32	bCheck;					// padded bool
+/*0864*/	uint32	scriptIDSomething;
+/*0868*/	uint32	underworld_teleport_index; // > 0 teleports w/ zone point index, invalid succors, -1 affects some collisions
+/*0872*/	uint32	scriptIDSomething3;
 /*0876*/	uint32	SuspendBuffs;
 /*0880*/	uint32	unknown880;	//seen 50
 /*0884*/	uint32	unknown884;	//seen 10
@@ -4165,52 +4169,160 @@ struct VeteranReward
 /*012*/	VeteranRewardItem items[8];
 };
 
-struct ExpeditionEntryHeader_Struct
+
+struct ExpeditionInvite_Struct
+{
+/*000*/ uint32 client_id;            // unique character id
+/*004*/ uint32 unknown004;
+/*008*/ char   inviter_name[64];
+/*072*/ char   expedition_name[128];
+/*200*/ uint8  swapping;             // 0: adding 1: swapping
+/*201*/ char   swap_name[64];        // if swapping, swap name being removed
+/*265*/ uint8  padding[3];
+/*268*/ uint16 dz_zone_id;           // dz_id zone/instance pair, sent back in reply
+/*270*/ uint16 dz_instance_id;
+};
+
+struct ExpeditionInviteResponse_Struct
 {
 /*000*/ uint32 unknown000;
-/*000*/ uint32 number_of_entries;
-};
-
-struct ExpeditionJoinPrompt_Struct
-{
-/*000*/ uint32 clientid;
 /*004*/ uint32 unknown004;
-/*008*/ char player_name[64];
-/*072*/ char expedition_name[64];
-};
-
-struct ExpeditionExpireWarning
-{
-/*000*/ uint32 clientid;
-/*004*/ uint32 unknown004;
-/*008*/ uint32 minutes_remaining;
+/*008*/ uint16 dz_zone_id;     // dz_id pair sent in invite
+/*010*/ uint16 dz_instance_id;
+/*012*/ uint8  accepted;       // 0: declined 1: accepted
+/*013*/ uint8  swapping;       // 0: adding 1: swapping (sent in invite)
+/*014*/ char   swap_name[64];  // swap name sent in invite
+/*078*/ uint8  unknown078;     // padding garbage?
+/*079*/ uint8  unknown079;     // padding garbage?
 };
 
 struct ExpeditionInfo_Struct
 {
-/*000*/ uint32 clientid;
+/*000*/ uint32 client_id;
 /*004*/ uint32 unknown004;
-/*008*/ uint32 unknown008;
+/*008*/ uint32 assigned; // padded bool
 /*012*/ uint32 max_players;
-/*016*/ char expedition_name[128];
-/*142*/ char leader_name[64];
+/*016*/ char   expedition_name[128];
+/*144*/ char   leader_name[64];
 };
 
-struct ExpeditionCompassEntry_Struct
+struct ExpeditionMemberEntry_Struct
 {
-/*000*/ float unknown000; //seen *((uint32*)) = 1584791871
-/*004*/ uint32 enabled; //guess
-/*008*/ uint32 unknown008; //seen 1019
+/*000*/ char name[1];            // variable length, null terminated, max 0x40 (64)
+/*000*/ uint8 expedition_status; // 0: unknown 1: Online, 2: Offline, 3: In Dynamic Zone, 4: Link Dead
+};
+
+struct ExpeditionMemberList_Struct
+{
+/*000*/ uint32 client_id;
+/*004*/ uint32 member_count; // number of players in window
+/*008*/ ExpeditionMemberEntry_Struct members[0]; // variable length
+};
+
+struct ExpeditionMemberListName_Struct
+{
+/*000*/ uint32 client_id;
+/*004*/ uint32 unknown004;
+/*008*/ uint32 add_name;   // padded bool, 0: remove name, 1: add name with unknown status
+/*012*/ char   name[64];
+};
+
+struct ExpeditionLockoutTimerEntry_Struct
+{
+/*000*/ char   expedition_name[1]; // variable length, null terminated, max 0x80 (128)
+/*000*/ uint32 seconds_remaining;
+/*000*/ int32  event_type;         // seen -1 (0xffffffff) for replay timers and 1 for event timers
+/*000*/ char   event_name[1];      // variable length, null terminated, max 0x100 (256)
+};
+
+struct ExpeditionLockoutTimers_Struct
+{
+/*000*/ uint32 client_id;
+/*004*/ uint32 count;
+/*008*/ ExpeditionLockoutTimerEntry_Struct timers[0];
+};
+
+struct ExpeditionSetLeaderName_Struct
+{
+/*000*/ uint32 client_id;
+/*004*/ uint32 unknown004;
+/*008*/ char   leader_name[64];
+};
+
+struct ExpeditionCommand_Struct
+{
+/*000*/ uint32 unknown000;
+/*004*/ uint32 unknown004;
+/*008*/ char   name[64];
+};
+
+struct ExpeditionCommandSwap_Struct
+{
+/*000*/ uint32 unknown000;
+/*004*/ uint32 unknown004;
+/*008*/ char   add_player_name[64]; // swap to (player must confirm)
+/*072*/ char   rem_player_name[64]; // swap from
+};
+
+struct ExpeditionExpireWarning
+{
+/*000*/ uint32 client_id;
+/*004*/ uint32 unknown004;
+/*008*/ uint32 minutes_remaining;
+};
+
+struct DynamicZoneCompassEntry_Struct
+{
+/*000*/ uint16 dz_zone_id;      // target dz id pair
+/*002*/ uint16 dz_instance_id;
+/*004*/ uint32 dz_type;         // 1: Expedition, 2: Tutorial (purple), 3: Task, 4: Mission, 5: Quest (green)
+/*008*/ uint32 unknown008;
 /*012*/ float y;
 /*016*/ float x;
 /*020*/ float z;
 };
 
-struct ExpeditionCompass_Struct
+struct DynamicZoneCompass_Struct
 {
-/*000*/ uint32 clientid;
+/*000*/ uint32 client_id;
 /*004*/ uint32 count;
-/*008*/ ExpeditionCompassEntry_Struct entries[0];
+/*008*/ DynamicZoneCompassEntry_Struct entries[0];
+};
+
+struct DynamicZoneChooseZoneEntry_Struct
+{
+/*000*/ uint16 dz_zone_id;     // dz_id pair
+/*002*/ uint16 dz_instance_id;
+/*004*/ uint32 unknown_id1;    // sent back in reply
+/*008*/ uint32 dz_type;        // 1: Expedition, 2: Tutorial, 3: Task, 4: Mission, 5: Quest -- sent back in reply
+/*012*/ uint32 unknown_id2;    // possibly an id based on dz type, for expeditions this was same as dz_id (zone|instance) but task dz was different
+/*016*/ char   description[1]; // variable length, null terminated, max 0x80 (128)
+/*000*/ char   leader_name[1]; // variable length, null terminated, max 0x40 (64)
+};
+
+struct DynamicZoneChooseZone_Struct
+{
+/*000*/ uint32 client_id;
+/*004*/ uint32 count;
+/*008*/ DynamicZoneChooseZoneEntry_Struct choices[0];
+};
+
+struct DynamicZoneChooseZoneReply_Struct
+{
+/*000*/ uint32 unknown000;     // ff ff ff ff
+/*004*/ uint32 unknown004;     // seen 69 00 00 00
+/*008*/ uint32 unknown008;     // ff ff ff ff
+/*012*/ uint32 unknown_id1;    // from choose zone entry message
+/*016*/ uint16 dz_zone_id;     // dz_id pair
+/*018*/ uint16 dz_instance_id;
+/*020*/ uint32 dz_type;        // 1: Expedition, 2: Tutorial, 3: Task, 4: Mission, 5: Quest
+/*024*/ uint32 unknown_id2;    // from choose zone entry message
+/*028*/ uint32 unknown028;     // 00 00 00 00
+/*032*/ uint32 unknown032;     // always same as unknown044
+/*036*/ uint32 unknown036;
+/*040*/ uint32 unknown040;
+/*044*/ uint32 unknown044;     // always same as unknown032
+/*048*/ uint32 unknown048;     // seen 01 00 00 00 and 02 00 00 00
 };
 
 struct AltCurrencySelectItem_Struct {

common/patches/sof.cpp

@@ -43,7 +43,7 @@ namespace SoF
 	static OpcodeManager *opcodes = nullptr;
 	static Strategy struct_strategy;
 
-	void SerializeItem(EQEmu::OutBuffer& ob, const EQEmu::ItemInstance *inst, int16 slot_id, uint8 depth);
+	void SerializeItem(EQ::OutBuffer& ob, const EQ::ItemInstance *inst, int16 slot_id, uint8 depth);
 
 	// server to client inventory location converters
 	static inline uint32 ServerToSoFSlot(uint32 server_slot);
@@ -59,8 +59,8 @@ namespace SoF
 	// client to server say link converter
 	static inline void SoFToServerSayLink(std::string &server_saylink, const std::string &sof_saylink);
 
-	static inline spells::CastingSlot ServerToSoFCastingSlot(EQEmu::spells::CastingSlot slot);
-	static inline EQEmu::spells::CastingSlot SoFToServerCastingSlot(spells::CastingSlot slot, uint32 item_location);
+	static inline spells::CastingSlot ServerToSoFCastingSlot(EQ::spells::CastingSlot slot);
+	static inline EQ::spells::CastingSlot SoFToServerCastingSlot(spells::CastingSlot slot, uint32 item_location);
 
 	static inline int ServerToSoFBuffSlot(int index);
 	static inline int SoFToServerBuffSlot(int index);
@@ -142,9 +142,9 @@ namespace SoF
 		return(r);
 	}
 
-	const EQEmu::versions::ClientVersion Strategy::ClientVersion() const
+	const EQ::versions::ClientVersion Strategy::ClientVersion() const
 	{
-		return EQEmu::versions::ClientVersion::SoF;
+		return EQ::versions::ClientVersion::SoF;
 	}
 
 #include "ss_define.h"
@@ -361,24 +361,24 @@ namespace SoF
 		//store away the emu struct
 		uchar* __emu_buffer = in->pBuffer;
 
-		int item_count = in->size / sizeof(EQEmu::InternalSerializedItem_Struct);
-		if (!item_count || (in->size % sizeof(EQEmu::InternalSerializedItem_Struct)) != 0) {
+		int item_count = in->size / sizeof(EQ::InternalSerializedItem_Struct);
+		if (!item_count || (in->size % sizeof(EQ::InternalSerializedItem_Struct)) != 0) {
 			Log(Logs::General, Logs::Netcode, "[STRUCTS] Wrong size on outbound %s: Got %d, expected multiple of %d",
-				opcodes->EmuToName(in->GetOpcode()), in->size, sizeof(EQEmu::InternalSerializedItem_Struct));
+				opcodes->EmuToName(in->GetOpcode()), in->size, sizeof(EQ::InternalSerializedItem_Struct));
 
 			delete in;
 			return;
 		}
 
-		EQEmu::InternalSerializedItem_Struct* eq = (EQEmu::InternalSerializedItem_Struct*)in->pBuffer;
+		EQ::InternalSerializedItem_Struct* eq = (EQ::InternalSerializedItem_Struct*)in->pBuffer;
 
-		EQEmu::OutBuffer ob;
-		EQEmu::OutBuffer::pos_type last_pos = ob.tellp();
+		EQ::OutBuffer ob;
+		EQ::OutBuffer::pos_type last_pos = ob.tellp();
 
 		ob.write((const char*)&item_count, sizeof(uint32));
 
 		for (int index = 0; index < item_count; ++index, ++eq) {
-			SerializeItem(ob, (const EQEmu::ItemInstance*)eq->inst, eq->slot_id, 0);
+			SerializeItem(ob, (const EQ::ItemInstance*)eq->inst, eq->slot_id, 0);
 			if (ob.tellp() == last_pos)
 				LogNetcode("SoF::ENCODE(OP_CharInventory) Serialization failed on item slot [{}] during OP_CharInventory.  Item skipped", eq->slot_id);
 
@@ -471,14 +471,48 @@ namespace SoF
 		FINISH_ENCODE();
 	}
 
+	ENCODE(OP_DzChooseZone)
+	{
+		SETUP_VAR_ENCODE(DynamicZoneChooseZone_Struct);
+
+		SerializeBuffer buf;
+		buf.WriteUInt32(emu->client_id);
+		buf.WriteUInt32(emu->count);
+
+		for (uint32 i = 0; i < emu->count; ++i)
+		{
+			buf.WriteUInt16(emu->choices[i].dz_zone_id);
+			buf.WriteUInt16(emu->choices[i].dz_instance_id);
+			buf.WriteUInt32(emu->choices[i].unknown_id1);
+			buf.WriteUInt32(emu->choices[i].dz_type);
+			buf.WriteUInt32(emu->choices[i].unknown_id2);
+			buf.WriteString(emu->choices[i].description);
+			buf.WriteString(emu->choices[i].leader_name);
+		}
+
+		__packet->size = buf.size();
+		__packet->pBuffer = new unsigned char[__packet->size];
+		memcpy(__packet->pBuffer, buf.buffer(), __packet->size);
+
+		FINISH_ENCODE();
+	}
+
 	ENCODE(OP_DzCompass)
 	{
-		SETUP_VAR_ENCODE(ExpeditionCompass_Struct);
-		ALLOC_VAR_ENCODE(structs::ExpeditionCompass_Struct, sizeof(structs::ExpeditionInfo_Struct) + sizeof(structs::ExpeditionCompassEntry_Struct) * emu->count);
+		SETUP_VAR_ENCODE(DynamicZoneCompass_Struct);
+		ALLOC_VAR_ENCODE(structs::DynamicZoneCompass_Struct,
+			sizeof(structs::DynamicZoneCompass_Struct) +
+			sizeof(structs::DynamicZoneCompassEntry_Struct) * emu->count
+		);
+
+		OUT(client_id);
 		OUT(count);
 
 		for (uint32 i = 0; i < emu->count; ++i)
 		{
+			OUT(entries[i].dz_zone_id);
+			OUT(entries[i].dz_instance_id);
+			OUT(entries[i].dz_type);
 			OUT(entries[i].x);
 			OUT(entries[i].y);
 			OUT(entries[i].z);
@@ -502,80 +536,60 @@ namespace SoF
 		ENCODE_LENGTH_EXACT(ExpeditionInfo_Struct);
 		SETUP_DIRECT_ENCODE(ExpeditionInfo_Struct, structs::ExpeditionInfo_Struct);
 
+		OUT(client_id);
+		OUT(assigned);
 		OUT(max_players);
-		eq->enabled_max = 1;
-		strcpy(eq->expedition_name, emu->expedition_name);
-		strcpy(eq->leader_name, emu->leader_name);
+		strn0cpy(eq->expedition_name, emu->expedition_name, sizeof(eq->expedition_name));
+		strn0cpy(eq->leader_name, emu->leader_name, sizeof(eq->leader_name));
 
 		FINISH_ENCODE();
 	}
 
-	ENCODE(OP_DzExpeditionList)
+	ENCODE(OP_DzExpeditionInvite)
 	{
-		SETUP_VAR_ENCODE(ExpeditionLockoutList_Struct);
+		ENCODE_LENGTH_EXACT(ExpeditionInvite_Struct);
+		SETUP_DIRECT_ENCODE(ExpeditionInvite_Struct, structs::ExpeditionInvite_Struct);
 
-		std::stringstream ss(std::stringstream::in | std::stringstream::out | std::stringstream::binary);
-		uint32 client_id = 0;
-		uint8 null_term = 0;
-		ss.write((const char*)&client_id, sizeof(uint32));
-		ss.write((const char*)&emu->count, sizeof(uint32));
-		for (int i = 0; i < emu->count; ++i)
+		OUT(client_id);
+		strn0cpy(eq->inviter_name, emu->inviter_name, sizeof(eq->inviter_name));
+		strn0cpy(eq->expedition_name, emu->expedition_name, sizeof(eq->expedition_name));
+		OUT(swapping);
+		strn0cpy(eq->swap_name, emu->swap_name, sizeof(eq->swap_name));
+		OUT(dz_zone_id);
+		OUT(dz_instance_id);
+
+		FINISH_ENCODE();
+	}
+
+	ENCODE(OP_DzExpeditionLockoutTimers)
+	{
+		SETUP_VAR_ENCODE(ExpeditionLockoutTimers_Struct);
+
+		SerializeBuffer buf;
+		buf.WriteUInt32(emu->client_id);
+		buf.WriteUInt32(emu->count);
+		for (uint32 i = 0; i < emu->count; ++i)
 		{
-			ss.write(emu->entries[i].expedition, strlen(emu->entries[i].expedition));
-			ss.write((const char*)&null_term, sizeof(char));
-			ss.write((const char*)&emu->entries[i].time_left, sizeof(uint32));
-			ss.write((const char*)&client_id, sizeof(uint32));
-			ss.write(emu->entries[i].expedition_event, strlen(emu->entries[i].expedition_event));
-			ss.write((const char*)&null_term, sizeof(char));
+			buf.WriteString(emu->timers[i].expedition_name);
+			buf.WriteUInt32(emu->timers[i].seconds_remaining);
+			buf.WriteInt32(emu->timers[i].event_type);
+			buf.WriteString(emu->timers[i].event_name);
 		}
 
-		__packet->size = ss.str().length();
+		__packet->size = buf.size();
 		__packet->pBuffer = new unsigned char[__packet->size];
-		memcpy(__packet->pBuffer, ss.str().c_str(), __packet->size);
+		memcpy(__packet->pBuffer, buf.buffer(), __packet->size);
 
 		FINISH_ENCODE();
 	}
 
-	ENCODE(OP_DzJoinExpeditionConfirm)
+	ENCODE(OP_DzSetLeaderName)
 	{
-		ENCODE_LENGTH_EXACT(ExpeditionJoinPrompt_Struct);
-		SETUP_DIRECT_ENCODE(ExpeditionJoinPrompt_Struct, structs::ExpeditionJoinPrompt_Struct);
+		ENCODE_LENGTH_EXACT(ExpeditionSetLeaderName_Struct);
+		SETUP_DIRECT_ENCODE(ExpeditionSetLeaderName_Struct, structs::ExpeditionSetLeaderName_Struct);
 
-		strcpy(eq->expedition_name, emu->expedition_name);
-		strcpy(eq->player_name, emu->player_name);
-
-		FINISH_ENCODE();
-	}
-
-	ENCODE(OP_DzLeaderStatus)
-	{
-		SETUP_VAR_ENCODE(ExpeditionLeaderSet_Struct);
-
-		std::stringstream ss(std::stringstream::in | std::stringstream::out | std::stringstream::binary);
-		uint32 client_id = 0;
-		uint8 null_term = 0;
-
-		ss.write((const char*)&client_id, sizeof(uint32));
-		//ss.write((const char*)&client_id, sizeof(uint32));
-		ss.write(emu->leader_name, strlen(emu->leader_name));
-		ss.write((const char*)&null_term, sizeof(char));
-		ss.write((const char*)&client_id, sizeof(uint32));
-		ss.write((const char*)&client_id, sizeof(uint32));//0xffffffff
-		ss.write((const char*)&client_id, sizeof(uint32));
-		ss.write((const char*)&client_id, sizeof(uint32));
-		ss.write((const char*)&client_id, sizeof(uint32));
-		ss.write((const char*)&client_id, sizeof(uint32));
-		ss.write((const char*)&client_id, sizeof(uint32));
-		ss.write((const char*)&client_id, sizeof(uint32));
-		ss.write((const char*)&client_id, sizeof(uint32));
-		ss.write((const char*)&client_id, sizeof(uint32));
-		ss.write((const char*)&client_id, sizeof(uint32));
-		ss.write((const char*)&client_id, sizeof(uint32));//1
-		ss.write((const char*)&client_id, sizeof(uint32));
-
-		__packet->size = ss.str().length();
-		__packet->pBuffer = new unsigned char[__packet->size];
-		memcpy(__packet->pBuffer, ss.str().c_str(), __packet->size);
+		OUT(client_id);
+		strn0cpy(eq->leader_name, emu->leader_name, sizeof(eq->leader_name));
 
 		FINISH_ENCODE();
 	}
@@ -584,26 +598,43 @@ namespace SoF
 	{
 		SETUP_VAR_ENCODE(ExpeditionMemberList_Struct);
 
-		std::stringstream ss(std::stringstream::in | std::stringstream::out | std::stringstream::binary);
-
-		uint32 client_id = 0;
-		uint8 null_term = 0;
-		ss.write((const char*)&client_id, sizeof(uint32));
-		ss.write((const char*)&emu->count, sizeof(uint32));
-		for (uint32 i = 0; i < emu->count; ++i)
+		SerializeBuffer buf;
+		buf.WriteUInt32(emu->client_id);
+		buf.WriteUInt32(emu->member_count);
+		for (uint32 i = 0; i < emu->member_count; ++i)
 		{
-			ss.write(emu->entries[i].name, strlen(emu->entries[i].name));
-			ss.write((const char*)&null_term, sizeof(char));
-			ss.write((const char*)&emu->entries[i].status, sizeof(char));
+			buf.WriteString(emu->members[i].name);
+			buf.WriteUInt8(emu->members[i].expedition_status);
 		}
 
-		__packet->size = ss.str().length();
+		__packet->size = buf.size();
 		__packet->pBuffer = new unsigned char[__packet->size];
-		memcpy(__packet->pBuffer, ss.str().c_str(), __packet->size);
+		memcpy(__packet->pBuffer, buf.buffer(), __packet->size);
 
 		FINISH_ENCODE();
 	}
 
+	ENCODE(OP_DzMemberListName)
+	{
+		ENCODE_LENGTH_EXACT(ExpeditionMemberListName_Struct);
+		SETUP_DIRECT_ENCODE(ExpeditionMemberListName_Struct, structs::ExpeditionMemberListName_Struct);
+
+		OUT(client_id);
+		OUT(add_name);
+		strn0cpy(eq->name, emu->name, sizeof(eq->name));
+
+		FINISH_ENCODE();
+	}
+
+	ENCODE(OP_DzMemberListStatus)
+	{
+		auto emu = reinterpret_cast<ExpeditionMemberList_Struct*>((*p)->pBuffer);
+		if (emu->member_count == 1)
+		{
+			ENCODE_FORWARD(OP_DzMemberList);
+		}
+	}
+
 	ENCODE(OP_Emote)
 	{
 		EQApplicationPacket *in = *p;
@@ -855,14 +886,14 @@ namespace SoF
 		//store away the emu struct
 		uchar* __emu_buffer = in->pBuffer;
 		
-		EQEmu::InternalSerializedItem_Struct* int_struct = (EQEmu::InternalSerializedItem_Struct*)(&__emu_buffer[4]);
+		EQ::InternalSerializedItem_Struct* int_struct = (EQ::InternalSerializedItem_Struct*)(&__emu_buffer[4]);
 
-		EQEmu::OutBuffer ob;
-		EQEmu::OutBuffer::pos_type last_pos = ob.tellp();
+		EQ::OutBuffer ob;
+		EQ::OutBuffer::pos_type last_pos = ob.tellp();
 
 		ob.write((const char*)__emu_buffer, 4);
 
-		SerializeItem(ob, (const EQEmu::ItemInstance*)int_struct->inst, int_struct->slot_id, 0);
+		SerializeItem(ob, (const EQ::ItemInstance*)int_struct->inst, int_struct->slot_id, 0);
 		if (ob.tellp() == last_pos) {
 			LogNetcode("SoF::ENCODE(OP_ItemPacket) Serialization failed on item slot [{}]", int_struct->slot_id);
 			delete in;
@@ -956,7 +987,7 @@ namespace SoF
 
 		// Since HT/LoH are translated up, we need to translate down only for memSpellSpellbar case
 		if (emu->scribing == 3)
-			eq->slot = static_cast<uint32>(ServerToSoFCastingSlot(static_cast<EQEmu::spells::CastingSlot>(emu->slot)));
+			eq->slot = static_cast<uint32>(ServerToSoFCastingSlot(static_cast<EQ::spells::CastingSlot>(emu->slot)));
 		else
 			OUT(slot);
 		OUT(spell_id);
@@ -1030,6 +1061,7 @@ namespace SoF
 		OUT(FastRegenHP);
 		OUT(FastRegenMana);
 		OUT(FastRegenEndurance);
+		OUT(underworld_teleport_index);
 
 		/*fill in some unknowns with observed values, hopefully it will help */
 		eq->unknown796 = -1;
@@ -1130,7 +1162,7 @@ namespace SoF
 		OUT(hairstyle);
 		OUT(beard);
 		//	OUT(unknown00178[10]);
-		for (r = EQEmu::textures::textureBegin; r < EQEmu::textures::materialCount; r++) {
+		for (r = EQ::textures::textureBegin; r < EQ::textures::materialCount; r++) {
 			eq->equipment.Slot[r].Material = emu->item_material.Slot[r].Material;
 			eq->equipment.Slot[r].Unknown1 = 0;
 			eq->equipment.Slot[r].EliteMaterial = 0;
@@ -1160,7 +1192,7 @@ namespace SoF
 		OUT(face);
 		//	OUT(unknown02264[47]);
 
-		if (spells::SPELLBOOK_SIZE <= EQEmu::spells::SPELLBOOK_SIZE) {
+		if (spells::SPELLBOOK_SIZE <= EQ::spells::SPELLBOOK_SIZE) {
 			for (uint32 r = 0; r < spells::SPELLBOOK_SIZE; r++) {
 				if (emu->spell_book[r] <= spells::SPELL_ID_MAX)
 					eq->spell_book[r] = emu->spell_book[r];
@@ -1169,14 +1201,14 @@ namespace SoF
 			}
 		}
 		else {
-			for (uint32 r = 0; r < EQEmu::spells::SPELLBOOK_SIZE; r++) {
+			for (uint32 r = 0; r < EQ::spells::SPELLBOOK_SIZE; r++) {
 				if (emu->spell_book[r] <= spells::SPELL_ID_MAX)
 					eq->spell_book[r] = emu->spell_book[r];
 				else
 					eq->spell_book[r] = 0xFFFFFFFFU;
 			}
 			// invalidate the rest of the spellbook slots
-			memset(&eq->spell_book[EQEmu::spells::SPELLBOOK_SIZE], 0xFF, (sizeof(uint32) * (spells::SPELLBOOK_SIZE - EQEmu::spells::SPELLBOOK_SIZE)));
+			memset(&eq->spell_book[EQ::spells::SPELLBOOK_SIZE], 0xFF, (sizeof(uint32) * (spells::SPELLBOOK_SIZE - EQ::spells::SPELLBOOK_SIZE)));
 		}
 
 		//	OUT(unknown4184[128]);
@@ -1223,7 +1255,7 @@ namespace SoF
 		//	OUT(unknown06160[4]);
 
 		// Copy bandoliers where server and client indices converge
-		for (r = 0; r < EQEmu::profile::BANDOLIERS_SIZE && r < profile::BANDOLIERS_SIZE; ++r) {
+		for (r = 0; r < EQ::profile::BANDOLIERS_SIZE && r < profile::BANDOLIERS_SIZE; ++r) {
 			OUT_str(bandoliers[r].Name);
 			for (uint32 k = 0; k < profile::BANDOLIER_ITEM_COUNT; ++k) { // Will need adjusting if 'server != client' is ever true
 				OUT(bandoliers[r].Items[k].ID);
@@ -1232,7 +1264,7 @@ namespace SoF
 			}
 		}
 		// Nullify bandoliers where server and client indices diverge, with a client bias
-		for (r = EQEmu::profile::BANDOLIERS_SIZE; r < profile::BANDOLIERS_SIZE; ++r) {
+		for (r = EQ::profile::BANDOLIERS_SIZE; r < profile::BANDOLIERS_SIZE; ++r) {
 			eq->bandoliers[r].Name[0] = '\0';
 			for (uint32 k = 0; k < profile::BANDOLIER_ITEM_COUNT; ++k) { // Will need adjusting if 'server != client' is ever true
 				eq->bandoliers[r].Items[k].ID = 0;
@@ -1244,13 +1276,13 @@ namespace SoF
 		//	OUT(unknown07444[5120]);
 
 		// Copy potion belt where server and client indices converge
-		for (r = 0; r < EQEmu::profile::POTION_BELT_SIZE && r < profile::POTION_BELT_SIZE; ++r) {
+		for (r = 0; r < EQ::profile::POTION_BELT_SIZE && r < profile::POTION_BELT_SIZE; ++r) {
 			OUT(potionbelt.Items[r].ID);
 			OUT(potionbelt.Items[r].Icon);
 			OUT_str(potionbelt.Items[r].Name);
 		}
 		// Nullify potion belt where server and client indices diverge, with a client bias
-		for (r = EQEmu::profile::POTION_BELT_SIZE; r < profile::POTION_BELT_SIZE; ++r) {
+		for (r = EQ::profile::POTION_BELT_SIZE; r < profile::POTION_BELT_SIZE; ++r) {
 			eq->potionbelt.Items[r].ID = 0;
 			eq->potionbelt.Items[r].Icon = 0;
 			eq->potionbelt.Items[r].Name[0] = '\0';
@@ -1593,7 +1625,7 @@ namespace SoF
 			eq_cse->HairColor = emu_cse->HairColor;
 			eq_cse->Face = emu_cse->Face;
 
-			for (int equip_index = EQEmu::textures::textureBegin; equip_index < EQEmu::textures::materialCount; equip_index++) {
+			for (int equip_index = EQ::textures::textureBegin; equip_index < EQ::textures::materialCount; equip_index++) {
 				eq_cse->Equip[equip_index].Material = emu_cse->Equip[equip_index].Material;
 				eq_cse->Equip[equip_index].Unknown1 = emu_cse->Equip[equip_index].Unknown1;
 				eq_cse->Equip[equip_index].EliteMaterial = emu_cse->Equip[equip_index].EliteModel;
@@ -2015,7 +2047,7 @@ namespace SoF
 			eq->deity = emu->deity;
 			eq->drakkin_heritage = emu->drakkin_heritage;
 			eq->gender = emu->gender;
-			for (k = EQEmu::textures::textureBegin; k < EQEmu::textures::materialCount; k++) {
+			for (k = EQ::textures::textureBegin; k < EQ::textures::materialCount; k++) {
 				eq->equipment.Slot[k].Material = emu->equipment.Slot[k].Material;
 				eq->equipment.Slot[k].Unknown1 = emu->equipment.Slot[k].Unknown1;
 				eq->equipment.Slot[k].EliteMaterial = emu->equipment.Slot[k].EliteModel;
@@ -2081,7 +2113,7 @@ namespace SoF
 			strcpy(eq->name, emu->name);
 			eq->petOwnerId = emu->petOwnerId;
 			eq->pvp = 0;	// 0 = non-pvp colored name, 1 = red pvp name
-			for (k = EQEmu::textures::textureBegin; k < EQEmu::textures::materialCount; k++) {
+			for (k = EQ::textures::textureBegin; k < EQ::textures::materialCount; k++) {
 				eq->equipment_tint.Slot[k].Color = emu->equipment_tint.Slot[k].Color;
 			}
 			eq->anon = emu->anon;
@@ -2300,7 +2332,7 @@ namespace SoF
 		DECODE_LENGTH_EXACT(structs::BugReport_Struct);
 		SETUP_DIRECT_DECODE(BugReport_Struct, structs::BugReport_Struct);
 
-		emu->category_id = EQEmu::bug::CategoryNameToCategoryID(eq->category_name);
+		emu->category_id = EQ::bug::CategoryNameToCategoryID(eq->category_name);
 		memcpy(emu->category_name, eq, sizeof(structs::BugReport_Struct));
 
 		FINISH_DIRECT_DECODE();
@@ -2434,6 +2466,83 @@ namespace SoF
 		FINISH_DIRECT_DECODE();
 	}
 
+	DECODE(OP_DzAddPlayer)
+	{
+		DECODE_LENGTH_EXACT(structs::ExpeditionCommand_Struct);
+		SETUP_DIRECT_DECODE(ExpeditionCommand_Struct, structs::ExpeditionCommand_Struct);
+
+		strn0cpy(emu->name, eq->name, sizeof(emu->name));
+
+		FINISH_DIRECT_DECODE();
+	}
+
+	DECODE(OP_DzChooseZoneReply)
+	{
+		DECODE_LENGTH_EXACT(structs::DynamicZoneChooseZoneReply_Struct);
+		SETUP_DIRECT_DECODE(DynamicZoneChooseZoneReply_Struct, structs::DynamicZoneChooseZoneReply_Struct);
+
+		emu->unknown000 = eq->unknown000;
+		emu->unknown008 = eq->unknown004;
+		IN(unknown_id1);
+		IN(dz_zone_id);
+		IN(dz_instance_id);
+		IN(dz_type);
+		IN(unknown_id2);
+		emu->unknown028 = eq->unknown024;
+		emu->unknown032 = eq->unknown028;
+		emu->unknown036 = eq->unknown032;
+		emu->unknown040 = eq->unknown036;
+		emu->unknown044 = eq->unknown040;
+		emu->unknown048 = eq->unknown044;
+
+		FINISH_DIRECT_DECODE();
+	}
+
+	DECODE(OP_DzExpeditionInviteResponse)
+	{
+		DECODE_LENGTH_EXACT(structs::ExpeditionInviteResponse_Struct);
+		SETUP_DIRECT_DECODE(ExpeditionInviteResponse_Struct, structs::ExpeditionInviteResponse_Struct);
+
+		IN(dz_zone_id);
+		IN(dz_instance_id);
+		IN(accepted);
+		IN(swapping);
+		strn0cpy(emu->swap_name, eq->swap_name, sizeof(emu->swap_name));
+
+		FINISH_DIRECT_DECODE();
+	}
+
+	DECODE(OP_DzMakeLeader)
+	{
+		DECODE_LENGTH_EXACT(structs::ExpeditionCommand_Struct);
+		SETUP_DIRECT_DECODE(ExpeditionCommand_Struct, structs::ExpeditionCommand_Struct);
+
+		strn0cpy(emu->name, eq->name, sizeof(emu->name));
+
+		FINISH_DIRECT_DECODE();
+	}
+
+	DECODE(OP_DzRemovePlayer)
+	{
+		DECODE_LENGTH_EXACT(structs::ExpeditionCommand_Struct);
+		SETUP_DIRECT_DECODE(ExpeditionCommand_Struct, structs::ExpeditionCommand_Struct);
+
+		strn0cpy(emu->name, eq->name, sizeof(emu->name));
+
+		FINISH_DIRECT_DECODE();
+	}
+
+	DECODE(OP_DzSwapPlayer)
+	{
+		DECODE_LENGTH_EXACT(structs::ExpeditionCommandSwap_Struct);
+		SETUP_DIRECT_DECODE(ExpeditionCommandSwap_Struct, structs::ExpeditionCommandSwap_Struct);
+
+		strn0cpy(emu->add_player_name, eq->add_player_name, sizeof(emu->add_player_name));
+		strn0cpy(emu->rem_player_name, eq->rem_player_name, sizeof(emu->rem_player_name));
+
+		FINISH_DIRECT_DECODE();
+	}
+
 	DECODE(OP_Emote)
 	{
 		unsigned char *__eq_buffer = __packet->pBuffer;
@@ -2556,7 +2665,7 @@ namespace SoF
 
 		for (int i = 0; i < spells::SPELL_GEM_COUNT; ++i)
 			IN(spell[i]);
-		for (int i = spells::SPELL_GEM_COUNT; i < EQEmu::spells::SPELL_GEM_COUNT; ++i)
+		for (int i = spells::SPELL_GEM_COUNT; i < EQ::spells::SPELL_GEM_COUNT; ++i)
 			emu->spell[i] = 0xFFFFFFFF;
 
 		IN(unknown);
@@ -2838,9 +2947,9 @@ namespace SoF
 		return NextItemInstSerialNumber;
 	}
 
-	void SerializeItem(EQEmu::OutBuffer& ob, const EQEmu::ItemInstance *inst, int16 slot_id_in, uint8 depth)
+	void SerializeItem(EQ::OutBuffer& ob, const EQ::ItemInstance *inst, int16 slot_id_in, uint8 depth)
 	{
-		const EQEmu::ItemData *item = inst->GetUnscaledItem();
+		const EQ::ItemData *item = inst->GetUnscaledItem();
 		
 		SoF::structs::ItemSerializationHeader hdr;
 
@@ -3028,6 +3137,12 @@ namespace SoF
 		itbs.no_transfer = item->NoTransfer;
 		itbs.expendablearrow = item->ExpendableArrow;
 
+		// Done to hack older clients to label expendable fishing poles as such
+		// July 28th, 2018 patch
+		if (item->ItemType == EQ::item::ItemTypeFishingPole && item->SubType == 0) {
+			itbs.expendablearrow = 1;
+		}
+
 		ob.write((const char*)&itbs, sizeof(SoF::structs::ItemTertiaryBodyStruct));
 
 		// Effect Structures Broken down to allow variable length strings for effect names
@@ -3147,30 +3262,30 @@ namespace SoF
 		
 		ob.write((const char*)&iqbs, sizeof(SoF::structs::ItemQuaternaryBodyStruct));
 
-		EQEmu::OutBuffer::pos_type count_pos = ob.tellp();
+		EQ::OutBuffer::pos_type count_pos = ob.tellp();
 		uint32 subitem_count = 0;
 
 		ob.write((const char*)&subitem_count, sizeof(uint32));
 
 		// moved outside of loop since it is not modified within that scope
-		int16 SubSlotNumber = EQEmu::invbag::SLOT_INVALID;
+		int16 SubSlotNumber = EQ::invbag::SLOT_INVALID;
 
-		if (slot_id_in <= EQEmu::invslot::slotGeneral8 && slot_id_in >= EQEmu::invslot::GENERAL_BEGIN)
-			SubSlotNumber = EQEmu::invbag::GENERAL_BAGS_BEGIN + ((slot_id_in - EQEmu::invslot::GENERAL_BEGIN) * EQEmu::invbag::SLOT_COUNT);
-		else if (slot_id_in <= EQEmu::invslot::GENERAL_END && slot_id_in >= EQEmu::invslot::slotGeneral9)
-			SubSlotNumber = EQEmu::invbag::SLOT_INVALID;
-		else if (slot_id_in == EQEmu::invslot::slotCursor)
-			SubSlotNumber = EQEmu::invbag::CURSOR_BAG_BEGIN;
-		else if (slot_id_in <= EQEmu::invslot::BANK_END && slot_id_in >= EQEmu::invslot::BANK_BEGIN)
-			SubSlotNumber = EQEmu::invbag::BANK_BAGS_BEGIN + ((slot_id_in - EQEmu::invslot::BANK_BEGIN) * EQEmu::invbag::SLOT_COUNT);
-		else if (slot_id_in <= EQEmu::invslot::SHARED_BANK_END && slot_id_in >= EQEmu::invslot::SHARED_BANK_BEGIN)
-			SubSlotNumber = EQEmu::invbag::SHARED_BANK_BAGS_BEGIN + ((slot_id_in - EQEmu::invslot::SHARED_BANK_BEGIN) * EQEmu::invbag::SLOT_COUNT);
+		if (slot_id_in <= EQ::invslot::slotGeneral8 && slot_id_in >= EQ::invslot::GENERAL_BEGIN)
+			SubSlotNumber = EQ::invbag::GENERAL_BAGS_BEGIN + ((slot_id_in - EQ::invslot::GENERAL_BEGIN) * EQ::invbag::SLOT_COUNT);
+		else if (slot_id_in <= EQ::invslot::GENERAL_END && slot_id_in >= EQ::invslot::slotGeneral9)
+			SubSlotNumber = EQ::invbag::SLOT_INVALID;
+		else if (slot_id_in == EQ::invslot::slotCursor)
+			SubSlotNumber = EQ::invbag::CURSOR_BAG_BEGIN;
+		else if (slot_id_in <= EQ::invslot::BANK_END && slot_id_in >= EQ::invslot::BANK_BEGIN)
+			SubSlotNumber = EQ::invbag::BANK_BAGS_BEGIN + ((slot_id_in - EQ::invslot::BANK_BEGIN) * EQ::invbag::SLOT_COUNT);
+		else if (slot_id_in <= EQ::invslot::SHARED_BANK_END && slot_id_in >= EQ::invslot::SHARED_BANK_BEGIN)
+			SubSlotNumber = EQ::invbag::SHARED_BANK_BAGS_BEGIN + ((slot_id_in - EQ::invslot::SHARED_BANK_BEGIN) * EQ::invbag::SLOT_COUNT);
 		else
 			SubSlotNumber = slot_id_in; // not sure if this is the best way to handle this..leaving for now
 
-		if (SubSlotNumber != EQEmu::invbag::SLOT_INVALID) {
-			for (uint32 index = EQEmu::invbag::SLOT_BEGIN; index <= EQEmu::invbag::SLOT_END; ++index) {
-				EQEmu::ItemInstance* sub = inst->GetItem(index);
+		if (SubSlotNumber != EQ::invbag::SLOT_INVALID) {
+			for (uint32 index = EQ::invbag::SLOT_BEGIN; index <= EQ::invbag::SLOT_END; ++index) {
+				EQ::ItemInstance* sub = inst->GetItem(index);
 				if (!sub)
 					continue;
 
@@ -3189,59 +3304,59 @@ namespace SoF
 	{
 		uint32 sof_slot = invslot::SLOT_INVALID;
 
-		if (server_slot <= EQEmu::invslot::slotGeneral8) {
+		if (server_slot <= EQ::invslot::slotGeneral8) {
 			sof_slot = server_slot;
 		}
 
-		else if (server_slot <= EQEmu::invslot::CORPSE_END && server_slot >= EQEmu::invslot::slotCursor) {
+		else if (server_slot <= EQ::invslot::CORPSE_END && server_slot >= EQ::invslot::slotCursor) {
 			sof_slot = server_slot - 2;
 		}
 
-		else if (server_slot <= EQEmu::invbag::GENERAL_BAGS_8_END && server_slot >= EQEmu::invbag::GENERAL_BAGS_BEGIN) {
+		else if (server_slot <= EQ::invbag::GENERAL_BAGS_8_END && server_slot >= EQ::invbag::GENERAL_BAGS_BEGIN) {
 			sof_slot = server_slot + 11;
 		}
 
-		else if (server_slot <= EQEmu::invbag::CURSOR_BAG_END && server_slot >= EQEmu::invbag::CURSOR_BAG_BEGIN) {
+		else if (server_slot <= EQ::invbag::CURSOR_BAG_END && server_slot >= EQ::invbag::CURSOR_BAG_BEGIN) {
 			sof_slot = server_slot - 9;
 		}
 
-		else if (server_slot <= EQEmu::invslot::TRIBUTE_END && server_slot >= EQEmu::invslot::TRIBUTE_BEGIN) {
+		else if (server_slot <= EQ::invslot::TRIBUTE_END && server_slot >= EQ::invslot::TRIBUTE_BEGIN) {
 			sof_slot = server_slot;
 		}
 
-		else if (server_slot <= EQEmu::invslot::GUILD_TRIBUTE_END && server_slot >= EQEmu::invslot::GUILD_TRIBUTE_BEGIN) {
+		else if (server_slot <= EQ::invslot::GUILD_TRIBUTE_END && server_slot >= EQ::invslot::GUILD_TRIBUTE_BEGIN) {
 			sof_slot = server_slot;
 		}
 
-		else if (server_slot == EQEmu::invslot::SLOT_TRADESKILL_EXPERIMENT_COMBINE) {
+		else if (server_slot == EQ::invslot::SLOT_TRADESKILL_EXPERIMENT_COMBINE) {
 			sof_slot = server_slot;
 		}
 
-		else if (server_slot <= EQEmu::invslot::BANK_END && server_slot >= EQEmu::invslot::BANK_BEGIN) {
+		else if (server_slot <= EQ::invslot::BANK_END && server_slot >= EQ::invslot::BANK_BEGIN) {
 			sof_slot = server_slot;
 		}
 
-		else if (server_slot <= EQEmu::invbag::BANK_BAGS_END && server_slot >= EQEmu::invbag::BANK_BAGS_BEGIN) {
+		else if (server_slot <= EQ::invbag::BANK_BAGS_END && server_slot >= EQ::invbag::BANK_BAGS_BEGIN) {
 			sof_slot = server_slot + 1;
 		}
 
-		else if (server_slot <= EQEmu::invslot::SHARED_BANK_END && server_slot >= EQEmu::invslot::SHARED_BANK_BEGIN) {
+		else if (server_slot <= EQ::invslot::SHARED_BANK_END && server_slot >= EQ::invslot::SHARED_BANK_BEGIN) {
 			sof_slot = server_slot;
 		}
 
-		else if (server_slot <= EQEmu::invbag::SHARED_BANK_BAGS_END && server_slot >= EQEmu::invbag::SHARED_BANK_BAGS_BEGIN) {
+		else if (server_slot <= EQ::invbag::SHARED_BANK_BAGS_END && server_slot >= EQ::invbag::SHARED_BANK_BAGS_BEGIN) {
 			sof_slot = server_slot + 1;
 		}
 
-		else if (server_slot <= EQEmu::invslot::TRADE_END && server_slot >= EQEmu::invslot::TRADE_BEGIN) {
+		else if (server_slot <= EQ::invslot::TRADE_END && server_slot >= EQ::invslot::TRADE_BEGIN) {
 			sof_slot = server_slot;
 		}
 
-		else if (server_slot <= EQEmu::invbag::TRADE_BAGS_END && server_slot >= EQEmu::invbag::TRADE_BAGS_BEGIN) {
+		else if (server_slot <= EQ::invbag::TRADE_BAGS_END && server_slot >= EQ::invbag::TRADE_BAGS_BEGIN) {
 			sof_slot = server_slot;
 		}
 
-		else if (server_slot <= EQEmu::invslot::WORLD_END && server_slot >= EQEmu::invslot::WORLD_BEGIN) {
+		else if (server_slot <= EQ::invslot::WORLD_END && server_slot >= EQ::invslot::WORLD_BEGIN) {
 			sof_slot = server_slot;
 		}
 
@@ -3254,11 +3369,11 @@ namespace SoF
 	{
 		uint32 SoFSlot = invslot::SLOT_INVALID;
 		
-		if (server_corpse_slot <= EQEmu::invslot::slotGeneral8 && server_corpse_slot >= EQEmu::invslot::slotGeneral1) {
+		if (server_corpse_slot <= EQ::invslot::slotGeneral8 && server_corpse_slot >= EQ::invslot::slotGeneral1) {
 			SoFSlot = server_corpse_slot;
 		}
 
-		else if (server_corpse_slot <= EQEmu::invslot::CORPSE_END && server_corpse_slot >= EQEmu::invslot::slotCursor) {
+		else if (server_corpse_slot <= EQ::invslot::CORPSE_END && server_corpse_slot >= EQ::invslot::slotCursor) {
 			SoFSlot = server_corpse_slot - 2;
 		}
 
@@ -3273,7 +3388,7 @@ namespace SoF
 
 	static inline uint32 SoFToServerSlot(uint32 sof_slot)
 	{
-		uint32 server_slot = EQEmu::invslot::SLOT_INVALID;
+		uint32 server_slot = EQ::invslot::SLOT_INVALID;
 
 		if (sof_slot <= invslot::slotGeneral8) {
 			server_slot = sof_slot;
@@ -3338,7 +3453,7 @@ namespace SoF
 
 	static inline uint32 SoFToServerCorpseSlot(uint32 sof_corpse_slot)
 	{
-		uint32 server_slot = EQEmu::invslot::SLOT_INVALID;
+		uint32 server_slot = EQ::invslot::SLOT_INVALID;
 
 		if (sof_corpse_slot <= invslot::slotGeneral8 && sof_corpse_slot >= invslot::slotGeneral1) {
 			server_slot = sof_corpse_slot;
@@ -3359,7 +3474,7 @@ namespace SoF
 
 	static inline void ServerToSoFSayLink(std::string &sof_saylink, const std::string &server_saylink)
 	{
-		if ((constants::SAY_LINK_BODY_SIZE == EQEmu::constants::SAY_LINK_BODY_SIZE) || (server_saylink.find('\x12') == std::string::npos)) {
+		if ((constants::SAY_LINK_BODY_SIZE == EQ::constants::SAY_LINK_BODY_SIZE) || (server_saylink.find('\x12') == std::string::npos)) {
 			sof_saylink = server_saylink;
 			return;
 		}
@@ -3368,7 +3483,7 @@ namespace SoF
 
 		for (size_t segment_iter = 0; segment_iter < segments.size(); ++segment_iter) {
 			if (segment_iter & 1) {
-				if (segments[segment_iter].length() <= EQEmu::constants::SAY_LINK_BODY_SIZE) {
+				if (segments[segment_iter].length() <= EQ::constants::SAY_LINK_BODY_SIZE) {
 					sof_saylink.append(segments[segment_iter]);
 					// TODO: log size mismatch error
 					continue;
@@ -3399,7 +3514,7 @@ namespace SoF
 
 	static inline void SoFToServerSayLink(std::string &server_saylink, const std::string &sof_saylink)
 	{
-		if ((EQEmu::constants::SAY_LINK_BODY_SIZE == constants::SAY_LINK_BODY_SIZE) || (sof_saylink.find('\x12') == std::string::npos)) {
+		if ((EQ::constants::SAY_LINK_BODY_SIZE == constants::SAY_LINK_BODY_SIZE) || (sof_saylink.find('\x12') == std::string::npos)) {
 			server_saylink = sof_saylink;
 			return;
 		}
@@ -3433,84 +3548,84 @@ namespace SoF
 		}
 	}
 
-	static inline spells::CastingSlot ServerToSoFCastingSlot(EQEmu::spells::CastingSlot slot) {
+	static inline spells::CastingSlot ServerToSoFCastingSlot(EQ::spells::CastingSlot slot) {
 		switch (slot) {
-			case EQEmu::spells::CastingSlot::Gem1:
+			case EQ::spells::CastingSlot::Gem1:
 				return spells::CastingSlot::Gem1;
-			case EQEmu::spells::CastingSlot::Gem2:
+			case EQ::spells::CastingSlot::Gem2:
 				return spells::CastingSlot::Gem2;
-			case EQEmu::spells::CastingSlot::Gem3:
+			case EQ::spells::CastingSlot::Gem3:
 				return spells::CastingSlot::Gem3;
-			case EQEmu::spells::CastingSlot::Gem4:
+			case EQ::spells::CastingSlot::Gem4:
 				return spells::CastingSlot::Gem4;
-			case EQEmu::spells::CastingSlot::Gem5:
+			case EQ::spells::CastingSlot::Gem5:
 				return spells::CastingSlot::Gem5;
-			case EQEmu::spells::CastingSlot::Gem6:
+			case EQ::spells::CastingSlot::Gem6:
 				return spells::CastingSlot::Gem6;
-			case EQEmu::spells::CastingSlot::Gem7:
+			case EQ::spells::CastingSlot::Gem7:
 				return spells::CastingSlot::Gem7;
-			case EQEmu::spells::CastingSlot::Gem8:
+			case EQ::spells::CastingSlot::Gem8:
 				return spells::CastingSlot::Gem8;
-			case EQEmu::spells::CastingSlot::Gem9:
+			case EQ::spells::CastingSlot::Gem9:
 				return spells::CastingSlot::Gem9;
-			case EQEmu::spells::CastingSlot::Item:
+			case EQ::spells::CastingSlot::Item:
 				return spells::CastingSlot::Item;
-			case EQEmu::spells::CastingSlot::PotionBelt:
+			case EQ::spells::CastingSlot::PotionBelt:
 				return spells::CastingSlot::PotionBelt;
-			case EQEmu::spells::CastingSlot::Discipline:
+			case EQ::spells::CastingSlot::Discipline:
 				return spells::CastingSlot::Discipline;
-			case EQEmu::spells::CastingSlot::AltAbility:
+			case EQ::spells::CastingSlot::AltAbility:
 				return spells::CastingSlot::AltAbility;
 			default: // we shouldn't have any issues with other slots ... just return something
 				return spells::CastingSlot::Discipline;
 		}
 	}
 
-	static inline EQEmu::spells::CastingSlot SoFToServerCastingSlot(spells::CastingSlot slot, uint32 item_location) {
+	static inline EQ::spells::CastingSlot SoFToServerCastingSlot(spells::CastingSlot slot, uint32 item_location) {
 		switch (slot) {
 			case spells::CastingSlot::Gem1:
-				return EQEmu::spells::CastingSlot::Gem1;
+				return EQ::spells::CastingSlot::Gem1;
 			case spells::CastingSlot::Gem2:
-				return EQEmu::spells::CastingSlot::Gem2;
+				return EQ::spells::CastingSlot::Gem2;
 			case spells::CastingSlot::Gem3:
-				return EQEmu::spells::CastingSlot::Gem3;
+				return EQ::spells::CastingSlot::Gem3;
 			case spells::CastingSlot::Gem4:
-				return EQEmu::spells::CastingSlot::Gem4;
+				return EQ::spells::CastingSlot::Gem4;
 			case spells::CastingSlot::Gem5:
-				return EQEmu::spells::CastingSlot::Gem5;
+				return EQ::spells::CastingSlot::Gem5;
 			case spells::CastingSlot::Gem6:
-				return EQEmu::spells::CastingSlot::Gem6;
+				return EQ::spells::CastingSlot::Gem6;
 			case spells::CastingSlot::Gem7:
-				return EQEmu::spells::CastingSlot::Gem7;
+				return EQ::spells::CastingSlot::Gem7;
 			case spells::CastingSlot::Gem8:
-				return EQEmu::spells::CastingSlot::Gem8;
+				return EQ::spells::CastingSlot::Gem8;
 			case spells::CastingSlot::Gem9:
-				return EQEmu::spells::CastingSlot::Gem9;
+				return EQ::spells::CastingSlot::Gem9;
 			case spells::CastingSlot::Ability:
-				return EQEmu::spells::CastingSlot::Ability;
+				return EQ::spells::CastingSlot::Ability;
 				// Tit uses 10 for item and discipline casting, but items have a valid location
 			case spells::CastingSlot::Item:
 				if (item_location == INVALID_INDEX)
-					return EQEmu::spells::CastingSlot::Discipline;
+					return EQ::spells::CastingSlot::Discipline;
 				else
-					return EQEmu::spells::CastingSlot::Item;
+					return EQ::spells::CastingSlot::Item;
 			case spells::CastingSlot::PotionBelt:
-				return EQEmu::spells::CastingSlot::PotionBelt;
+				return EQ::spells::CastingSlot::PotionBelt;
 			case spells::CastingSlot::AltAbility:
-				return EQEmu::spells::CastingSlot::AltAbility;
+				return EQ::spells::CastingSlot::AltAbility;
 			default: // we shouldn't have any issues with other slots ... just return something
-				return EQEmu::spells::CastingSlot::Discipline;
+				return EQ::spells::CastingSlot::Discipline;
 		}
 	}
 
 	static inline int ServerToSoFBuffSlot(int index) {
 		// we're a disc
-		if (index >= EQEmu::spells::LONG_BUFFS + EQEmu::spells::SHORT_BUFFS)
-			return index - EQEmu::spells::LONG_BUFFS - EQEmu::spells::SHORT_BUFFS +
+		if (index >= EQ::spells::LONG_BUFFS + EQ::spells::SHORT_BUFFS)
+			return index - EQ::spells::LONG_BUFFS - EQ::spells::SHORT_BUFFS +
 				   spells::LONG_BUFFS + spells::SHORT_BUFFS;
 		// we're a song
-		if (index >= EQEmu::spells::LONG_BUFFS)
-			return index - EQEmu::spells::LONG_BUFFS + spells::LONG_BUFFS;
+		if (index >= EQ::spells::LONG_BUFFS)
+			return index - EQ::spells::LONG_BUFFS + spells::LONG_BUFFS;
 		// we're a normal buff
 		return index; // as long as we guard against bad slots server side, we should be fine
 	}
@@ -3519,11 +3634,11 @@ namespace SoF
 	{
 		// we're a disc
 		if (index >= spells::LONG_BUFFS + spells::SHORT_BUFFS)
-			return index - spells::LONG_BUFFS - spells::SHORT_BUFFS + EQEmu::spells::LONG_BUFFS +
-			       EQEmu::spells::SHORT_BUFFS;
+			return index - spells::LONG_BUFFS - spells::SHORT_BUFFS + EQ::spells::LONG_BUFFS +
+			       EQ::spells::SHORT_BUFFS;
 		// we're a song
 		if (index >= spells::LONG_BUFFS)
-			return index - spells::LONG_BUFFS + EQEmu::spells::LONG_BUFFS;
+			return index - spells::LONG_BUFFS + EQ::spells::LONG_BUFFS;
 		// we're a normal buff
 		return index; // as long as we guard against bad slots server side, we should be fine
 	}

common/patches/sof.h

@@ -43,7 +43,7 @@ namespace SoF
 	protected:
 
 		virtual std::string Describe() const;
-		virtual const EQEmu::versions::ClientVersion ClientVersion() const;
+		virtual const EQ::versions::ClientVersion ClientVersion() const;
 
 		//magic macro to declare our opcode processors
 		#include "ss_declare.h"

common/patches/sof_limits.h

@@ -31,7 +31,7 @@ namespace SoF
 	const int16 INULL = 0;
 
 	namespace inventory {
-		inline EQEmu::versions::ClientVersion GetInventoryRef() { return EQEmu::versions::ClientVersion::SoF; }
+		inline EQ::versions::ClientVersion GetInventoryRef() { return EQ::versions::ClientVersion::SoF; }
 
 		const bool ConcatenateInvTypeLimbo = true;
 
@@ -43,7 +43,7 @@ namespace SoF
 	} /*inventory*/
 
 	namespace invtype {
-		inline EQEmu::versions::ClientVersion GetInvTypeRef() { return EQEmu::versions::ClientVersion::SoF; }
+		inline EQ::versions::ClientVersion GetInvTypeRef() { return EQ::versions::ClientVersion::SoF; }
 
 		namespace enum_ {
 			enum InventoryTypes : int16 {
@@ -106,7 +106,7 @@ namespace SoF
 	} /*invtype*/
 
 	namespace invslot {
-		inline EQEmu::versions::ClientVersion GetInvSlotRef() { return EQEmu::versions::ClientVersion::SoF; }
+		inline EQ::versions::ClientVersion GetInvSlotRef() { return EQ::versions::ClientVersion::SoF; }
 
 		namespace enum_ {
 			enum InventorySlots : int16 {
@@ -205,7 +205,7 @@ namespace SoF
 	} /*invslot*/
 
 	namespace invbag {
-		inline EQEmu::versions::ClientVersion GetInvBagRef() { return EQEmu::versions::ClientVersion::SoF; }
+		inline EQ::versions::ClientVersion GetInvBagRef() { return EQ::versions::ClientVersion::SoF; }
 
 		const int16 SLOT_INVALID = IINVALID;
 		const int16 SLOT_BEGIN = INULL;
@@ -237,7 +237,7 @@ namespace SoF
 	} /*invbag*/
 
 	namespace invaug {
-		inline EQEmu::versions::ClientVersion GetInvAugRef() { return EQEmu::versions::ClientVersion::SoF; }
+		inline EQ::versions::ClientVersion GetInvAugRef() { return EQ::versions::ClientVersion::SoF; }
 
 		const int16 SOCKET_INVALID = IINVALID;
 		const int16 SOCKET_BEGIN = INULL;
@@ -249,7 +249,7 @@ namespace SoF
 	} /*invaug*/
 
 	namespace item {
-		inline EQEmu::versions::ClientVersion GetItemRef() { return EQEmu::versions::ClientVersion::SoF; }
+		inline EQ::versions::ClientVersion GetItemRef() { return EQ::versions::ClientVersion::SoF; }
 
 		enum ItemPacketType : int {
 			ItemPacketMerchant = 100,
@@ -267,7 +267,7 @@ namespace SoF
 	} /*item*/
 
 	namespace profile {
-		inline EQEmu::versions::ClientVersion GetProfileRef() { return EQEmu::versions::ClientVersion::SoF; }
+		inline EQ::versions::ClientVersion GetProfileRef() { return EQ::versions::ClientVersion::SoF; }
 
 		const int16 BANDOLIERS_SIZE = 20;		// number of bandolier instances
 		const int16 BANDOLIER_ITEM_COUNT = 4;	// number of equipment slots in bandolier instance
@@ -279,11 +279,11 @@ namespace SoF
 	} /*profile*/
 
 	namespace constants {
-		inline EQEmu::versions::ClientVersion GetConstantsRef() { return EQEmu::versions::ClientVersion::SoF; }
+		inline EQ::versions::ClientVersion GetConstantsRef() { return EQ::versions::ClientVersion::SoF; }
 
-		const EQEmu::expansions::Expansion EXPANSION = EQEmu::expansions::Expansion::SoF;
-		const uint32 EXPANSION_BIT = EQEmu::expansions::bitSoF;
-		const uint32 EXPANSIONS_MASK = EQEmu::expansions::maskSoF;
+		const EQ::expansions::Expansion EXPANSION = EQ::expansions::Expansion::SoF;
+		const uint32 EXPANSION_BIT = EQ::expansions::bitSoF;
+		const uint32 EXPANSIONS_MASK = EQ::expansions::maskSoF;
 
 		const size_t CHARACTER_CREATION_LIMIT = 12;
 
@@ -292,21 +292,21 @@ namespace SoF
 	} /*constants*/
 
 	namespace behavior {
-		inline EQEmu::versions::ClientVersion GetBehaviorRef() { return EQEmu::versions::ClientVersion::SoF; }
+		inline EQ::versions::ClientVersion GetBehaviorRef() { return EQ::versions::ClientVersion::SoF; }
 
 		const bool CoinHasWeight = true;
 
 	} /*behavior*/
 
 	namespace skills {
-		inline EQEmu::versions::ClientVersion GetSkillsRef() { return EQEmu::versions::ClientVersion::SoF; }
+		inline EQ::versions::ClientVersion GetSkillsRef() { return EQ::versions::ClientVersion::SoF; }
 
-		const size_t LastUsableSkill = EQEmu::skills::SkillTripleAttack;
+		const size_t LastUsableSkill = EQ::skills::SkillTripleAttack;
 
 	} /*skills*/
 
 	namespace spells {
-		inline EQEmu::versions::ClientVersion GetSkillsRef() { return EQEmu::versions::ClientVersion::SoF; }
+		inline EQ::versions::ClientVersion GetSkillsRef() { return EQ::versions::ClientVersion::SoF; }
 		
 		enum class CastingSlot : uint32 {
 			Gem1 = 0,

common/patches/sof_ops.h

@@ -36,13 +36,16 @@ E(OP_Damage)
 E(OP_DeleteCharge)
 E(OP_DeleteItem)
 E(OP_DeleteSpawn)
+E(OP_DzChooseZone)
 E(OP_DzCompass)
 E(OP_DzExpeditionEndsWarning)
 E(OP_DzExpeditionInfo)
-E(OP_DzExpeditionList)
-E(OP_DzJoinExpeditionConfirm)
-E(OP_DzLeaderStatus)
+E(OP_DzExpeditionInvite)
+E(OP_DzExpeditionLockoutTimers)
 E(OP_DzMemberList)
+E(OP_DzMemberListName)
+E(OP_DzMemberListStatus)
+E(OP_DzSetLeaderName)
 E(OP_Emote)
 E(OP_ExpansionInfo)
 E(OP_FormattedMessage)
@@ -103,6 +106,12 @@ D(OP_Consider)
 D(OP_ConsiderCorpse)
 D(OP_Consume)
 D(OP_DeleteItem)
+D(OP_DzAddPlayer)
+D(OP_DzChooseZoneReply)
+D(OP_DzExpeditionInviteResponse)
+D(OP_DzMakeLeader)
+D(OP_DzRemovePlayer)
+D(OP_DzSwapPlayer)
 D(OP_Emote)
 D(OP_FaceChange)
 D(OP_FindPersonRequest)

common/patches/sof_structs.h

@@ -168,7 +168,7 @@ struct TintProfile
 			Tint_Struct Primary;
 			Tint_Struct Secondary;
 		};
-		Tint_Struct Slot[EQEmu::textures::materialCount];
+		Tint_Struct Slot[EQ::textures::materialCount];
 	};
 };
 
@@ -197,7 +197,7 @@ struct TextureProfile
 			Texture_Struct Primary;
 			Texture_Struct Secondary;
 		};
-		Texture_Struct Slot[EQEmu::textures::materialCount];
+		Texture_Struct Slot[EQ::textures::materialCount];
 	};
 
 	TextureProfile();
@@ -214,7 +214,7 @@ struct CharacterSelectEntry_Struct
 /*0000*/	uint8 Beard;				//
 /*0001*/	uint8 HairColor;			//
 /*0000*/	uint8 Face;					//
-/*0000*/	CharSelectEquip	Equip[EQEmu::textures::materialCount];
+/*0000*/	CharSelectEquip	Equip[EQ::textures::materialCount];
 /*0000*/	uint32 PrimaryIDFile;		//
 /*0000*/	uint32 SecondaryIDFile;		//
 /*0000*/	uint8 Unknown15;			// 0xff
@@ -448,7 +448,11 @@ struct NewZone_Struct {
 /*0844*/	int32	unknown844;
 /*0848*/	uint16	zone_id;
 /*0850*/	uint16	zone_instance;
-/*0852*/	char	unknown852[20];
+/*0852*/	uint32	scriptNPCReceivedanItem;
+/*0856*/	uint32	bCheck;					// padded bool
+/*0860*/	uint32	scriptIDSomething;
+/*0864*/	uint32	underworld_teleport_index; // > 0 teleports w/ zone point index, invalid succors, -1 affects some collisions
+/*0868*/	uint32	scriptIDSomething3;
 /*0872*/	uint32	SuspendBuffs;
 /*0876*/	uint32	unknown876;	//seen 50
 /*0880*/	uint32	unknown880;	//seen 10
@@ -4084,43 +4088,150 @@ struct VeteranReward
 /*012*/	VeteranRewardItem items[8];
 };
 
-struct ExpeditionExpireWarning
+struct ExpeditionInvite_Struct
+{
+/*000*/ uint32 client_id;
+/*004*/ char   inviter_name[64];
+/*068*/ char   expedition_name[128];
+/*196*/ uint8  swapping;             // 0: adding 1: swapping
+/*197*/ char   swap_name[64];        // if swapping, swap name being removed
+/*261*/ uint8  padding[3];
+/*264*/ uint16 dz_zone_id;           // dz_id zone/instance pair, sent back in reply
+/*268*/ uint16 dz_instance_id;
+};
+
+struct ExpeditionInviteResponse_Struct
 {
 /*000*/ uint32 unknown000;
-/*004*/ uint32 minutes_remaining;
+/*004*/ uint16 dz_zone_id;     // dz_id pair sent in invite
+/*006*/ uint16 dz_instance_id;
+/*008*/ uint8  accepted;       // 0: declined 1: accepted
+/*009*/ uint8  swapping;       // 0: adding 1: swapping (sent in invite)
+/*010*/ char   swap_name[64];  // swap name sent in invite
+/*074*/ uint8  unknown078;     // padding/garbage?
+/*075*/ uint8  unknown079;     // padding/garbage?
 };
 
 struct ExpeditionInfo_Struct
 {
-/*000*/ uint32 clientid;
-/*004*/ uint32 enabled_max;
+/*000*/ uint32 client_id;
+/*004*/ uint32 assigned; // padded bool
 /*008*/ uint32 max_players;
-/*012*/ char expedition_name[128];
-/*142*/ char leader_name[64];
+/*012*/ char   expedition_name[128];
+/*140*/ char   leader_name[64];
 };
 
-struct ExpeditionCompassEntry_Struct
+struct ExpeditionMemberEntry_Struct
 {
-/*000*/ float unknown000; //seen *((uint32*)) = 1584791871
-/*004*/ uint32 enabled; //guess
-/*008*/ uint32 unknown008; //seen 1019
+/*000*/ char name[1];            // variable length, null terminated, max 0x40 (64)
+/*000*/ uint8 expedition_status; // 0: unknown 1: Online, 2: Offline, 3: In Dynamic Zone, 4: Link Dead
+};
+
+struct ExpeditionMemberList_Struct
+{
+/*000*/ uint32 client_id;
+/*004*/ uint32 member_count;
+/*008*/ ExpeditionMemberEntry_Struct members[0]; // variable length
+};
+
+struct ExpeditionMemberListName_Struct
+{
+/*000*/ uint32 client_id;
+/*004*/ uint32 add_name;   // padded bool, 0: remove name, 1: add name with unknown status
+/*008*/ char   name[64];
+};
+
+struct ExpeditionLockoutTimerEntry_Struct
+{
+/*000*/ char   expedition_name[1]; // variable length, null terminated, max 0x80 (128)
+/*000*/ uint32 seconds_remaining;
+/*000*/ int32  event_type;         // seen -1 (0xffffffff) for replay timers and 1 for event timers
+/*000*/ char   event_name[1];      // variable length, null terminated, max 0x100 (256)
+};
+
+struct ExpeditionLockoutTimers_Struct
+{
+/*000*/ uint32 client_id;
+/*004*/ uint32 count;
+/*008*/ ExpeditionLockoutTimerEntry_Struct timers[0];
+};
+
+struct ExpeditionSetLeaderName_Struct
+{
+/*000*/ uint32 client_id;
+/*004*/ char   leader_name[64];
+};
+
+struct ExpeditionCommand_Struct
+{
+/*000*/ uint32 unknown000;
+/*004*/ char   name[64];
+};
+
+struct ExpeditionCommandSwap_Struct
+{
+/*000*/ uint32 unknown000;
+/*004*/ char   add_player_name[64]; // swap to (player must confirm)
+/*068*/ char   rem_player_name[64]; // swap from
+};
+
+struct ExpeditionExpireWarning
+{
+/*000*/ uint32 client_id;
+/*004*/ uint32 minutes_remaining;
+};
+
+struct DynamicZoneCompassEntry_Struct
+{
+/*000*/ uint16 dz_zone_id;      // target dz id pair
+/*002*/ uint16 dz_instance_id;
+/*004*/ uint32 dz_type;         // 1: Expedition, 2: Tutorial (purple), 3: Task, 4: Mission, 5: Quest (green)
+/*008*/ uint32 unknown008;
 /*012*/ float y;
 /*016*/ float x;
 /*020*/ float z;
 };
 
-struct ExpeditionCompass_Struct
+struct DynamicZoneCompass_Struct
 {
-/*000*/ uint32 clientid;
+/*000*/ uint32 client_id;
 /*004*/ uint32 count;
-/*008*/ ExpeditionCompassEntry_Struct entries[0];
+/*008*/ DynamicZoneCompassEntry_Struct entries[0];
 };
 
-struct ExpeditionJoinPrompt_Struct
+struct DynamicZoneChooseZoneEntry_Struct
 {
-/*000*/ uint32 clientid;
-/*004*/ char player_name[64];
-/*068*/ char expedition_name[64];
+/*000*/ uint16 dz_zone_id;     // dz_id pair
+/*002*/ uint16 dz_instance_id;
+/*004*/ uint32 unknown_id1;    // sent back in reply
+/*008*/ uint32 dz_type;        // 1: Expedition, 2: Tutorial, 3: Task, 4: Mission, 5: Quest -- sent back in reply
+/*012*/ uint32 unknown_id2;    // possibly an id based on dz type, for expeditions this was same as dz_id (zone|instance) but task dz was different
+/*016*/ char   description[1]; // variable length, null terminated, max 0x80 (128)
+/*000*/ char   leader_name[1]; // variable length, null terminated, max 0x40 (64)
+};
+
+struct DynamicZoneChooseZone_Struct
+{
+/*000*/ uint32 client_id;
+/*004*/ uint32 count;
+/*008*/ DynamicZoneChooseZoneEntry_Struct choices[0];
+};
+
+struct DynamicZoneChooseZoneReply_Struct
+{
+/*000*/ uint32 unknown000;
+/*004*/ uint32 unknown004;
+/*008*/ uint32 unknown_id1;
+/*012*/ uint16 dz_zone_id;
+/*014*/ uint16 dz_instance_id;
+/*016*/ uint32 dz_type;        // 1: Expedition, 2: Tutorial, 3: Task, 4: Mission, 5: Quest
+/*020*/ uint32 unknown_id2;
+/*024*/ uint32 unknown024;
+/*028*/ uint32 unknown028;     // always same as unknown040
+/*032*/ uint32 unknown032;
+/*036*/ uint32 unknown036;
+/*040*/ uint32 unknown040;     // always same as unknown028
+/*044*/ uint32 unknown044;
 };
 
 struct AltCurrencySelectItem_Struct {

common/patches/titanium.cpp

@@ -42,7 +42,7 @@ namespace Titanium
 	static OpcodeManager *opcodes = nullptr;
 	static Strategy struct_strategy;
 
-	void SerializeItem(EQEmu::OutBuffer& ob, const EQEmu::ItemInstance *inst, int16 slot_id_in, uint8 depth);
+	void SerializeItem(EQ::OutBuffer& ob, const EQ::ItemInstance *inst, int16 slot_id_in, uint8 depth);
 
 	// server to client inventory location converters
 	static inline int16 ServerToTitaniumSlot(uint32 server_slot);
@@ -58,8 +58,8 @@ namespace Titanium
 	// client to server say link converter
 	static inline void TitaniumToServerSayLink(std::string &server_saylink, const std::string &titanium_saylink);
 
-	static inline spells::CastingSlot ServerToTitaniumCastingSlot(EQEmu::spells::CastingSlot slot);
-	static inline EQEmu::spells::CastingSlot TitaniumToServerCastingSlot(spells::CastingSlot slot, uint32 item_location);
+	static inline spells::CastingSlot ServerToTitaniumCastingSlot(EQ::spells::CastingSlot slot);
+	static inline EQ::spells::CastingSlot TitaniumToServerCastingSlot(spells::CastingSlot slot, uint32 item_location);
 
 	static inline int ServerToTitaniumBuffSlot(int index);
 	static inline int TitaniumToServerBuffSlot(int index);
@@ -143,9 +143,9 @@ namespace Titanium
 		return(r);
 	}
 
-	const EQEmu::versions::ClientVersion Strategy::ClientVersion() const
+	const EQ::versions::ClientVersion Strategy::ClientVersion() const
 	{
-		return EQEmu::versions::ClientVersion::Titanium;
+		return EQ::versions::ClientVersion::Titanium;
 	}
 
 #include "ss_define.h"
@@ -320,22 +320,22 @@ namespace Titanium
 		//store away the emu struct
 		uchar* __emu_buffer = in->pBuffer;
 
-		int itemcount = in->size / sizeof(EQEmu::InternalSerializedItem_Struct);
-		if (itemcount == 0 || (in->size % sizeof(EQEmu::InternalSerializedItem_Struct)) != 0) {
+		int itemcount = in->size / sizeof(EQ::InternalSerializedItem_Struct);
+		if (itemcount == 0 || (in->size % sizeof(EQ::InternalSerializedItem_Struct)) != 0) {
 			Log(Logs::General, Logs::Netcode, "[STRUCTS] Wrong size on outbound %s: Got %d, expected multiple of %d",
-				opcodes->EmuToName(in->GetOpcode()), in->size, sizeof(EQEmu::InternalSerializedItem_Struct));
+				opcodes->EmuToName(in->GetOpcode()), in->size, sizeof(EQ::InternalSerializedItem_Struct));
 			delete in;
 			return;
 		}
 
-		EQEmu::InternalSerializedItem_Struct* eq = (EQEmu::InternalSerializedItem_Struct*)in->pBuffer;
+		EQ::InternalSerializedItem_Struct* eq = (EQ::InternalSerializedItem_Struct*)in->pBuffer;
 
 		//do the transform...
-		EQEmu::OutBuffer ob;
-		EQEmu::OutBuffer::pos_type last_pos = ob.tellp();
+		EQ::OutBuffer ob;
+		EQ::OutBuffer::pos_type last_pos = ob.tellp();
 
 		for (int r = 0; r < itemcount; r++, eq++) {
-			SerializeItem(ob, (const EQEmu::ItemInstance*)eq->inst, ServerToTitaniumSlot(eq->slot_id), 0);
+			SerializeItem(ob, (const EQ::ItemInstance*)eq->inst, ServerToTitaniumSlot(eq->slot_id), 0);
 			if (ob.tellp() == last_pos)
 				LogNetcode("Titanium::ENCODE(OP_CharInventory) Serialization failed on item slot [{}] during OP_CharInventory.  Item skipped", eq->slot_id);
 			
@@ -414,15 +414,48 @@ namespace Titanium
 		FINISH_ENCODE();
 	}
 
+	ENCODE(OP_DzChooseZone)
+	{
+		SETUP_VAR_ENCODE(DynamicZoneChooseZone_Struct);
+
+		SerializeBuffer buf;
+		buf.WriteUInt32(emu->client_id);
+		buf.WriteUInt32(emu->count);
+
+		for (uint32 i = 0; i < emu->count; ++i)
+		{
+			buf.WriteUInt16(emu->choices[i].dz_zone_id);
+			buf.WriteUInt16(emu->choices[i].dz_instance_id);
+			buf.WriteUInt32(emu->choices[i].unknown_id1);
+			buf.WriteUInt32(emu->choices[i].dz_type);
+			buf.WriteUInt32(emu->choices[i].unknown_id2);
+			buf.WriteString(emu->choices[i].description);
+			buf.WriteString(emu->choices[i].leader_name);
+		}
+
+		__packet->size = buf.size();
+		__packet->pBuffer = new unsigned char[__packet->size];
+		memcpy(__packet->pBuffer, buf.buffer(), __packet->size);
+
+		FINISH_ENCODE();
+	}
+
 	ENCODE(OP_DzCompass)
 	{
-		SETUP_VAR_ENCODE(ExpeditionCompass_Struct);
-		ALLOC_VAR_ENCODE(structs::ExpeditionCompass_Struct, sizeof(structs::ExpeditionInfo_Struct) + sizeof(structs::ExpeditionCompassEntry_Struct) * emu->count);
+		SETUP_VAR_ENCODE(DynamicZoneCompass_Struct);
+		ALLOC_VAR_ENCODE(structs::DynamicZoneCompass_Struct,
+			sizeof(structs::DynamicZoneCompass_Struct) +
+			sizeof(structs::DynamicZoneCompassEntry_Struct) * emu->count
+		);
 
+		OUT(client_id);
 		OUT(count);
 
 		for (uint32 i = 0; i < emu->count; ++i)
 		{
+			OUT(entries[i].dz_zone_id);
+			OUT(entries[i].dz_instance_id);
+			OUT(entries[i].dz_type);
 			OUT(entries[i].x);
 			OUT(entries[i].y);
 			OUT(entries[i].z);
@@ -446,80 +479,60 @@ namespace Titanium
 		ENCODE_LENGTH_EXACT(ExpeditionInfo_Struct);
 		SETUP_DIRECT_ENCODE(ExpeditionInfo_Struct, structs::ExpeditionInfo_Struct);
 
+		OUT(client_id);
+		OUT(assigned);
 		OUT(max_players);
-		eq->enabled_max = 1;
-		strcpy(eq->expedition_name, emu->expedition_name);
-		strcpy(eq->leader_name, emu->leader_name);
+		strn0cpy(eq->expedition_name, emu->expedition_name, sizeof(eq->expedition_name));
+		strn0cpy(eq->leader_name, emu->leader_name, sizeof(eq->leader_name));
 
 		FINISH_ENCODE();
 	}
 
-	ENCODE(OP_DzExpeditionList)
+	ENCODE(OP_DzExpeditionInvite)
 	{
-		SETUP_VAR_ENCODE(ExpeditionLockoutList_Struct);
+		ENCODE_LENGTH_EXACT(ExpeditionInvite_Struct);
+		SETUP_DIRECT_ENCODE(ExpeditionInvite_Struct, structs::ExpeditionInvite_Struct);
 
-		std::stringstream ss(std::stringstream::in | std::stringstream::out | std::stringstream::binary);
-		uint32 client_id = 0;
-		uint8 null_term = 0;
-		ss.write((const char*)&client_id, sizeof(uint32));
-		ss.write((const char*)&emu->count, sizeof(uint32));
+		OUT(client_id);
+		strn0cpy(eq->inviter_name, emu->inviter_name, sizeof(eq->inviter_name));
+		strn0cpy(eq->expedition_name, emu->expedition_name, sizeof(eq->expedition_name));
+		OUT(swapping);
+		strn0cpy(eq->swap_name, emu->swap_name, sizeof(eq->swap_name));
+		OUT(dz_zone_id);
+		OUT(dz_instance_id);
+
+		FINISH_ENCODE();
+	}
+
+	ENCODE(OP_DzExpeditionLockoutTimers)
+	{
+		SETUP_VAR_ENCODE(ExpeditionLockoutTimers_Struct);
+
+		SerializeBuffer buf;
+		buf.WriteUInt32(emu->client_id);
+		buf.WriteUInt32(emu->count);
 		for (uint32 i = 0; i < emu->count; ++i)
 		{
-			ss.write(emu->entries[i].expedition, strlen(emu->entries[i].expedition));
-			ss.write((const char*)&null_term, sizeof(char));
-			ss.write((const char*)&emu->entries[i].time_left, sizeof(uint32));
-			ss.write((const char*)&client_id, sizeof(uint32));
-			ss.write(emu->entries[i].expedition_event, strlen(emu->entries[i].expedition_event));
-			ss.write((const char*)&null_term, sizeof(char));
+			buf.WriteString(emu->timers[i].expedition_name);
+			buf.WriteUInt32(emu->timers[i].seconds_remaining);
+			buf.WriteInt32(emu->timers[i].event_type);
+			buf.WriteString(emu->timers[i].event_name);
 		}
 
-		__packet->size = ss.str().length();
+		__packet->size = buf.size();
 		__packet->pBuffer = new unsigned char[__packet->size];
-		memcpy(__packet->pBuffer, ss.str().c_str(), __packet->size);
+		memcpy(__packet->pBuffer, buf.buffer(), __packet->size);
 
 		FINISH_ENCODE();
 	}
 
-	ENCODE(OP_DzJoinExpeditionConfirm)
+	ENCODE(OP_DzSetLeaderName)
 	{
-		ENCODE_LENGTH_EXACT(ExpeditionJoinPrompt_Struct);
-		SETUP_DIRECT_ENCODE(ExpeditionJoinPrompt_Struct, structs::ExpeditionJoinPrompt_Struct);
+		ENCODE_LENGTH_EXACT(ExpeditionSetLeaderName_Struct);
+		SETUP_DIRECT_ENCODE(ExpeditionSetLeaderName_Struct, structs::ExpeditionSetLeaderName_Struct);
 
-		strcpy(eq->expedition_name, emu->expedition_name);
-		strcpy(eq->player_name, emu->player_name);
-
-		FINISH_ENCODE();
-	}
-
-	ENCODE(OP_DzLeaderStatus)
-	{
-		SETUP_VAR_ENCODE(ExpeditionLeaderSet_Struct);
-
-		std::stringstream ss(std::stringstream::in | std::stringstream::out | std::stringstream::binary);
-		uint32 client_id = 0;
-		uint8 null_term = 0;
-
-		ss.write((const char*)&client_id, sizeof(uint32));
-		//ss.write((const char*)&client_id, sizeof(uint32));
-		ss.write(emu->leader_name, strlen(emu->leader_name));
-		ss.write((const char*)&null_term, sizeof(char));
-		ss.write((const char*)&client_id, sizeof(uint32));
-		ss.write((const char*)&client_id, sizeof(uint32));//0xffffffff
-		ss.write((const char*)&client_id, sizeof(uint32));
-		ss.write((const char*)&client_id, sizeof(uint32));
-		ss.write((const char*)&client_id, sizeof(uint32));
-		ss.write((const char*)&client_id, sizeof(uint32));
-		ss.write((const char*)&client_id, sizeof(uint32));
-		ss.write((const char*)&client_id, sizeof(uint32));
-		ss.write((const char*)&client_id, sizeof(uint32));
-		ss.write((const char*)&client_id, sizeof(uint32));
-		ss.write((const char*)&client_id, sizeof(uint32));
-		ss.write((const char*)&client_id, sizeof(uint32));//1
-		ss.write((const char*)&client_id, sizeof(uint32));
-
-		__packet->size = ss.str().length();
-		__packet->pBuffer = new unsigned char[__packet->size];
-		memcpy(__packet->pBuffer, ss.str().c_str(), __packet->size);
+		OUT(client_id);
+		strn0cpy(eq->leader_name, emu->leader_name, sizeof(eq->leader_name));
 
 		FINISH_ENCODE();
 	}
@@ -528,26 +541,43 @@ namespace Titanium
 	{
 		SETUP_VAR_ENCODE(ExpeditionMemberList_Struct);
 
-		std::stringstream ss(std::stringstream::in | std::stringstream::out | std::stringstream::binary);
-
-		uint32 client_id = 0;
-		uint8 null_term = 0;
-		ss.write((const char*)&client_id, sizeof(uint32));
-		ss.write((const char*)&emu->count, sizeof(uint32));
-		for (uint32 i = 0; i < emu->count; ++i)
+		SerializeBuffer buf;
+		buf.WriteUInt32(emu->client_id);
+		buf.WriteUInt32(emu->member_count);
+		for (uint32 i = 0; i < emu->member_count; ++i)
 		{
-			ss.write(emu->entries[i].name, strlen(emu->entries[i].name));
-			ss.write((const char*)&null_term, sizeof(char));
-			ss.write((const char*)&emu->entries[i].status, sizeof(char));
+			buf.WriteString(emu->members[i].name);
+			buf.WriteUInt8(emu->members[i].expedition_status);
 		}
 
-		__packet->size = ss.str().length();
+		__packet->size = buf.size();
 		__packet->pBuffer = new unsigned char[__packet->size];
-		memcpy(__packet->pBuffer, ss.str().c_str(), __packet->size);
+		memcpy(__packet->pBuffer, buf.buffer(), __packet->size);
 
 		FINISH_ENCODE();
 	}
 
+	ENCODE(OP_DzMemberListName)
+	{
+		ENCODE_LENGTH_EXACT(ExpeditionMemberListName_Struct);
+		SETUP_DIRECT_ENCODE(ExpeditionMemberListName_Struct, structs::ExpeditionMemberListName_Struct);
+
+		OUT(client_id);
+		OUT(add_name);
+		strn0cpy(eq->name, emu->name, sizeof(eq->name));
+
+		FINISH_ENCODE();
+	}
+
+	ENCODE(OP_DzMemberListStatus)
+	{
+		auto emu = reinterpret_cast<ExpeditionMemberList_Struct*>((*p)->pBuffer);
+		if (emu->member_count == 1)
+		{
+			ENCODE_FORWARD(OP_DzMemberList);
+		}
+	}
+
 	ENCODE(OP_Emote)
 	{
 		EQApplicationPacket *in = *p;
@@ -796,14 +826,14 @@ namespace Titanium
 		OUT(TargetID);
 		OUT(playerid);
 
-		for (int i = EQEmu::invslot::slotCharm; i <= EQEmu::invslot::slotWaist; ++i) {
+		for (int i = EQ::invslot::slotCharm; i <= EQ::invslot::slotWaist; ++i) {
 			strn0cpy(eq->itemnames[i], emu->itemnames[i], sizeof(eq->itemnames[i]));
 			OUT(itemicons[i]);
 		}
 
 		// move ammo down to last element in titanium array
-		strn0cpy(eq->itemnames[invslot::slotAmmo], emu->itemnames[EQEmu::invslot::slotAmmo], sizeof(eq->itemnames[invslot::slotAmmo]));
-		eq->itemicons[invslot::slotAmmo] = emu->itemicons[EQEmu::invslot::slotAmmo];
+		strn0cpy(eq->itemnames[invslot::slotAmmo], emu->itemnames[EQ::invslot::slotAmmo], sizeof(eq->itemnames[invslot::slotAmmo]));
+		eq->itemicons[invslot::slotAmmo] = emu->itemicons[EQ::invslot::slotAmmo];
 
 		strn0cpy(eq->text, emu->text, sizeof(eq->text));
 
@@ -832,14 +862,14 @@ namespace Titanium
 		//store away the emu struct
 		uchar* __emu_buffer = in->pBuffer;
 		
-		EQEmu::InternalSerializedItem_Struct* int_struct = (EQEmu::InternalSerializedItem_Struct*)(&__emu_buffer[4]);
+		EQ::InternalSerializedItem_Struct* int_struct = (EQ::InternalSerializedItem_Struct*)(&__emu_buffer[4]);
 
-		EQEmu::OutBuffer ob;
-		EQEmu::OutBuffer::pos_type last_pos = ob.tellp();
+		EQ::OutBuffer ob;
+		EQ::OutBuffer::pos_type last_pos = ob.tellp();
 
 		ob.write((const char*)__emu_buffer, 4);
 
-		SerializeItem(ob, (const EQEmu::ItemInstance*)int_struct->inst, ServerToTitaniumSlot(int_struct->slot_id), 0);
+		SerializeItem(ob, (const EQ::ItemInstance*)int_struct->inst, ServerToTitaniumSlot(int_struct->slot_id), 0);
 		if (ob.tellp() == last_pos) {
 			LogNetcode("Titanium::ENCODE(OP_ItemPacket) Serialization failed on item slot [{}]", int_struct->slot_id);
 			delete in;
@@ -909,7 +939,7 @@ namespace Titanium
 
 		// Since HT/LoH are translated up, we need to translate down only for memSpellSpellbar case
 		if (emu->scribing == 3)
-			eq->slot = static_cast<uint32>(ServerToTitaniumCastingSlot(static_cast<EQEmu::spells::CastingSlot>(emu->slot)));
+			eq->slot = static_cast<uint32>(ServerToTitaniumCastingSlot(static_cast<EQ::spells::CastingSlot>(emu->slot)));
 		else
 			OUT(slot);
 		OUT(spell_id);
@@ -1009,7 +1039,7 @@ namespace Titanium
 		OUT(hairstyle);
 		OUT(beard);
 		//	OUT(unknown00178[10]);
-		for (r = EQEmu::textures::textureBegin; r < EQEmu::textures::materialCount; r++) {
+		for (r = EQ::textures::textureBegin; r < EQ::textures::materialCount; r++) {
 			OUT(item_material.Slot[r].Material);
 			OUT(item_tint.Slot[r].Color);
 		}
@@ -1032,7 +1062,7 @@ namespace Titanium
 		OUT(face);
 		//	OUT(unknown02264[47]);
 
-		if (spells::SPELLBOOK_SIZE <= EQEmu::spells::SPELLBOOK_SIZE) {
+		if (spells::SPELLBOOK_SIZE <= EQ::spells::SPELLBOOK_SIZE) {
 			for (uint32 r = 0; r < spells::SPELLBOOK_SIZE; r++) {
 				if (emu->spell_book[r] <= spells::SPELL_ID_MAX)
 					eq->spell_book[r] = emu->spell_book[r];
@@ -1041,14 +1071,14 @@ namespace Titanium
 			}
 		}
 		else {
-			for (uint32 r = 0; r < EQEmu::spells::SPELLBOOK_SIZE; r++) {
+			for (uint32 r = 0; r < EQ::spells::SPELLBOOK_SIZE; r++) {
 				if (emu->spell_book[r] <= spells::SPELL_ID_MAX)
 					eq->spell_book[r] = emu->spell_book[r];
 				else
 					eq->spell_book[r] = 0xFFFFFFFFU;
 			}
 			// invalidate the rest of the spellbook slots
-			memset(&eq->spell_book[EQEmu::spells::SPELLBOOK_SIZE], 0xFF, (sizeof(uint32) * (spells::SPELLBOOK_SIZE - EQEmu::spells::SPELLBOOK_SIZE)));
+			memset(&eq->spell_book[EQ::spells::SPELLBOOK_SIZE], 0xFF, (sizeof(uint32) * (spells::SPELLBOOK_SIZE - EQ::spells::SPELLBOOK_SIZE)));
 		}
 
 		//	OUT(unknown4184[448]);
@@ -1092,7 +1122,7 @@ namespace Titanium
 		//	OUT(unknown06160[4]);
 
 		// Copy bandoliers where server and client indices converge
-		for (r = 0; r < EQEmu::profile::BANDOLIERS_SIZE && r < profile::BANDOLIERS_SIZE; ++r) {
+		for (r = 0; r < EQ::profile::BANDOLIERS_SIZE && r < profile::BANDOLIERS_SIZE; ++r) {
 			OUT_str(bandoliers[r].Name);
 			for (uint32 k = 0; k < profile::BANDOLIER_ITEM_COUNT; ++k) { // Will need adjusting if 'server != client' is ever true
 				OUT(bandoliers[r].Items[k].ID);
@@ -1101,7 +1131,7 @@ namespace Titanium
 			}
 		}
 		// Nullify bandoliers where server and client indices diverge, with a client bias
-		for (r = EQEmu::profile::BANDOLIERS_SIZE; r < profile::BANDOLIERS_SIZE; ++r) {
+		for (r = EQ::profile::BANDOLIERS_SIZE; r < profile::BANDOLIERS_SIZE; ++r) {
 			eq->bandoliers[r].Name[0] = '\0';
 			for (uint32 k = 0; k < profile::BANDOLIER_ITEM_COUNT; ++k) { // Will need adjusting if 'server != client' is ever true
 				eq->bandoliers[r].Items[k].ID = 0;
@@ -1113,13 +1143,13 @@ namespace Titanium
 		//	OUT(unknown07444[5120]);
 
 		// Copy potion belt where server and client indices converge
-		for (r = 0; r < EQEmu::profile::POTION_BELT_SIZE && r < profile::POTION_BELT_SIZE; ++r) {
+		for (r = 0; r < EQ::profile::POTION_BELT_SIZE && r < profile::POTION_BELT_SIZE; ++r) {
 			OUT(potionbelt.Items[r].ID);
 			OUT(potionbelt.Items[r].Icon);
 			OUT_str(potionbelt.Items[r].Name);
 		}
 		// Nullify potion belt where server and client indices diverge, with a client bias
-		for (r = EQEmu::profile::POTION_BELT_SIZE; r < profile::POTION_BELT_SIZE; ++r) {
+		for (r = EQ::profile::POTION_BELT_SIZE; r < profile::POTION_BELT_SIZE; ++r) {
 			eq->potionbelt.Items[r].ID = 0;
 			eq->potionbelt.Items[r].Icon = 0;
 			eq->potionbelt.Items[r].Name[0] = '\0';
@@ -1349,14 +1379,14 @@ namespace Titanium
 			if (eq->Race[char_index] > 473)
 				eq->Race[char_index] = 1;
 
-			for (int index = 0; index < EQEmu::textures::materialCount; ++index) {
+			for (int index = 0; index < EQ::textures::materialCount; ++index) {
 				eq->CS_Colors[char_index].Slot[index].Color = emu_cse->Equip[index].Color;
 			}
 
 			eq->BeardColor[char_index] = emu_cse->BeardColor;
 			eq->HairStyle[char_index] = emu_cse->HairStyle;
 
-			for (int index = 0; index < EQEmu::textures::materialCount; ++index) {
+			for (int index = 0; index < EQ::textures::materialCount; ++index) {
 				eq->Equip[char_index].Slot[index].Material = emu_cse->Equip[index].Material;
 			}
 
@@ -1386,14 +1416,14 @@ namespace Titanium
 		for (; char_index < 10; ++char_index) {
 			eq->Race[char_index] = 0;
 
-			for (int index = 0; index < EQEmu::textures::materialCount; ++index) {
+			for (int index = 0; index < EQ::textures::materialCount; ++index) {
 				eq->CS_Colors[char_index].Slot[index].Color = 0;
 			}
 
 			eq->BeardColor[char_index] = 0;
 			eq->HairStyle[char_index] = 0;
 
-			for (int index = 0; index < EQEmu::textures::materialCount; ++index) {
+			for (int index = 0; index < EQ::textures::materialCount; ++index) {
 				eq->Equip[char_index].Slot[index].Material = 0;
 			}
 
@@ -1717,7 +1747,7 @@ namespace Titanium
 			eq->petOwnerId = emu->petOwnerId;
 			eq->guildrank = emu->guildrank;
 			//		eq->unknown0194[3] = emu->unknown0194[3];
-			for (k = EQEmu::textures::textureBegin; k < EQEmu::textures::materialCount; k++) {
+			for (k = EQ::textures::textureBegin; k < EQ::textures::materialCount; k++) {
 				eq->equipment.Slot[k].Material = emu->equipment.Slot[k].Material;
 				eq->equipment_tint.Slot[k].Color = emu->equipment_tint.Slot[k].Color;
 			}
@@ -1830,7 +1860,7 @@ namespace Titanium
 		DECODE_LENGTH_EXACT(structs::BugReport_Struct);
 		SETUP_DIRECT_DECODE(BugReport_Struct, structs::BugReport_Struct);
 
-		emu->category_id = EQEmu::bug::CategoryNameToCategoryID(eq->category_name);
+		emu->category_id = EQ::bug::CategoryNameToCategoryID(eq->category_name);
 		memcpy(emu->category_name, eq, sizeof(structs::BugReport_Struct));
 
 		FINISH_DIRECT_DECODE();
@@ -1943,6 +1973,83 @@ namespace Titanium
 		FINISH_DIRECT_DECODE();
 	}
 
+	DECODE(OP_DzAddPlayer)
+	{
+		DECODE_LENGTH_EXACT(structs::ExpeditionCommand_Struct);
+		SETUP_DIRECT_DECODE(ExpeditionCommand_Struct, structs::ExpeditionCommand_Struct);
+
+		strn0cpy(emu->name, eq->name, sizeof(emu->name));
+
+		FINISH_DIRECT_DECODE();
+	}
+
+	DECODE(OP_DzChooseZoneReply)
+	{
+		DECODE_LENGTH_EXACT(structs::DynamicZoneChooseZoneReply_Struct);
+		SETUP_DIRECT_DECODE(DynamicZoneChooseZoneReply_Struct, structs::DynamicZoneChooseZoneReply_Struct);
+
+		emu->unknown000 = eq->unknown000;
+		emu->unknown008 = eq->unknown004;
+		IN(unknown_id1);
+		IN(dz_zone_id);
+		IN(dz_instance_id);
+		IN(dz_type);
+		IN(unknown_id2);
+		emu->unknown028 = eq->unknown024;
+		emu->unknown032 = eq->unknown028;
+		emu->unknown036 = eq->unknown032;
+		emu->unknown040 = eq->unknown036;
+		emu->unknown044 = eq->unknown040;
+		emu->unknown048 = eq->unknown044;
+
+		FINISH_DIRECT_DECODE();
+	}
+
+	DECODE(OP_DzExpeditionInviteResponse)
+	{
+		DECODE_LENGTH_EXACT(structs::ExpeditionInviteResponse_Struct);
+		SETUP_DIRECT_DECODE(ExpeditionInviteResponse_Struct, structs::ExpeditionInviteResponse_Struct);
+
+		IN(dz_zone_id);
+		IN(dz_instance_id);
+		IN(accepted);
+		IN(swapping);
+		strn0cpy(emu->swap_name, eq->swap_name, sizeof(emu->swap_name));
+
+		FINISH_DIRECT_DECODE();
+	}
+
+	DECODE(OP_DzMakeLeader)
+	{
+		DECODE_LENGTH_EXACT(structs::ExpeditionCommand_Struct);
+		SETUP_DIRECT_DECODE(ExpeditionCommand_Struct, structs::ExpeditionCommand_Struct);
+
+		strn0cpy(emu->name, eq->name, sizeof(emu->name));
+
+		FINISH_DIRECT_DECODE();
+	}
+
+	DECODE(OP_DzRemovePlayer)
+	{
+		DECODE_LENGTH_EXACT(structs::ExpeditionCommand_Struct);
+		SETUP_DIRECT_DECODE(ExpeditionCommand_Struct, structs::ExpeditionCommand_Struct);
+
+		strn0cpy(emu->name, eq->name, sizeof(emu->name));
+
+		FINISH_DIRECT_DECODE();
+	}
+
+	DECODE(OP_DzSwapPlayer)
+	{
+		DECODE_LENGTH_EXACT(structs::ExpeditionCommandSwap_Struct);
+		SETUP_DIRECT_DECODE(ExpeditionCommandSwap_Struct, structs::ExpeditionCommandSwap_Struct);
+
+		strn0cpy(emu->add_player_name, eq->add_player_name, sizeof(emu->add_player_name));
+		strn0cpy(emu->rem_player_name, eq->rem_player_name, sizeof(emu->rem_player_name));
+
+		FINISH_DIRECT_DECODE();
+	}
+
 	DECODE(OP_Emote)
 	{
 		unsigned char *__eq_buffer = __packet->pBuffer;
@@ -1993,12 +2100,12 @@ namespace Titanium
 		}
 
 		// move ammo up to last element in server array
-		strn0cpy(emu->itemnames[EQEmu::invslot::slotAmmo], eq->itemnames[invslot::slotAmmo], sizeof(emu->itemnames[EQEmu::invslot::slotAmmo]));
-		emu->itemicons[EQEmu::invslot::slotAmmo] = eq->itemicons[invslot::slotAmmo];
+		strn0cpy(emu->itemnames[EQ::invslot::slotAmmo], eq->itemnames[invslot::slotAmmo], sizeof(emu->itemnames[EQ::invslot::slotAmmo]));
+		emu->itemicons[EQ::invslot::slotAmmo] = eq->itemicons[invslot::slotAmmo];
 
 		// nullify power source element in server array
-		strn0cpy(emu->itemnames[EQEmu::invslot::slotPowerSource], "", sizeof(emu->itemnames[EQEmu::invslot::slotPowerSource]));
-		emu->itemicons[EQEmu::invslot::slotPowerSource] = 0xFFFFFFFF;
+		strn0cpy(emu->itemnames[EQ::invslot::slotPowerSource], "", sizeof(emu->itemnames[EQ::invslot::slotPowerSource]));
+		emu->itemicons[EQ::invslot::slotPowerSource] = 0xFFFFFFFF;
 
 		strn0cpy(emu->text, eq->text, sizeof(emu->text));
 
@@ -2053,7 +2160,7 @@ namespace Titanium
 
 		for (int i = 0; i < spells::SPELL_GEM_COUNT; ++i)
 			IN(spell[i]);
-		for (int i = spells::SPELL_GEM_COUNT; i < EQEmu::spells::SPELL_GEM_COUNT; ++i)
+		for (int i = spells::SPELL_GEM_COUNT; i < EQ::spells::SPELL_GEM_COUNT; ++i)
 			emu->spell[i] = 0xFFFFFFFF;
 
 		IN(unknown);
@@ -2273,9 +2380,9 @@ namespace Titanium
 	}
 
 // file scope helper methods
-	void SerializeItem(EQEmu::OutBuffer& ob, const EQEmu::ItemInstance *inst, int16 slot_id_in, uint8 depth) {
+	void SerializeItem(EQ::OutBuffer& ob, const EQ::ItemInstance *inst, int16 slot_id_in, uint8 depth) {
 		const char *protection      = "\\\\\\\\\\";
-		const EQEmu::ItemData *item = inst->GetUnscaledItem();
+		const EQ::ItemData *item = inst->GetUnscaledItem();
 
 		ob << StringFormat(
 			"%.*s%s",
@@ -2293,7 +2400,7 @@ namespace Titanium
 		ob << '|' << itoa((!inst->GetMerchantSlot() ? inst->GetSerialNumber()
 			: inst->GetMerchantSlot())); // merchant serial number
 		ob << '|' << itoa(inst->GetRecastTimestamp()); // recast timestamp
-		ob << '|' << itoa(((inst->IsStackable() ? ((inst->GetItem()->ItemType == EQEmu::item::ItemTypePotion) ? 1 : 0)
+		ob << '|' << itoa(((inst->IsStackable() ? ((inst->GetItem()->ItemType == EQ::item::ItemTypePotion) ? 1 : 0)
 			: inst->GetCharges()))); // charge count
 		ob << '|' << itoa((inst->IsAttuned() ? 1 : 0)); // inst attuned
 		ob << '|' << itoa(0); // unknown
@@ -2502,10 +2609,10 @@ namespace Titanium
 		ob << StringFormat("%.*s\"", depth, protection); // Quotes (and protection, if needed) around static data
 
 		// Sub data
-		for (int index = EQEmu::invbag::SLOT_BEGIN; index <= invbag::SLOT_END; ++index) {
+		for (int index = EQ::invbag::SLOT_BEGIN; index <= invbag::SLOT_END; ++index) {
 			ob << '|';
 
-			EQEmu::ItemInstance *sub = inst->GetItem(index);
+			EQ::ItemInstance *sub = inst->GetItem(index);
 			if (!sub)
 				continue;
 
@@ -2525,59 +2632,59 @@ namespace Titanium
 	static inline int16 ServerToTitaniumSlot(uint32 server_slot) {
 		int16 titanium_slot = invslot::SLOT_INVALID;
 
-		if (server_slot <= EQEmu::invslot::slotWaist) {
+		if (server_slot <= EQ::invslot::slotWaist) {
 			titanium_slot = server_slot;
 		}
-		else if (server_slot == EQEmu::invslot::slotAmmo) {
+		else if (server_slot == EQ::invslot::slotAmmo) {
 			titanium_slot = server_slot - 1;
 		}
-		else if (server_slot <= EQEmu::invslot::slotGeneral8 && server_slot >= EQEmu::invslot::slotGeneral1) {
+		else if (server_slot <= EQ::invslot::slotGeneral8 && server_slot >= EQ::invslot::slotGeneral1) {
 			titanium_slot = server_slot - 1;
 		}
-		else if (server_slot <= (EQEmu::invslot::POSSESSIONS_COUNT + EQEmu::invslot::slotWaist) &&
-				 server_slot >= EQEmu::invslot::slotCursor) {
+		else if (server_slot <= (EQ::invslot::POSSESSIONS_COUNT + EQ::invslot::slotWaist) &&
+				 server_slot >= EQ::invslot::slotCursor) {
 			titanium_slot = server_slot - 3;
 		}
-		else if (server_slot == (EQEmu::invslot::POSSESSIONS_COUNT + EQEmu::invslot::slotAmmo)) {
+		else if (server_slot == (EQ::invslot::POSSESSIONS_COUNT + EQ::invslot::slotAmmo)) {
 			titanium_slot = server_slot - 4;
 		}
-		else if (server_slot <= EQEmu::invbag::GENERAL_BAGS_8_END &&
-				 server_slot >= EQEmu::invbag::GENERAL_BAGS_BEGIN) {
+		else if (server_slot <= EQ::invbag::GENERAL_BAGS_8_END &&
+				 server_slot >= EQ::invbag::GENERAL_BAGS_BEGIN) {
 			titanium_slot = server_slot;
 		}
-		else if (server_slot <= EQEmu::invbag::CURSOR_BAG_END && server_slot >= EQEmu::invbag::CURSOR_BAG_BEGIN) {
+		else if (server_slot <= EQ::invbag::CURSOR_BAG_END && server_slot >= EQ::invbag::CURSOR_BAG_BEGIN) {
 			titanium_slot = server_slot - 20;
 		}
-		else if (server_slot <= EQEmu::invslot::TRIBUTE_END && server_slot >= EQEmu::invslot::TRIBUTE_BEGIN) {
+		else if (server_slot <= EQ::invslot::TRIBUTE_END && server_slot >= EQ::invslot::TRIBUTE_BEGIN) {
 			titanium_slot = server_slot;
 		}
-		else if (server_slot <= EQEmu::invslot::GUILD_TRIBUTE_END &&
-				 server_slot >= EQEmu::invslot::GUILD_TRIBUTE_BEGIN) {
+		else if (server_slot <= EQ::invslot::GUILD_TRIBUTE_END &&
+				 server_slot >= EQ::invslot::GUILD_TRIBUTE_BEGIN) {
 			titanium_slot = server_slot;
 		}
-		else if (server_slot == EQEmu::invslot::SLOT_TRADESKILL_EXPERIMENT_COMBINE) {
+		else if (server_slot == EQ::invslot::SLOT_TRADESKILL_EXPERIMENT_COMBINE) {
 			titanium_slot = server_slot;
 		}
-		else if (server_slot <= EQEmu::invslot::BANK_END && server_slot >= EQEmu::invslot::BANK_BEGIN) {
+		else if (server_slot <= EQ::invslot::BANK_END && server_slot >= EQ::invslot::BANK_BEGIN) {
 			titanium_slot = server_slot;
 		}
-		else if (server_slot <= EQEmu::invbag::BANK_BAGS_16_END && server_slot >= EQEmu::invbag::BANK_BAGS_BEGIN) {
+		else if (server_slot <= EQ::invbag::BANK_BAGS_16_END && server_slot >= EQ::invbag::BANK_BAGS_BEGIN) {
 			titanium_slot = server_slot;
 		}
-		else if (server_slot <= EQEmu::invslot::SHARED_BANK_END && server_slot >= EQEmu::invslot::SHARED_BANK_BEGIN) {
+		else if (server_slot <= EQ::invslot::SHARED_BANK_END && server_slot >= EQ::invslot::SHARED_BANK_BEGIN) {
 			titanium_slot = server_slot;
 		}
-		else if (server_slot <= EQEmu::invbag::SHARED_BANK_BAGS_END &&
-				 server_slot >= EQEmu::invbag::SHARED_BANK_BAGS_BEGIN) {
+		else if (server_slot <= EQ::invbag::SHARED_BANK_BAGS_END &&
+				 server_slot >= EQ::invbag::SHARED_BANK_BAGS_BEGIN) {
 			titanium_slot = server_slot;
 		}
-		else if (server_slot <= EQEmu::invslot::TRADE_END && server_slot >= EQEmu::invslot::TRADE_BEGIN) {
+		else if (server_slot <= EQ::invslot::TRADE_END && server_slot >= EQ::invslot::TRADE_BEGIN) {
 			titanium_slot = server_slot;
 		}
-		else if (server_slot <= EQEmu::invbag::TRADE_BAGS_END && server_slot >= EQEmu::invbag::TRADE_BAGS_BEGIN) {
+		else if (server_slot <= EQ::invbag::TRADE_BAGS_END && server_slot >= EQ::invbag::TRADE_BAGS_BEGIN) {
 			titanium_slot = server_slot;
 		}
-		else if (server_slot <= EQEmu::invslot::WORLD_END && server_slot >= EQEmu::invslot::WORLD_BEGIN) {
+		else if (server_slot <= EQ::invslot::WORLD_END && server_slot >= EQ::invslot::WORLD_BEGIN) {
 			titanium_slot = server_slot;
 		}
 
@@ -2590,16 +2697,16 @@ namespace Titanium
 	static inline int16 ServerToTitaniumCorpseSlot(uint32 server_corpse_slot) {
 		int16 titanium_slot = invslot::SLOT_INVALID;
 
-		if (server_corpse_slot <= EQEmu::invslot::slotGeneral8 && server_corpse_slot >= EQEmu::invslot::slotGeneral1) {
+		if (server_corpse_slot <= EQ::invslot::slotGeneral8 && server_corpse_slot >= EQ::invslot::slotGeneral1) {
 			titanium_slot = server_corpse_slot - 1;
 		}
 
-		else if (server_corpse_slot <= (EQEmu::invslot::POSSESSIONS_COUNT + EQEmu::invslot::slotWaist) &&
-				 server_corpse_slot >= EQEmu::invslot::slotCursor) {
+		else if (server_corpse_slot <= (EQ::invslot::POSSESSIONS_COUNT + EQ::invslot::slotWaist) &&
+				 server_corpse_slot >= EQ::invslot::slotCursor) {
 			titanium_slot = server_corpse_slot - 3;
 		}
 
-		else if (server_corpse_slot == (EQEmu::invslot::POSSESSIONS_COUNT + EQEmu::invslot::slotAmmo)) {
+		else if (server_corpse_slot == (EQ::invslot::POSSESSIONS_COUNT + EQ::invslot::slotAmmo)) {
 			titanium_slot = server_corpse_slot - 4;
 		}
 
@@ -2613,7 +2720,7 @@ namespace Titanium
 	}
 
 	static inline uint32 TitaniumToServerSlot(int16 titanium_slot) {
-		uint32 server_slot = EQEmu::invslot::SLOT_INVALID;
+		uint32 server_slot = EQ::invslot::SLOT_INVALID;
 
 		if (titanium_slot <= invslot::slotWaist) {
 			server_slot = titanium_slot;
@@ -2675,7 +2782,7 @@ namespace Titanium
 
 	static inline uint32 TitaniumToServerCorpseSlot(int16 titanium_corpse_slot)
 	{
-		uint32 server_slot = EQEmu::invslot::SLOT_INVALID;
+		uint32 server_slot = EQ::invslot::SLOT_INVALID;
 
 		if (titanium_corpse_slot <= invslot::slotGeneral8 && titanium_corpse_slot >= invslot::slotGeneral1) {
 			server_slot = titanium_corpse_slot + 1;
@@ -2696,7 +2803,7 @@ namespace Titanium
 
 	static inline void ServerToTitaniumSayLink(std::string &titanium_saylink, const std::string &server_saylink)
 	{
-		if ((constants::SAY_LINK_BODY_SIZE == EQEmu::constants::SAY_LINK_BODY_SIZE) || (server_saylink.find('\x12') == std::string::npos)) {
+		if ((constants::SAY_LINK_BODY_SIZE == EQ::constants::SAY_LINK_BODY_SIZE) || (server_saylink.find('\x12') == std::string::npos)) {
 			titanium_saylink = server_saylink;
 			return;
 		}
@@ -2705,7 +2812,7 @@ namespace Titanium
 
 		for (size_t segment_iter = 0; segment_iter < segments.size(); ++segment_iter) {
 			if (segment_iter & 1) {
-				if (segments[segment_iter].length() <= EQEmu::constants::SAY_LINK_BODY_SIZE) {
+				if (segments[segment_iter].length() <= EQ::constants::SAY_LINK_BODY_SIZE) {
 					titanium_saylink.append(segments[segment_iter]);
 					// TODO: log size mismatch error
 					continue;
@@ -2736,7 +2843,7 @@ namespace Titanium
 
 	static inline void TitaniumToServerSayLink(std::string &server_saylink, const std::string &titanium_saylink)
 	{
-		if ((EQEmu::constants::SAY_LINK_BODY_SIZE == constants::SAY_LINK_BODY_SIZE) || (titanium_saylink.find('\x12') == std::string::npos)) {
+		if ((EQ::constants::SAY_LINK_BODY_SIZE == constants::SAY_LINK_BODY_SIZE) || (titanium_saylink.find('\x12') == std::string::npos)) {
 			server_saylink = titanium_saylink;
 			return;
 		}
@@ -2772,85 +2879,85 @@ namespace Titanium
 		}
 	}
 
-	static inline spells::CastingSlot ServerToTitaniumCastingSlot(EQEmu::spells::CastingSlot slot) {
+	static inline spells::CastingSlot ServerToTitaniumCastingSlot(EQ::spells::CastingSlot slot) {
 		switch (slot) {
-			case EQEmu::spells::CastingSlot::Gem1:
+			case EQ::spells::CastingSlot::Gem1:
 				return spells::CastingSlot::Gem1;
-			case EQEmu::spells::CastingSlot::Gem2:
+			case EQ::spells::CastingSlot::Gem2:
 				return spells::CastingSlot::Gem2;
-			case EQEmu::spells::CastingSlot::Gem3:
+			case EQ::spells::CastingSlot::Gem3:
 				return spells::CastingSlot::Gem3;
-			case EQEmu::spells::CastingSlot::Gem4:
+			case EQ::spells::CastingSlot::Gem4:
 				return spells::CastingSlot::Gem4;
-			case EQEmu::spells::CastingSlot::Gem5:
+			case EQ::spells::CastingSlot::Gem5:
 				return spells::CastingSlot::Gem5;
-			case EQEmu::spells::CastingSlot::Gem6:
+			case EQ::spells::CastingSlot::Gem6:
 				return spells::CastingSlot::Gem6;
-			case EQEmu::spells::CastingSlot::Gem7:
+			case EQ::spells::CastingSlot::Gem7:
 				return spells::CastingSlot::Gem7;
-			case EQEmu::spells::CastingSlot::Gem8:
+			case EQ::spells::CastingSlot::Gem8:
 				return spells::CastingSlot::Gem8;
-			case EQEmu::spells::CastingSlot::Gem9:
+			case EQ::spells::CastingSlot::Gem9:
 				return spells::CastingSlot::Gem9;
-			case EQEmu::spells::CastingSlot::Item:
+			case EQ::spells::CastingSlot::Item:
 				return spells::CastingSlot::Item;
-			case EQEmu::spells::CastingSlot::PotionBelt:
+			case EQ::spells::CastingSlot::PotionBelt:
 				return spells::CastingSlot::PotionBelt;
-			case EQEmu::spells::CastingSlot::Discipline:
+			case EQ::spells::CastingSlot::Discipline:
 				return spells::CastingSlot::Discipline;
-			case EQEmu::spells::CastingSlot::AltAbility:
+			case EQ::spells::CastingSlot::AltAbility:
 				return spells::CastingSlot::AltAbility;
 			default: // we shouldn't have any issues with other slots ... just return something
 				return spells::CastingSlot::Discipline;
 		}
 	}
 
-	static inline EQEmu::spells::CastingSlot TitaniumToServerCastingSlot(spells::CastingSlot slot, uint32 item_location) {
+	static inline EQ::spells::CastingSlot TitaniumToServerCastingSlot(spells::CastingSlot slot, uint32 item_location) {
 		switch (slot) {
 			case spells::CastingSlot::Gem1:
-				return EQEmu::spells::CastingSlot::Gem1;
+				return EQ::spells::CastingSlot::Gem1;
 			case spells::CastingSlot::Gem2:
-				return EQEmu::spells::CastingSlot::Gem2;
+				return EQ::spells::CastingSlot::Gem2;
 			case spells::CastingSlot::Gem3:
-				return EQEmu::spells::CastingSlot::Gem3;
+				return EQ::spells::CastingSlot::Gem3;
 			case spells::CastingSlot::Gem4:
-				return EQEmu::spells::CastingSlot::Gem4;
+				return EQ::spells::CastingSlot::Gem4;
 			case spells::CastingSlot::Gem5:
-				return EQEmu::spells::CastingSlot::Gem5;
+				return EQ::spells::CastingSlot::Gem5;
 			case spells::CastingSlot::Gem6:
-				return EQEmu::spells::CastingSlot::Gem6;
+				return EQ::spells::CastingSlot::Gem6;
 			case spells::CastingSlot::Gem7:
-				return EQEmu::spells::CastingSlot::Gem7;
+				return EQ::spells::CastingSlot::Gem7;
 			case spells::CastingSlot::Gem8:
-				return EQEmu::spells::CastingSlot::Gem8;
+				return EQ::spells::CastingSlot::Gem8;
 			case spells::CastingSlot::Gem9:
-				return EQEmu::spells::CastingSlot::Gem9;
+				return EQ::spells::CastingSlot::Gem9;
 			case spells::CastingSlot::Ability:
-				return EQEmu::spells::CastingSlot::Ability;
+				return EQ::spells::CastingSlot::Ability;
 				// Tit uses 10 for item and discipline casting, but items have a valid location
 			case spells::CastingSlot::Item:
 				if (item_location == INVALID_INDEX)
-					return EQEmu::spells::CastingSlot::Discipline;
+					return EQ::spells::CastingSlot::Discipline;
 				else
-					return EQEmu::spells::CastingSlot::Item;
+					return EQ::spells::CastingSlot::Item;
 			case spells::CastingSlot::PotionBelt:
-				return EQEmu::spells::CastingSlot::PotionBelt;
+				return EQ::spells::CastingSlot::PotionBelt;
 			case spells::CastingSlot::AltAbility:
-				return EQEmu::spells::CastingSlot::AltAbility;
+				return EQ::spells::CastingSlot::AltAbility;
 			default: // we shouldn't have any issues with other slots ... just return something
-				return EQEmu::spells::CastingSlot::Discipline;
+				return EQ::spells::CastingSlot::Discipline;
 		}
 	}
 
 	static inline int ServerToTitaniumBuffSlot(int index)
 	{
 		// we're a disc
-		if (index >= EQEmu::spells::LONG_BUFFS + EQEmu::spells::SHORT_BUFFS)
-			return index - EQEmu::spells::LONG_BUFFS - EQEmu::spells::SHORT_BUFFS +
+		if (index >= EQ::spells::LONG_BUFFS + EQ::spells::SHORT_BUFFS)
+			return index - EQ::spells::LONG_BUFFS - EQ::spells::SHORT_BUFFS +
 			       spells::LONG_BUFFS + spells::SHORT_BUFFS;
 		// we're a song
-		if (index >= EQEmu::spells::LONG_BUFFS)
-			return index - EQEmu::spells::LONG_BUFFS + spells::LONG_BUFFS;
+		if (index >= EQ::spells::LONG_BUFFS)
+			return index - EQ::spells::LONG_BUFFS + spells::LONG_BUFFS;
 		// we're a normal buff
 		return index; // as long as we guard against bad slots server side, we should be fine
 	}
@@ -2859,11 +2966,11 @@ namespace Titanium
 	{
 		// we're a disc
 		if (index >= spells::LONG_BUFFS + spells::SHORT_BUFFS)
-			return index - spells::LONG_BUFFS - spells::SHORT_BUFFS + EQEmu::spells::LONG_BUFFS +
-			       EQEmu::spells::SHORT_BUFFS;
+			return index - spells::LONG_BUFFS - spells::SHORT_BUFFS + EQ::spells::LONG_BUFFS +
+			       EQ::spells::SHORT_BUFFS;
 		// we're a song
 		if (index >= spells::LONG_BUFFS)
-			return index - spells::LONG_BUFFS + EQEmu::spells::LONG_BUFFS;
+			return index - spells::LONG_BUFFS + EQ::spells::LONG_BUFFS;
 		// we're a normal buff
 		return index; // as long as we guard against bad slots server side, we should be fine
 	}

common/patches/titanium.h

@@ -43,7 +43,7 @@ namespace Titanium
 	protected:
 
 		virtual std::string Describe() const;
-		virtual const EQEmu::versions::ClientVersion ClientVersion() const;
+		virtual const EQ::versions::ClientVersion ClientVersion() const;
 
 		//magic macro to declare our opcode processors
 		#include "ss_declare.h"

common/patches/titanium_limits.h

@@ -31,7 +31,7 @@ namespace Titanium
 	const int16 INULL = 0;
 
 	namespace inventory {
-		inline EQEmu::versions::ClientVersion GetInventoryRef() { return EQEmu::versions::ClientVersion::Titanium; }
+		inline EQ::versions::ClientVersion GetInventoryRef() { return EQ::versions::ClientVersion::Titanium; }
 
 		const bool ConcatenateInvTypeLimbo = true;
 
@@ -43,7 +43,7 @@ namespace Titanium
 	} /*inventory*/
 
 	namespace invtype {
-		inline EQEmu::versions::ClientVersion GetInvTypeRef() { return EQEmu::versions::ClientVersion::Titanium; }
+		inline EQ::versions::ClientVersion GetInvTypeRef() { return EQ::versions::ClientVersion::Titanium; }
 
 		namespace enum_ {
 			enum InventoryTypes : int16 {
@@ -106,7 +106,7 @@ namespace Titanium
 	} /*invtype*/
 
 	namespace invslot {
-		inline EQEmu::versions::ClientVersion GetInvSlotRef() { return EQEmu::versions::ClientVersion::Titanium; }
+		inline EQ::versions::ClientVersion GetInvSlotRef() { return EQ::versions::ClientVersion::Titanium; }
 
 		namespace enum_ {
 			enum InventorySlots : int16 {
@@ -204,7 +204,7 @@ namespace Titanium
 	} /*invslot*/
 
 	namespace invbag {
-		inline EQEmu::versions::ClientVersion GetInvBagRef() { return EQEmu::versions::ClientVersion::Titanium; }
+		inline EQ::versions::ClientVersion GetInvBagRef() { return EQ::versions::ClientVersion::Titanium; }
 
 		const int16 SLOT_INVALID = IINVALID;
 		const int16 SLOT_BEGIN = INULL;
@@ -236,7 +236,7 @@ namespace Titanium
 	} /*invbag*/
 
 	namespace invaug {
-		inline EQEmu::versions::ClientVersion GetInvAugRef() { return EQEmu::versions::ClientVersion::Titanium; }
+		inline EQ::versions::ClientVersion GetInvAugRef() { return EQ::versions::ClientVersion::Titanium; }
 
 		const int16 SOCKET_INVALID = IINVALID;
 		const int16 SOCKET_BEGIN = INULL;
@@ -248,7 +248,7 @@ namespace Titanium
 	} /*invaug*/
 
 	namespace item {
-		inline EQEmu::versions::ClientVersion GetItemRef() { return EQEmu::versions::ClientVersion::Titanium; }
+		inline EQ::versions::ClientVersion GetItemRef() { return EQ::versions::ClientVersion::Titanium; }
 
 		enum ItemPacketType : int {
 			ItemPacketMerchant = 100,
@@ -266,7 +266,7 @@ namespace Titanium
 	} /*item*/
 
 	namespace profile {
-		inline EQEmu::versions::ClientVersion GetProfileRef() { return EQEmu::versions::ClientVersion::Titanium; }
+		inline EQ::versions::ClientVersion GetProfileRef() { return EQ::versions::ClientVersion::Titanium; }
 
 		const int16 BANDOLIERS_SIZE = 4;		// number of bandolier instances
 		const int16 BANDOLIER_ITEM_COUNT = 4;	// number of equipment slots in bandolier instance
@@ -278,11 +278,11 @@ namespace Titanium
 	} /*profile*/
 
 	namespace constants {
-		inline EQEmu::versions::ClientVersion GetConstantsRef() { return EQEmu::versions::ClientVersion::Titanium; }
+		inline EQ::versions::ClientVersion GetConstantsRef() { return EQ::versions::ClientVersion::Titanium; }
 
-		const EQEmu::expansions::Expansion EXPANSION = EQEmu::expansions::Expansion::DoD; // Someone had this as PoR in another section...
-		const uint32 EXPANSION_BIT = EQEmu::expansions::bitDoD;
-		const uint32 EXPANSIONS_MASK = EQEmu::expansions::maskDoD;
+		const EQ::expansions::Expansion EXPANSION = EQ::expansions::Expansion::DoD; // Someone had this as PoR in another section...
+		const uint32 EXPANSION_BIT = EQ::expansions::bitDoD;
+		const uint32 EXPANSIONS_MASK = EQ::expansions::maskDoD;
 
 		const size_t CHARACTER_CREATION_LIMIT = 8; // Hard-coded in client - DO NOT ALTER
 
@@ -291,21 +291,21 @@ namespace Titanium
 	} /*constants*/
 
 	namespace behavior {
-		inline EQEmu::versions::ClientVersion GetBehaviorRef() { return EQEmu::versions::ClientVersion::Titanium; }
+		inline EQ::versions::ClientVersion GetBehaviorRef() { return EQ::versions::ClientVersion::Titanium; }
 
 		const bool CoinHasWeight = true;
 
 	} /*behavior*/
 
 	namespace skills {
-		inline EQEmu::versions::ClientVersion GetSkillsRef() { return EQEmu::versions::ClientVersion::Titanium; }
+		inline EQ::versions::ClientVersion GetSkillsRef() { return EQ::versions::ClientVersion::Titanium; }
 
-		const size_t LastUsableSkill = EQEmu::skills::SkillFrenzy;
+		const size_t LastUsableSkill = EQ::skills::SkillFrenzy;
 
 	} /*skills*/
 
 	namespace spells {
-		inline EQEmu::versions::ClientVersion GetSkillsRef() { return EQEmu::versions::ClientVersion::Titanium; }
+		inline EQ::versions::ClientVersion GetSkillsRef() { return EQ::versions::ClientVersion::Titanium; }
 		
 		enum class CastingSlot : uint32 {
 			Gem1 = 0,

common/patches/titanium_ops.h

@@ -32,13 +32,16 @@ E(OP_Damage)
 E(OP_DeleteCharge)
 E(OP_DeleteItem)
 E(OP_DeleteSpawn)
+E(OP_DzChooseZone)
 E(OP_DzCompass)
 E(OP_DzExpeditionEndsWarning)
 E(OP_DzExpeditionInfo)
-E(OP_DzExpeditionList)
-E(OP_DzJoinExpeditionConfirm)
-E(OP_DzLeaderStatus)
+E(OP_DzExpeditionInvite)
+E(OP_DzExpeditionLockoutTimers)
 E(OP_DzMemberList)
+E(OP_DzMemberListName)
+E(OP_DzMemberListStatus)
+E(OP_DzSetLeaderName)
 E(OP_Emote)
 E(OP_FormattedMessage)
 E(OP_GroundSpawn)
@@ -86,6 +89,12 @@ D(OP_CharacterCreate)
 D(OP_ClientUpdate)
 D(OP_Consume)
 D(OP_DeleteItem)
+D(OP_DzAddPlayer)
+D(OP_DzChooseZoneReply)
+D(OP_DzExpeditionInviteResponse)
+D(OP_DzMakeLeader)
+D(OP_DzRemovePlayer)
+D(OP_DzSwapPlayer)
 D(OP_Emote)
 D(OP_FaceChange)
 D(OP_InspectAnswer)

common/patches/titanium_structs.h

@@ -161,7 +161,7 @@ struct TintProfile {
 			Tint_Struct Primary;
 			Tint_Struct Secondary;
 		};
-		Tint_Struct Slot[EQEmu::textures::materialCount];
+		Tint_Struct Slot[EQ::textures::materialCount];
 	};
 };
 
@@ -184,7 +184,7 @@ struct TextureProfile
 			Texture_Struct Primary;
 			Texture_Struct Secondary;
 		};
-		Texture_Struct Slot[EQEmu::textures::materialCount];
+		Texture_Struct Slot[EQ::textures::materialCount];
 	};
 
 	TextureProfile();
@@ -3299,43 +3299,150 @@ struct VeteranReward
 /*004*/	VeteranRewardItem item;
 };
 
-struct ExpeditionExpireWarning
+struct ExpeditionInvite_Struct
+{
+/*000*/ uint32 client_id;
+/*004*/ char   inviter_name[64];
+/*068*/ char   expedition_name[128];
+/*196*/ uint8  swapping;             // 0: adding 1: swapping
+/*197*/ char   swap_name[64];        // if swapping, swap name being removed
+/*261*/ uint8  padding[3];
+/*264*/ uint16 dz_zone_id;           // dz_id zone/instance pair, sent back in reply
+/*268*/ uint16 dz_instance_id;
+};
+
+struct ExpeditionInviteResponse_Struct
 {
 /*000*/ uint32 unknown000;
-/*004*/ uint32 minutes_remaining;
+/*004*/ uint16 dz_zone_id;     // dz_id pair sent in invite
+/*006*/ uint16 dz_instance_id;
+/*008*/ uint8  accepted;       // 0: declined 1: accepted
+/*009*/ uint8  swapping;       // 0: adding 1: swapping (sent in invite)
+/*010*/ char   swap_name[64];  // swap name sent in invite
+/*074*/ uint8  unknown078;     // padding/garbage?
+/*075*/ uint8  unknown079;     // padding/garbage?
 };
 
 struct ExpeditionInfo_Struct
 {
-/*000*/ uint32 clientid;
-/*004*/ uint32 enabled_max;
+/*000*/ uint32 client_id;
+/*004*/ uint32 assigned; // padded bool
 /*008*/ uint32 max_players;
-/*012*/ char expedition_name[128];
-/*142*/ char leader_name[64];
+/*012*/ char   expedition_name[128];
+/*140*/ char   leader_name[64];
 };
 
-struct ExpeditionCompassEntry_Struct
+struct ExpeditionMemberEntry_Struct
 {
-/*000*/ float unknown000; //seen *((uint32*)) = 1584791871
-/*004*/ uint32 enabled; //guess
-/*008*/ uint32 unknown008; //seen 1019
+/*000*/ char name[1];            // variable length, null terminated, max 0x40 (64)
+/*000*/ uint8 expedition_status; // 0: unknown 1: Online, 2: Offline, 3: In Dynamic Zone, 4: Link Dead
+};
+
+struct ExpeditionMemberList_Struct
+{
+/*000*/ uint32 client_id;
+/*004*/ uint32 member_count;
+/*008*/ ExpeditionMemberEntry_Struct members[0]; // variable length
+};
+
+struct ExpeditionMemberListName_Struct
+{
+/*000*/ uint32 client_id;
+/*004*/ uint32 add_name;   // padded bool, 0: remove name, 1: add name with unknown status
+/*008*/ char   name[64];
+};
+
+struct ExpeditionLockoutTimerEntry_Struct
+{
+/*000*/ char   expedition_name[1]; // variable length, null terminated, max 0x80 (128)
+/*000*/ uint32 seconds_remaining;
+/*000*/ int32  event_type;         // seen -1 (0xffffffff) for replay timers and 1 for event timers
+/*000*/ char   event_name[1];      // variable length, null terminated, max 0x100 (256)
+};
+
+struct ExpeditionLockoutTimers_Struct
+{
+/*000*/ uint32 client_id;
+/*004*/ uint32 count;
+/*008*/ ExpeditionLockoutTimerEntry_Struct timers[0];
+};
+
+struct ExpeditionSetLeaderName_Struct
+{
+/*000*/ uint32 client_id;
+/*004*/ char   leader_name[64];
+};
+
+struct ExpeditionCommand_Struct
+{
+/*000*/ uint32 unknown000;
+/*004*/ char   name[64];
+};
+
+struct ExpeditionCommandSwap_Struct
+{
+/*000*/ uint32 unknown000;
+/*004*/ char   add_player_name[64]; // swap to (player must confirm)
+/*068*/ char   rem_player_name[64]; // swap from
+};
+
+struct ExpeditionExpireWarning
+{
+/*000*/ uint32 client_id;
+/*004*/ uint32 minutes_remaining;
+};
+
+struct DynamicZoneCompassEntry_Struct
+{
+/*000*/ uint16 dz_zone_id;      // target dz id pair
+/*002*/ uint16 dz_instance_id;
+/*004*/ uint32 dz_type;         // 1: Expedition, 2: Tutorial (purple), 3: Task, 4: Mission, 5: Quest (green)
+/*008*/ uint32 unknown008;
 /*012*/ float y;
 /*016*/ float x;
 /*020*/ float z;
 };
 
-struct ExpeditionCompass_Struct
+struct DynamicZoneCompass_Struct
 {
-/*000*/ uint32 clientid;
+/*000*/ uint32 client_id;
 /*004*/ uint32 count;
-/*008*/ ExpeditionCompassEntry_Struct entries[0];
+/*008*/ DynamicZoneCompassEntry_Struct entries[0];
 };
 
-struct ExpeditionJoinPrompt_Struct
+struct DynamicZoneChooseZoneEntry_Struct
 {
-/*000*/ uint32 clientid;
-/*004*/ char player_name[64];
-/*068*/ char expedition_name[64];
+/*000*/ uint16 dz_zone_id;     // dz_id pair
+/*002*/ uint16 dz_instance_id;
+/*004*/ uint32 unknown_id1;    // sent back in reply
+/*008*/ uint32 dz_type;        // 1: Expedition, 2: Tutorial, 3: Task, 4: Mission, 5: Quest -- sent back in reply
+/*012*/ uint32 unknown_id2;    // possibly an id based on dz type, for expeditions this was same as dz_id (zone|instance) but task dz was different
+/*016*/ char   description[1]; // variable length, null terminated, max 0x80 (128)
+/*000*/ char   leader_name[1]; // variable length, null terminated, max 0x40 (64)
+};
+
+struct DynamicZoneChooseZone_Struct
+{
+/*000*/ uint32 client_id;
+/*004*/ uint32 count;
+/*008*/ DynamicZoneChooseZoneEntry_Struct choices[0];
+};
+
+struct DynamicZoneChooseZoneReply_Struct
+{
+/*000*/ uint32 unknown000;
+/*004*/ uint32 unknown004;
+/*008*/ uint32 unknown_id1;
+/*012*/ uint16 dz_zone_id;
+/*014*/ uint16 dz_instance_id;
+/*016*/ uint32 dz_type;        // 1: Expedition, 2: Tutorial, 3: Task, 4: Mission, 5: Quest
+/*020*/ uint32 unknown_id2;
+/*024*/ uint32 unknown024;
+/*028*/ uint32 unknown028;     // always same as unknown040
+/*032*/ uint32 unknown032;
+/*036*/ uint32 unknown036;
+/*040*/ uint32 unknown040;     // always same as unknown028
+/*044*/ uint32 unknown044;
 };
 
 struct LFGuild_SearchPlayer_Struct

common/patches/uf.cpp

@@ -43,7 +43,7 @@ namespace UF
 	static OpcodeManager *opcodes = nullptr;
 	static Strategy struct_strategy;
 
-	void SerializeItem(EQEmu::OutBuffer& ob, const EQEmu::ItemInstance *inst, int16 slot_id, uint8 depth);
+	void SerializeItem(EQ::OutBuffer& ob, const EQ::ItemInstance *inst, int16 slot_id, uint8 depth);
 
 	// server to client inventory location converters
 	static inline uint32 ServerToUFSlot(uint32 serverSlot);
@@ -59,8 +59,8 @@ namespace UF
 	// client to server say link converter
 	static inline void UFToServerSayLink(std::string& serverSayLink, const std::string& ufSayLink);
 
-	static inline spells::CastingSlot ServerToUFCastingSlot(EQEmu::spells::CastingSlot slot);
-	static inline EQEmu::spells::CastingSlot UFToServerCastingSlot(spells::CastingSlot slot);
+	static inline spells::CastingSlot ServerToUFCastingSlot(EQ::spells::CastingSlot slot);
+	static inline EQ::spells::CastingSlot UFToServerCastingSlot(spells::CastingSlot slot);
 
 	static inline int ServerToUFBuffSlot(int index);
 	static inline int UFToServerBuffSlot(int index);
@@ -144,9 +144,9 @@ namespace UF
 		return(r);
 	}
 
-	const EQEmu::versions::ClientVersion Strategy::ClientVersion() const
+	const EQ::versions::ClientVersion Strategy::ClientVersion() const
 	{
-		return EQEmu::versions::ClientVersion::UF;
+		return EQ::versions::ClientVersion::UF;
 	}
 
 #include "ss_define.h"
@@ -501,24 +501,24 @@ namespace UF
 		//store away the emu struct
 		uchar* __emu_buffer = in->pBuffer;
 
-		int item_count = in->size / sizeof(EQEmu::InternalSerializedItem_Struct);
-		if (!item_count || (in->size % sizeof(EQEmu::InternalSerializedItem_Struct)) != 0) {
+		int item_count = in->size / sizeof(EQ::InternalSerializedItem_Struct);
+		if (!item_count || (in->size % sizeof(EQ::InternalSerializedItem_Struct)) != 0) {
 			Log(Logs::General, Logs::Netcode, "[STRUCTS] Wrong size on outbound %s: Got %d, expected multiple of %d",
-				opcodes->EmuToName(in->GetOpcode()), in->size, sizeof(EQEmu::InternalSerializedItem_Struct));
+				opcodes->EmuToName(in->GetOpcode()), in->size, sizeof(EQ::InternalSerializedItem_Struct));
 
 			delete in;
 			return;
 		}
 
-		EQEmu::InternalSerializedItem_Struct* eq = (EQEmu::InternalSerializedItem_Struct*)in->pBuffer;
+		EQ::InternalSerializedItem_Struct* eq = (EQ::InternalSerializedItem_Struct*)in->pBuffer;
 
-		EQEmu::OutBuffer ob;
-		EQEmu::OutBuffer::pos_type last_pos = ob.tellp();
+		EQ::OutBuffer ob;
+		EQ::OutBuffer::pos_type last_pos = ob.tellp();
 
 		ob.write((const char*)&item_count, sizeof(uint32));
 
 		for (int index = 0; index < item_count; ++index, ++eq) {
-			SerializeItem(ob, (const EQEmu::ItemInstance*)eq->inst, eq->slot_id, 0);
+			SerializeItem(ob, (const EQ::ItemInstance*)eq->inst, eq->slot_id, 0);
 			if (ob.tellp() == last_pos)
 				LogNetcode("UF::ENCODE(OP_CharInventory) Serialization failed on item slot [{}] during OP_CharInventory.  Item skipped", eq->slot_id);
 
@@ -613,14 +613,48 @@ namespace UF
 		FINISH_ENCODE();
 	}
 
+	ENCODE(OP_DzChooseZone)
+	{
+		SETUP_VAR_ENCODE(DynamicZoneChooseZone_Struct);
+
+		SerializeBuffer buf;
+		buf.WriteUInt32(emu->client_id);
+		buf.WriteUInt32(emu->count);
+
+		for (uint32 i = 0; i < emu->count; ++i)
+		{
+			buf.WriteUInt16(emu->choices[i].dz_zone_id);
+			buf.WriteUInt16(emu->choices[i].dz_instance_id);
+			buf.WriteUInt32(emu->choices[i].unknown_id1);
+			buf.WriteUInt32(emu->choices[i].dz_type);
+			buf.WriteUInt32(emu->choices[i].unknown_id2);
+			buf.WriteString(emu->choices[i].description);
+			buf.WriteString(emu->choices[i].leader_name);
+		}
+
+		__packet->size = buf.size();
+		__packet->pBuffer = new unsigned char[__packet->size];
+		memcpy(__packet->pBuffer, buf.buffer(), __packet->size);
+
+		FINISH_ENCODE();
+	}
+
 	ENCODE(OP_DzCompass)
 	{
-		SETUP_VAR_ENCODE(ExpeditionCompass_Struct);
-		ALLOC_VAR_ENCODE(structs::ExpeditionCompass_Struct, sizeof(structs::ExpeditionInfo_Struct) + sizeof(structs::ExpeditionCompassEntry_Struct) * emu->count);
+		SETUP_VAR_ENCODE(DynamicZoneCompass_Struct);
+		ALLOC_VAR_ENCODE(structs::DynamicZoneCompass_Struct,
+			sizeof(structs::DynamicZoneCompass_Struct) +
+			sizeof(structs::DynamicZoneCompassEntry_Struct) * emu->count
+		);
+
+		OUT(client_id);
 		OUT(count);
 
 		for (uint32 i = 0; i < emu->count; ++i)
 		{
+			OUT(entries[i].dz_zone_id);
+			OUT(entries[i].dz_instance_id);
+			OUT(entries[i].dz_type);
 			OUT(entries[i].x);
 			OUT(entries[i].y);
 			OUT(entries[i].z);
@@ -644,81 +678,60 @@ namespace UF
 		ENCODE_LENGTH_EXACT(ExpeditionInfo_Struct);
 		SETUP_DIRECT_ENCODE(ExpeditionInfo_Struct, structs::ExpeditionInfo_Struct);
 
+		OUT(client_id);
+		OUT(assigned);
 		OUT(max_players);
-		eq->unknown004 = 785316192;
-		eq->unknown008 = 435601;
-		strcpy(eq->expedition_name, emu->expedition_name);
-		strcpy(eq->leader_name, emu->leader_name);
+		strn0cpy(eq->expedition_name, emu->expedition_name, sizeof(eq->expedition_name));
+		strn0cpy(eq->leader_name, emu->leader_name, sizeof(eq->leader_name));
 
 		FINISH_ENCODE();
 	}
 
-	ENCODE(OP_DzExpeditionList)
+	ENCODE(OP_DzExpeditionInvite)
 	{
-		SETUP_VAR_ENCODE(ExpeditionLockoutList_Struct);
+		ENCODE_LENGTH_EXACT(ExpeditionInvite_Struct);
+		SETUP_DIRECT_ENCODE(ExpeditionInvite_Struct, structs::ExpeditionInvite_Struct);
 
-		std::stringstream ss(std::stringstream::in | std::stringstream::out | std::stringstream::binary);
-		uint32 client_id = 0;
-		uint8 null_term = 0;
-		ss.write((const char*)&client_id, sizeof(uint32));
-		ss.write((const char*)&emu->count, sizeof(uint32));
+		OUT(client_id);
+		strn0cpy(eq->inviter_name, emu->inviter_name, sizeof(eq->inviter_name));
+		strn0cpy(eq->expedition_name, emu->expedition_name, sizeof(eq->expedition_name));
+		OUT(swapping);
+		strn0cpy(eq->swap_name, emu->swap_name, sizeof(eq->swap_name));
+		OUT(dz_zone_id);
+		OUT(dz_instance_id);
+
+		FINISH_ENCODE();
+	}
+
+	ENCODE(OP_DzExpeditionLockoutTimers)
+	{
+		SETUP_VAR_ENCODE(ExpeditionLockoutTimers_Struct);
+
+		SerializeBuffer buf;
+		buf.WriteUInt32(emu->client_id);
+		buf.WriteUInt32(emu->count);
 		for (uint32 i = 0; i < emu->count; ++i)
 		{
-			ss.write(emu->entries[i].expedition, strlen(emu->entries[i].expedition));
-			ss.write((const char*)&null_term, sizeof(char));
-			ss.write((const char*)&emu->entries[i].time_left, sizeof(uint32));
-			ss.write((const char*)&client_id, sizeof(uint32));
-			ss.write(emu->entries[i].expedition_event, strlen(emu->entries[i].expedition_event));
-			ss.write((const char*)&null_term, sizeof(char));
+			buf.WriteString(emu->timers[i].expedition_name);
+			buf.WriteUInt32(emu->timers[i].seconds_remaining);
+			buf.WriteInt32(emu->timers[i].event_type);
+			buf.WriteString(emu->timers[i].event_name);
 		}
 
-		__packet->size = ss.str().length();
+		__packet->size = buf.size();
 		__packet->pBuffer = new unsigned char[__packet->size];
-		memcpy(__packet->pBuffer, ss.str().c_str(), __packet->size);
+		memcpy(__packet->pBuffer, buf.buffer(), __packet->size);
 
 		FINISH_ENCODE();
 	}
 
-	ENCODE(OP_DzJoinExpeditionConfirm)
+	ENCODE(OP_DzSetLeaderName)
 	{
-		ENCODE_LENGTH_EXACT(ExpeditionJoinPrompt_Struct);
-		SETUP_DIRECT_ENCODE(ExpeditionJoinPrompt_Struct, structs::ExpeditionJoinPrompt_Struct);
+		ENCODE_LENGTH_EXACT(ExpeditionSetLeaderName_Struct);
+		SETUP_DIRECT_ENCODE(ExpeditionSetLeaderName_Struct, structs::ExpeditionSetLeaderName_Struct);
 
-		strcpy(eq->expedition_name, emu->expedition_name);
-		strcpy(eq->player_name, emu->player_name);
-
-		FINISH_ENCODE();
-	}
-
-	ENCODE(OP_DzLeaderStatus)
-	{
-		SETUP_VAR_ENCODE(ExpeditionLeaderSet_Struct);
-
-		std::stringstream ss(std::stringstream::in | std::stringstream::out | std::stringstream::binary);
-		uint32 client_id = 0;
-		uint8 null_term = 0;
-
-		ss.write((const char*)&client_id, sizeof(uint32));
-		ss.write((const char*)&client_id, sizeof(uint32));
-		ss.write(emu->leader_name, strlen(emu->leader_name));
-		ss.write((const char*)&null_term, sizeof(char));
-		ss.write((const char*)&client_id, sizeof(uint32));
-		ss.write((const char*)&client_id, sizeof(uint32));//0xffffffff
-		ss.write((const char*)&client_id, sizeof(uint32));
-		ss.write((const char*)&client_id, sizeof(uint32));
-		ss.write((const char*)&client_id, sizeof(uint32));
-		ss.write((const char*)&client_id, sizeof(uint32));
-		ss.write((const char*)&client_id, sizeof(uint32));
-		ss.write((const char*)&client_id, sizeof(uint32));
-		ss.write((const char*)&client_id, sizeof(uint32));
-		ss.write((const char*)&client_id, sizeof(uint32));
-		ss.write((const char*)&client_id, sizeof(uint32));
-		ss.write((const char*)&client_id, sizeof(uint32));//1
-		ss.write((const char*)&client_id, sizeof(uint32));
-
-		__packet->size = ss.str().length();
-		__packet->pBuffer = new unsigned char[__packet->size];
-		memcpy(__packet->pBuffer, ss.str().c_str(), __packet->size);
+		OUT(client_id);
+		strn0cpy(eq->leader_name, emu->leader_name, sizeof(eq->leader_name));
 
 		FINISH_ENCODE();
 	}
@@ -727,26 +740,43 @@ namespace UF
 	{
 		SETUP_VAR_ENCODE(ExpeditionMemberList_Struct);
 
-		std::stringstream ss(std::stringstream::in | std::stringstream::out | std::stringstream::binary);
-
-		uint32 client_id = 0;
-		uint8 null_term = 0;
-		ss.write((const char*)&client_id, sizeof(uint32));
-		ss.write((const char*)&emu->count, sizeof(uint32));
-		for (uint32 i = 0; i < emu->count; ++i)
+		SerializeBuffer buf;
+		buf.WriteUInt32(emu->client_id);
+		buf.WriteUInt32(emu->member_count);
+		for (uint32 i = 0; i < emu->member_count; ++i)
 		{
-			ss.write(emu->entries[i].name, strlen(emu->entries[i].name));
-			ss.write((const char*)&null_term, sizeof(char));
-			ss.write((const char*)&emu->entries[i].status, sizeof(char));
+			buf.WriteString(emu->members[i].name);
+			buf.WriteUInt8(emu->members[i].expedition_status);
 		}
 
-		__packet->size = ss.str().length();
+		__packet->size = buf.size();
 		__packet->pBuffer = new unsigned char[__packet->size];
-		memcpy(__packet->pBuffer, ss.str().c_str(), __packet->size);
+		memcpy(__packet->pBuffer, buf.buffer(), __packet->size);
 
 		FINISH_ENCODE();
 	}
 
+	ENCODE(OP_DzMemberListName)
+	{
+		ENCODE_LENGTH_EXACT(ExpeditionMemberListName_Struct);
+		SETUP_DIRECT_ENCODE(ExpeditionMemberListName_Struct, structs::ExpeditionMemberListName_Struct);
+
+		OUT(client_id);
+		OUT(add_name);
+		strn0cpy(eq->name, emu->name, sizeof(eq->name));
+
+		FINISH_ENCODE();
+	}
+
+	ENCODE(OP_DzMemberListStatus)
+	{
+		auto emu = reinterpret_cast<ExpeditionMemberList_Struct*>((*p)->pBuffer);
+		if (emu->member_count == 1)
+		{
+			ENCODE_FORWARD(OP_DzMemberList);
+		}
+	}
+
 	ENCODE(OP_Emote)
 	{
 		EQApplicationPacket *in = *p;
@@ -1268,14 +1298,14 @@ namespace UF
 		//store away the emu struct
 		uchar* __emu_buffer = in->pBuffer;
 
-		EQEmu::InternalSerializedItem_Struct* int_struct = (EQEmu::InternalSerializedItem_Struct*)(&__emu_buffer[4]);
+		EQ::InternalSerializedItem_Struct* int_struct = (EQ::InternalSerializedItem_Struct*)(&__emu_buffer[4]);
 
-		EQEmu::OutBuffer ob;
-		EQEmu::OutBuffer::pos_type last_pos = ob.tellp();
+		EQ::OutBuffer ob;
+		EQ::OutBuffer::pos_type last_pos = ob.tellp();
 
 		ob.write((const char*)__emu_buffer, 4);
 
-		SerializeItem(ob, (const EQEmu::ItemInstance*)int_struct->inst, int_struct->slot_id, 0);
+		SerializeItem(ob, (const EQ::ItemInstance*)int_struct->inst, int_struct->slot_id, 0);
 		if (ob.tellp() == last_pos) {
 			LogNetcode("UF::ENCODE(OP_ItemPacket) Serialization failed on item slot [{}]", int_struct->slot_id);
 			delete in;
@@ -1577,6 +1607,7 @@ namespace UF
 		OUT(FastRegenHP);
 		OUT(FastRegenMana);
 		OUT(FastRegenEndurance);
+		OUT(underworld_teleport_index);
 
 		eq->FogDensity = emu->fog_density;
 
@@ -1693,7 +1724,7 @@ namespace UF
 		OUT(hairstyle);
 		OUT(beard);
 		//	OUT(unknown00178[10]);
-		for (r = EQEmu::textures::textureBegin; r < EQEmu::textures::materialCount; r++) {
+		for (r = EQ::textures::textureBegin; r < EQ::textures::materialCount; r++) {
 			eq->equipment.Slot[r].Material = emu->item_material.Slot[r].Material;
 			eq->equipment.Slot[r].Unknown1 = 0;
 			eq->equipment.Slot[r].EliteMaterial = 0;
@@ -1725,7 +1756,7 @@ namespace UF
 		OUT(face);
 		//	OUT(unknown02264[47]);
 		
-		if (spells::SPELLBOOK_SIZE <= EQEmu::spells::SPELLBOOK_SIZE) {
+		if (spells::SPELLBOOK_SIZE <= EQ::spells::SPELLBOOK_SIZE) {
 			for (uint32 r = 0; r < spells::SPELLBOOK_SIZE; r++) {
 				if (emu->spell_book[r] <= spells::SPELL_ID_MAX)
 					eq->spell_book[r] = emu->spell_book[r];
@@ -1734,14 +1765,14 @@ namespace UF
 			}
 		}
 		else {
-			for (uint32 r = 0; r < EQEmu::spells::SPELLBOOK_SIZE; r++) {
+			for (uint32 r = 0; r < EQ::spells::SPELLBOOK_SIZE; r++) {
 				if (emu->spell_book[r] <= spells::SPELL_ID_MAX)
 					eq->spell_book[r] = emu->spell_book[r];
 				else
 					eq->spell_book[r] = 0xFFFFFFFFU;
 			}
 			// invalidate the rest of the spellbook slots
-			memset(&eq->spell_book[EQEmu::spells::SPELLBOOK_SIZE], 0xFF, (sizeof(uint32) * (spells::SPELLBOOK_SIZE - EQEmu::spells::SPELLBOOK_SIZE)));
+			memset(&eq->spell_book[EQ::spells::SPELLBOOK_SIZE], 0xFF, (sizeof(uint32) * (spells::SPELLBOOK_SIZE - EQ::spells::SPELLBOOK_SIZE)));
 		}
 
 		//	OUT(unknown4184[128]);
@@ -1797,7 +1828,7 @@ namespace UF
 		//	OUT(unknown06160[4]);
 
 		// Copy bandoliers where server and client indices converge
-		for (r = 0; r < EQEmu::profile::BANDOLIERS_SIZE && r < profile::BANDOLIERS_SIZE; ++r) {
+		for (r = 0; r < EQ::profile::BANDOLIERS_SIZE && r < profile::BANDOLIERS_SIZE; ++r) {
 			OUT_str(bandoliers[r].Name);
 			for (uint32 k = 0; k < profile::BANDOLIER_ITEM_COUNT; ++k) { // Will need adjusting if 'server != client' is ever true
 				OUT(bandoliers[r].Items[k].ID);
@@ -1806,7 +1837,7 @@ namespace UF
 			}
 		}
 		// Nullify bandoliers where server and client indices diverge, with a client bias
-		for (r = EQEmu::profile::BANDOLIERS_SIZE; r < profile::BANDOLIERS_SIZE; ++r) {
+		for (r = EQ::profile::BANDOLIERS_SIZE; r < profile::BANDOLIERS_SIZE; ++r) {
 			eq->bandoliers[r].Name[0] = '\0';
 			for (uint32 k = 0; k < profile::BANDOLIER_ITEM_COUNT; ++k) { // Will need adjusting if 'server != client' is ever true
 				eq->bandoliers[r].Items[k].ID = 0;
@@ -1818,13 +1849,13 @@ namespace UF
 		//	OUT(unknown07444[5120]);
 
 		// Copy potion belt where server and client indices converge
-		for (r = 0; r < EQEmu::profile::POTION_BELT_SIZE && r < profile::POTION_BELT_SIZE; ++r) {
+		for (r = 0; r < EQ::profile::POTION_BELT_SIZE && r < profile::POTION_BELT_SIZE; ++r) {
 			OUT(potionbelt.Items[r].ID);
 			OUT(potionbelt.Items[r].Icon);
 			OUT_str(potionbelt.Items[r].Name);
 		}
 		// Nullify potion belt where server and client indices diverge, with a client bias
-		for (r = EQEmu::profile::POTION_BELT_SIZE; r < profile::POTION_BELT_SIZE; ++r) {
+		for (r = EQ::profile::POTION_BELT_SIZE; r < profile::POTION_BELT_SIZE; ++r) {
 			eq->potionbelt.Items[r].ID = 0;
 			eq->potionbelt.Items[r].Icon = 0;
 			eq->potionbelt.Items[r].Name[0] = '\0';
@@ -2196,7 +2227,7 @@ namespace UF
 			eq_cse->HairColor = emu_cse->HairColor;
 			eq_cse->Face = emu_cse->Face;
 
-			for (int equip_index = EQEmu::textures::textureBegin; equip_index < EQEmu::textures::materialCount; equip_index++) {
+			for (int equip_index = EQ::textures::textureBegin; equip_index < EQ::textures::materialCount; equip_index++) {
 				eq_cse->Equip[equip_index].Material = emu_cse->Equip[equip_index].Material;
 				eq_cse->Equip[equip_index].Unknown1 = emu_cse->Equip[equip_index].Unknown1;
 				eq_cse->Equip[equip_index].EliteMaterial = emu_cse->Equip[equip_index].EliteModel;
@@ -2755,7 +2786,7 @@ namespace UF
 			float SpawnSize = emu->size;
 			if (!((emu->NPC == 0) || (emu->race <= 12) || (emu->race == 128) || (emu->race == 130) || (emu->race == 330) || (emu->race == 522)))
 			{
-				PacketSize -= (sizeof(structs::Texture_Struct) * EQEmu::textures::materialCount);
+				PacketSize -= (sizeof(structs::Texture_Struct) * EQ::textures::materialCount);
 
 				if (emu->size == 0)
 				{
@@ -2954,7 +2985,7 @@ namespace UF
 
 			if ((emu->NPC == 0) || (emu->race <= 12) || (emu->race == 128) || (emu->race == 130) || (emu->race == 330) || (emu->race == 522))
 			{
-				for (k = EQEmu::textures::textureBegin; k < EQEmu::textures::materialCount; ++k)
+				for (k = EQ::textures::textureBegin; k < EQ::textures::materialCount; ++k)
 				{
 					{
 						VARSTRUCT_ENCODE_TYPE(uint32, Buffer, emu->equipment_tint.Slot[k].Color);
@@ -2990,7 +3021,7 @@ namespace UF
 			{
 				structs::Texture_Struct *Equipment = (structs::Texture_Struct *)Buffer;
 
-				for (k = EQEmu::textures::textureBegin; k < EQEmu::textures::materialCount; k++) {
+				for (k = EQ::textures::textureBegin; k < EQ::textures::materialCount; k++) {
 					if (emu->equipment.Slot[k].Material > 99999) {
 						Equipment[k].Material = 63;
 					} else {
@@ -3000,7 +3031,7 @@ namespace UF
 					Equipment[k].EliteMaterial = emu->equipment.Slot[k].EliteModel;
 				}
 
-				Buffer += (sizeof(structs::Texture_Struct) * EQEmu::textures::materialCount);
+				Buffer += (sizeof(structs::Texture_Struct) * EQ::textures::materialCount);
 			}
 			if (strlen(emu->title))
 			{
@@ -3314,6 +3345,84 @@ namespace UF
 		FINISH_DIRECT_DECODE();
 	}
 
+	DECODE(OP_DzAddPlayer)
+	{
+		DECODE_LENGTH_EXACT(structs::ExpeditionCommand_Struct);
+		SETUP_DIRECT_DECODE(ExpeditionCommand_Struct, structs::ExpeditionCommand_Struct);
+
+		strn0cpy(emu->name, eq->name, sizeof(emu->name));
+
+		FINISH_DIRECT_DECODE();
+	}
+
+	DECODE(OP_DzChooseZoneReply)
+	{
+		DECODE_LENGTH_EXACT(structs::DynamicZoneChooseZoneReply_Struct);
+		SETUP_DIRECT_DECODE(DynamicZoneChooseZoneReply_Struct, structs::DynamicZoneChooseZoneReply_Struct);
+
+		IN(unknown000);
+		IN(unknown004);
+		IN(unknown008);
+		IN(unknown_id1);
+		IN(dz_zone_id);
+		IN(dz_instance_id);
+		IN(dz_type);
+		IN(unknown_id2);
+		IN(unknown028);
+		IN(unknown032);
+		IN(unknown036);
+		IN(unknown040);
+		IN(unknown044);
+		IN(unknown048);
+
+		FINISH_DIRECT_DECODE();
+	}
+
+	DECODE(OP_DzExpeditionInviteResponse)
+	{
+		DECODE_LENGTH_EXACT(structs::ExpeditionInviteResponse_Struct);
+		SETUP_DIRECT_DECODE(ExpeditionInviteResponse_Struct, structs::ExpeditionInviteResponse_Struct);
+
+		IN(dz_zone_id);
+		IN(dz_instance_id);
+		IN(accepted);
+		IN(swapping);
+		strn0cpy(emu->swap_name, eq->swap_name, sizeof(emu->swap_name));
+
+		FINISH_DIRECT_DECODE();
+	}
+
+	DECODE(OP_DzMakeLeader)
+	{
+		DECODE_LENGTH_EXACT(structs::ExpeditionCommand_Struct);
+		SETUP_DIRECT_DECODE(ExpeditionCommand_Struct, structs::ExpeditionCommand_Struct);
+
+		strn0cpy(emu->name, eq->name, sizeof(emu->name));
+
+		FINISH_DIRECT_DECODE();
+	}
+
+	DECODE(OP_DzRemovePlayer)
+	{
+		DECODE_LENGTH_EXACT(structs::ExpeditionCommand_Struct);
+		SETUP_DIRECT_DECODE(ExpeditionCommand_Struct, structs::ExpeditionCommand_Struct);
+
+		strn0cpy(emu->name, eq->name, sizeof(emu->name));
+
+		FINISH_DIRECT_DECODE();
+	}
+
+	DECODE(OP_DzSwapPlayer)
+	{
+		DECODE_LENGTH_EXACT(structs::ExpeditionCommandSwap_Struct);
+		SETUP_DIRECT_DECODE(ExpeditionCommandSwap_Struct, structs::ExpeditionCommandSwap_Struct);
+
+		strn0cpy(emu->add_player_name, eq->add_player_name, sizeof(emu->add_player_name));
+		strn0cpy(emu->rem_player_name, eq->rem_player_name, sizeof(emu->rem_player_name));
+
+		FINISH_DIRECT_DECODE();
+	}
+
 	DECODE(OP_Emote)
 	{
 		unsigned char *__eq_buffer = __packet->pBuffer;
@@ -3498,7 +3607,7 @@ namespace UF
 		DECODE_LENGTH_EXACT(structs::LoadSpellSet_Struct);
 		SETUP_DIRECT_DECODE(LoadSpellSet_Struct, structs::LoadSpellSet_Struct);
 
-		for (unsigned int i = 0; i < EQEmu::spells::SPELL_GEM_COUNT; ++i)
+		for (unsigned int i = 0; i < EQ::spells::SPELL_GEM_COUNT; ++i)
 			if (eq->spell[i] == 0)
 				emu->spell[i] = 0xFFFFFFFF;
 			else
@@ -3737,9 +3846,9 @@ namespace UF
 		return NextItemInstSerialNumber;
 	}
 
-	void SerializeItem(EQEmu::OutBuffer& ob, const EQEmu::ItemInstance *inst, int16 slot_id_in, uint8 depth)
+	void SerializeItem(EQ::OutBuffer& ob, const EQ::ItemInstance *inst, int16 slot_id_in, uint8 depth)
 	{
-		const EQEmu::ItemData *item = inst->GetUnscaledItem();
+		const EQ::ItemData *item = inst->GetUnscaledItem();
 		
 		UF::structs::ItemSerializationHeader hdr;
 
@@ -3783,7 +3892,7 @@ namespace UF
 		int ornamentationAugtype = RuleI(Character, OrnamentationAugmentType);
 		uint16 ornaIcon = 0;
 		if (inst->GetOrnamentationAug(ornamentationAugtype)) {
-			const EQEmu::ItemData *aug_weap = inst->GetOrnamentationAug(ornamentationAugtype)->GetItem();
+			const EQ::ItemData *aug_weap = inst->GetOrnamentationAug(ornamentationAugtype)->GetItem();
 			ornaIcon = aug_weap->Icon;
 
 			ob.write(aug_weap->IDFile, strlen(aug_weap->IDFile));
@@ -3966,6 +4075,12 @@ namespace UF
 		itbs.no_transfer = item->NoTransfer;
 		itbs.expendablearrow = item->ExpendableArrow;
 
+		// Done to hack older clients to label expendable fishing poles as such
+		// July 28th, 2018 patch
+		if (item->ItemType == EQ::item::ItemTypeFishingPole && item->SubType == 0) {
+			itbs.expendablearrow = 1;
+		}
+
 		ob.write((const char*)&itbs, sizeof(UF::structs::ItemTertiaryBodyStruct));
 
 		// Effect Structures Broken down to allow variable length strings for effect names
@@ -4106,33 +4221,34 @@ namespace UF
 		iqbs.HealAmt = item->HealAmt;
 		iqbs.SpellDmg = item->SpellDmg;
 		iqbs.Clairvoyance = item->Clairvoyance;
-		
+		iqbs.SubType = item->SubType;
+
 		ob.write((const char*)&iqbs, sizeof(UF::structs::ItemQuaternaryBodyStruct));
 
-		EQEmu::OutBuffer::pos_type count_pos = ob.tellp();
+		EQ::OutBuffer::pos_type count_pos = ob.tellp();
 		uint32 subitem_count = 0;
 
 		ob.write((const char*)&subitem_count, sizeof(uint32));
 
 		// moved outside of loop since it is not modified within that scope
-		int16 SubSlotNumber = EQEmu::invbag::SLOT_INVALID;
+		int16 SubSlotNumber = EQ::invbag::SLOT_INVALID;
 
-		if (slot_id_in <= EQEmu::invslot::slotGeneral8 && slot_id_in >= EQEmu::invslot::GENERAL_BEGIN)
-			SubSlotNumber = EQEmu::invbag::GENERAL_BAGS_BEGIN + ((slot_id_in - EQEmu::invslot::GENERAL_BEGIN) * EQEmu::invbag::SLOT_COUNT);
-		else if (slot_id_in <= EQEmu::invslot::GENERAL_END && slot_id_in >= EQEmu::invslot::slotGeneral9)
-			SubSlotNumber = EQEmu::invbag::SLOT_INVALID;
-		else if (slot_id_in == EQEmu::invslot::slotCursor)
-			SubSlotNumber = EQEmu::invbag::CURSOR_BAG_BEGIN;
-		else if (slot_id_in <= EQEmu::invslot::BANK_END && slot_id_in >= EQEmu::invslot::BANK_BEGIN)
-			SubSlotNumber = EQEmu::invbag::BANK_BAGS_BEGIN + ((slot_id_in - EQEmu::invslot::BANK_BEGIN) * EQEmu::invbag::SLOT_COUNT);
-		else if (slot_id_in <= EQEmu::invslot::SHARED_BANK_END && slot_id_in >= EQEmu::invslot::SHARED_BANK_BEGIN)
-			SubSlotNumber = EQEmu::invbag::SHARED_BANK_BAGS_BEGIN + ((slot_id_in - EQEmu::invslot::SHARED_BANK_BEGIN) * EQEmu::invbag::SLOT_COUNT);
+		if (slot_id_in <= EQ::invslot::slotGeneral8 && slot_id_in >= EQ::invslot::GENERAL_BEGIN)
+			SubSlotNumber = EQ::invbag::GENERAL_BAGS_BEGIN + ((slot_id_in - EQ::invslot::GENERAL_BEGIN) * EQ::invbag::SLOT_COUNT);
+		else if (slot_id_in <= EQ::invslot::GENERAL_END && slot_id_in >= EQ::invslot::slotGeneral9)
+			SubSlotNumber = EQ::invbag::SLOT_INVALID;
+		else if (slot_id_in == EQ::invslot::slotCursor)
+			SubSlotNumber = EQ::invbag::CURSOR_BAG_BEGIN;
+		else if (slot_id_in <= EQ::invslot::BANK_END && slot_id_in >= EQ::invslot::BANK_BEGIN)
+			SubSlotNumber = EQ::invbag::BANK_BAGS_BEGIN + ((slot_id_in - EQ::invslot::BANK_BEGIN) * EQ::invbag::SLOT_COUNT);
+		else if (slot_id_in <= EQ::invslot::SHARED_BANK_END && slot_id_in >= EQ::invslot::SHARED_BANK_BEGIN)
+			SubSlotNumber = EQ::invbag::SHARED_BANK_BAGS_BEGIN + ((slot_id_in - EQ::invslot::SHARED_BANK_BEGIN) * EQ::invbag::SLOT_COUNT);
 		else
 			SubSlotNumber = slot_id_in; // not sure if this is the best way to handle this..leaving for now
 
-		if (SubSlotNumber != EQEmu::invbag::SLOT_INVALID) {
-			for (uint32 index = EQEmu::invbag::SLOT_BEGIN; index <= EQEmu::invbag::SLOT_END; ++index) {
-				EQEmu::ItemInstance* sub = inst->GetItem(index);
+		if (SubSlotNumber != EQ::invbag::SLOT_INVALID) {
+			for (uint32 index = EQ::invbag::SLOT_BEGIN; index <= EQ::invbag::SLOT_END; ++index) {
+				EQ::ItemInstance* sub = inst->GetItem(index);
 				if (!sub)
 					continue;
 
@@ -4151,59 +4267,59 @@ namespace UF
 	{
 		uint32 UFSlot = invslot::SLOT_INVALID;
 
-		if (serverSlot <= EQEmu::invslot::slotGeneral8) {
+		if (serverSlot <= EQ::invslot::slotGeneral8) {
 			UFSlot = serverSlot;
 		}
 
-		else if (serverSlot <= EQEmu::invslot::CORPSE_END && serverSlot >= EQEmu::invslot::slotCursor) {
+		else if (serverSlot <= EQ::invslot::CORPSE_END && serverSlot >= EQ::invslot::slotCursor) {
 			UFSlot = serverSlot - 2;
 		}
 
-		else if (serverSlot <= EQEmu::invbag::GENERAL_BAGS_8_END && serverSlot >= EQEmu::invbag::GENERAL_BAGS_BEGIN) {
+		else if (serverSlot <= EQ::invbag::GENERAL_BAGS_8_END && serverSlot >= EQ::invbag::GENERAL_BAGS_BEGIN) {
 			UFSlot = serverSlot + 11;
 		}
 
-		else if (serverSlot <= EQEmu::invbag::CURSOR_BAG_END && serverSlot >= EQEmu::invbag::CURSOR_BAG_BEGIN) {
+		else if (serverSlot <= EQ::invbag::CURSOR_BAG_END && serverSlot >= EQ::invbag::CURSOR_BAG_BEGIN) {
 			UFSlot = serverSlot - 9;
 		}
 
-		else if (serverSlot <= EQEmu::invslot::TRIBUTE_END && serverSlot >= EQEmu::invslot::TRIBUTE_BEGIN) {
+		else if (serverSlot <= EQ::invslot::TRIBUTE_END && serverSlot >= EQ::invslot::TRIBUTE_BEGIN) {
 			UFSlot = serverSlot;
 		}
 
-		else if (serverSlot <= EQEmu::invslot::GUILD_TRIBUTE_END && serverSlot >= EQEmu::invslot::GUILD_TRIBUTE_BEGIN) {
+		else if (serverSlot <= EQ::invslot::GUILD_TRIBUTE_END && serverSlot >= EQ::invslot::GUILD_TRIBUTE_BEGIN) {
 			UFSlot = serverSlot;
 		}
 
-		else if (serverSlot == EQEmu::invslot::SLOT_TRADESKILL_EXPERIMENT_COMBINE) {
+		else if (serverSlot == EQ::invslot::SLOT_TRADESKILL_EXPERIMENT_COMBINE) {
 			UFSlot = serverSlot;
 		}
 
-		else if (serverSlot <= EQEmu::invslot::BANK_END && serverSlot >= EQEmu::invslot::BANK_BEGIN) {
+		else if (serverSlot <= EQ::invslot::BANK_END && serverSlot >= EQ::invslot::BANK_BEGIN) {
 			UFSlot = serverSlot;
 		}
 
-		else if (serverSlot <= EQEmu::invbag::BANK_BAGS_END && serverSlot >= EQEmu::invbag::BANK_BAGS_BEGIN) {
+		else if (serverSlot <= EQ::invbag::BANK_BAGS_END && serverSlot >= EQ::invbag::BANK_BAGS_BEGIN) {
 			UFSlot = serverSlot + 1;
 		}
 
-		else if (serverSlot <= EQEmu::invslot::SHARED_BANK_END && serverSlot >= EQEmu::invslot::SHARED_BANK_BEGIN) {
+		else if (serverSlot <= EQ::invslot::SHARED_BANK_END && serverSlot >= EQ::invslot::SHARED_BANK_BEGIN) {
 			UFSlot = serverSlot;
 		}
 
-		else if (serverSlot <= EQEmu::invbag::SHARED_BANK_BAGS_END && serverSlot >= EQEmu::invbag::SHARED_BANK_BAGS_BEGIN) {
+		else if (serverSlot <= EQ::invbag::SHARED_BANK_BAGS_END && serverSlot >= EQ::invbag::SHARED_BANK_BAGS_BEGIN) {
 			UFSlot = serverSlot + 1;
 		}
 
-		else if (serverSlot <= EQEmu::invslot::TRADE_END && serverSlot >= EQEmu::invslot::TRADE_BEGIN) {
+		else if (serverSlot <= EQ::invslot::TRADE_END && serverSlot >= EQ::invslot::TRADE_BEGIN) {
 			UFSlot = serverSlot;
 		}
 
-		else if (serverSlot <= EQEmu::invbag::TRADE_BAGS_END && serverSlot >= EQEmu::invbag::TRADE_BAGS_BEGIN) {
+		else if (serverSlot <= EQ::invbag::TRADE_BAGS_END && serverSlot >= EQ::invbag::TRADE_BAGS_BEGIN) {
 			UFSlot = serverSlot;
 		}
 
-		else if (serverSlot <= EQEmu::invslot::WORLD_END && serverSlot >= EQEmu::invslot::WORLD_BEGIN) {
+		else if (serverSlot <= EQ::invslot::WORLD_END && serverSlot >= EQ::invslot::WORLD_BEGIN) {
 			UFSlot = serverSlot;
 		}
 
@@ -4216,11 +4332,11 @@ namespace UF
 	{
 		uint32 UFSlot = invslot::SLOT_INVALID;
 
-		if (serverCorpseSlot <= EQEmu::invslot::slotGeneral8 && serverCorpseSlot >= EQEmu::invslot::slotGeneral1) {
+		if (serverCorpseSlot <= EQ::invslot::slotGeneral8 && serverCorpseSlot >= EQ::invslot::slotGeneral1) {
 			UFSlot = serverCorpseSlot;
 		}
 
-		else if (serverCorpseSlot <= EQEmu::invslot::CORPSE_END && serverCorpseSlot >= EQEmu::invslot::slotCursor) {
+		else if (serverCorpseSlot <= EQ::invslot::CORPSE_END && serverCorpseSlot >= EQ::invslot::slotCursor) {
 			UFSlot = serverCorpseSlot - 2;
 		}
 
@@ -4231,7 +4347,7 @@ namespace UF
 
 	static inline uint32 UFToServerSlot(uint32 ufSlot)
 	{
-		uint32 ServerSlot = EQEmu::invslot::SLOT_INVALID;
+		uint32 ServerSlot = EQ::invslot::SLOT_INVALID;
 
 		if (ufSlot <= invslot::slotGeneral8) {
 			ServerSlot = ufSlot;
@@ -4296,7 +4412,7 @@ namespace UF
 
 	static inline uint32 UFToServerCorpseSlot(uint32 ufCorpseSlot)
 	{
-		uint32 ServerSlot = EQEmu::invslot::SLOT_INVALID;
+		uint32 ServerSlot = EQ::invslot::SLOT_INVALID;
 
 		if (ufCorpseSlot <= invslot::slotGeneral8 && ufCorpseSlot >= invslot::slotGeneral1) {
 			ServerSlot = ufCorpseSlot;
@@ -4313,7 +4429,7 @@ namespace UF
 
 	static inline void ServerToUFSayLink(std::string& ufSayLink, const std::string& serverSayLink)
 	{
-		if ((constants::SAY_LINK_BODY_SIZE == EQEmu::constants::SAY_LINK_BODY_SIZE) || (serverSayLink.find('\x12') == std::string::npos)) {
+		if ((constants::SAY_LINK_BODY_SIZE == EQ::constants::SAY_LINK_BODY_SIZE) || (serverSayLink.find('\x12') == std::string::npos)) {
 			ufSayLink = serverSayLink;
 			return;
 		}
@@ -4322,7 +4438,7 @@ namespace UF
 
 		for (size_t segment_iter = 0; segment_iter < segments.size(); ++segment_iter) {
 			if (segment_iter & 1) {
-				if (segments[segment_iter].length() <= EQEmu::constants::SAY_LINK_BODY_SIZE) {
+				if (segments[segment_iter].length() <= EQ::constants::SAY_LINK_BODY_SIZE) {
 					ufSayLink.append(segments[segment_iter]);
 					// TODO: log size mismatch error
 					continue;
@@ -4353,7 +4469,7 @@ namespace UF
 
 	static inline void UFToServerSayLink(std::string& serverSayLink, const std::string& ufSayLink)
 	{
-		if ((EQEmu::constants::SAY_LINK_BODY_SIZE == constants::SAY_LINK_BODY_SIZE) || (ufSayLink.find('\x12') == std::string::npos)) {
+		if ((EQ::constants::SAY_LINK_BODY_SIZE == constants::SAY_LINK_BODY_SIZE) || (ufSayLink.find('\x12') == std::string::npos)) {
 			serverSayLink = ufSayLink;
 			return;
 		}
@@ -4387,92 +4503,92 @@ namespace UF
 		}
 	}
 
-	static inline spells::CastingSlot ServerToUFCastingSlot(EQEmu::spells::CastingSlot slot)
+	static inline spells::CastingSlot ServerToUFCastingSlot(EQ::spells::CastingSlot slot)
 	{
 		switch (slot) {
-		case EQEmu::spells::CastingSlot::Gem1:
+		case EQ::spells::CastingSlot::Gem1:
 			return spells::CastingSlot::Gem1;
-		case EQEmu::spells::CastingSlot::Gem2:
+		case EQ::spells::CastingSlot::Gem2:
 			return spells::CastingSlot::Gem2;
-		case EQEmu::spells::CastingSlot::Gem3:
+		case EQ::spells::CastingSlot::Gem3:
 			return spells::CastingSlot::Gem3;
-		case EQEmu::spells::CastingSlot::Gem4:
+		case EQ::spells::CastingSlot::Gem4:
 			return spells::CastingSlot::Gem4;
-		case EQEmu::spells::CastingSlot::Gem5:
+		case EQ::spells::CastingSlot::Gem5:
 			return spells::CastingSlot::Gem5;
-		case EQEmu::spells::CastingSlot::Gem6:
+		case EQ::spells::CastingSlot::Gem6:
 			return spells::CastingSlot::Gem6;
-		case EQEmu::spells::CastingSlot::Gem7:
+		case EQ::spells::CastingSlot::Gem7:
 			return spells::CastingSlot::Gem7;
-		case EQEmu::spells::CastingSlot::Gem8:
+		case EQ::spells::CastingSlot::Gem8:
 			return spells::CastingSlot::Gem8;
-		case EQEmu::spells::CastingSlot::Gem9:
+		case EQ::spells::CastingSlot::Gem9:
 			return spells::CastingSlot::Gem9;
-		case EQEmu::spells::CastingSlot::Gem10:
+		case EQ::spells::CastingSlot::Gem10:
 			return spells::CastingSlot::Gem10;
-		case EQEmu::spells::CastingSlot::Gem11:
+		case EQ::spells::CastingSlot::Gem11:
 			return spells::CastingSlot::Gem11;
-		case EQEmu::spells::CastingSlot::Gem12:
+		case EQ::spells::CastingSlot::Gem12:
 			return spells::CastingSlot::Gem12;
-		case EQEmu::spells::CastingSlot::Item:
-		case EQEmu::spells::CastingSlot::PotionBelt:
+		case EQ::spells::CastingSlot::Item:
+		case EQ::spells::CastingSlot::PotionBelt:
 			return spells::CastingSlot::Item;
-		case EQEmu::spells::CastingSlot::Discipline:
+		case EQ::spells::CastingSlot::Discipline:
 			return spells::CastingSlot::Discipline;
-		case EQEmu::spells::CastingSlot::AltAbility:
+		case EQ::spells::CastingSlot::AltAbility:
 			return spells::CastingSlot::AltAbility;
 		default: // we shouldn't have any issues with other slots ... just return something
 			return spells::CastingSlot::Discipline;
 		}
 	}
 
-	static inline EQEmu::spells::CastingSlot UFToServerCastingSlot(spells::CastingSlot slot)
+	static inline EQ::spells::CastingSlot UFToServerCastingSlot(spells::CastingSlot slot)
 	{
 		switch (slot) {
 		case spells::CastingSlot::Gem1:
-			return EQEmu::spells::CastingSlot::Gem1;
+			return EQ::spells::CastingSlot::Gem1;
 		case spells::CastingSlot::Gem2:
-			return EQEmu::spells::CastingSlot::Gem2;
+			return EQ::spells::CastingSlot::Gem2;
 		case spells::CastingSlot::Gem3:
-			return EQEmu::spells::CastingSlot::Gem3;
+			return EQ::spells::CastingSlot::Gem3;
 		case spells::CastingSlot::Gem4:
-			return EQEmu::spells::CastingSlot::Gem4;
+			return EQ::spells::CastingSlot::Gem4;
 		case spells::CastingSlot::Gem5:
-			return EQEmu::spells::CastingSlot::Gem5;
+			return EQ::spells::CastingSlot::Gem5;
 		case spells::CastingSlot::Gem6:
-			return EQEmu::spells::CastingSlot::Gem6;
+			return EQ::spells::CastingSlot::Gem6;
 		case spells::CastingSlot::Gem7:
-			return EQEmu::spells::CastingSlot::Gem7;
+			return EQ::spells::CastingSlot::Gem7;
 		case spells::CastingSlot::Gem8:
-			return EQEmu::spells::CastingSlot::Gem8;
+			return EQ::spells::CastingSlot::Gem8;
 		case spells::CastingSlot::Gem9:
-			return EQEmu::spells::CastingSlot::Gem9;
+			return EQ::spells::CastingSlot::Gem9;
 		case spells::CastingSlot::Gem10:
-			return EQEmu::spells::CastingSlot::Gem10;
+			return EQ::spells::CastingSlot::Gem10;
 		case spells::CastingSlot::Gem11:
-			return EQEmu::spells::CastingSlot::Gem11;
+			return EQ::spells::CastingSlot::Gem11;
 		case spells::CastingSlot::Gem12:
-			return EQEmu::spells::CastingSlot::Gem12;
+			return EQ::spells::CastingSlot::Gem12;
 		case spells::CastingSlot::Discipline:
-			return EQEmu::spells::CastingSlot::Discipline;
+			return EQ::spells::CastingSlot::Discipline;
 		case spells::CastingSlot::Item:
-			return EQEmu::spells::CastingSlot::Item;
+			return EQ::spells::CastingSlot::Item;
 		case spells::CastingSlot::AltAbility:
-			return EQEmu::spells::CastingSlot::AltAbility;
+			return EQ::spells::CastingSlot::AltAbility;
 		default: // we shouldn't have any issues with other slots ... just return something
-			return EQEmu::spells::CastingSlot::Discipline;
+			return EQ::spells::CastingSlot::Discipline;
 		}
 	}
 
 	static inline int ServerToUFBuffSlot(int index)
 	{
 		// we're a disc
-		if (index >= EQEmu::spells::LONG_BUFFS + EQEmu::spells::SHORT_BUFFS)
-			return index - EQEmu::spells::LONG_BUFFS - EQEmu::spells::SHORT_BUFFS +
+		if (index >= EQ::spells::LONG_BUFFS + EQ::spells::SHORT_BUFFS)
+			return index - EQ::spells::LONG_BUFFS - EQ::spells::SHORT_BUFFS +
 			       spells::LONG_BUFFS + spells::SHORT_BUFFS;
 		// we're a song
-		if (index >= EQEmu::spells::LONG_BUFFS)
-			return index - EQEmu::spells::LONG_BUFFS + spells::LONG_BUFFS;
+		if (index >= EQ::spells::LONG_BUFFS)
+			return index - EQ::spells::LONG_BUFFS + spells::LONG_BUFFS;
 		// we're a normal buff
 		return index; // as long as we guard against bad slots server side, we should be fine
 	}
@@ -4481,11 +4597,11 @@ namespace UF
 	{
 		// we're a disc
 		if (index >= spells::LONG_BUFFS + spells::SHORT_BUFFS)
-			return index - spells::LONG_BUFFS - spells::SHORT_BUFFS + EQEmu::spells::LONG_BUFFS +
-			       EQEmu::spells::SHORT_BUFFS;
+			return index - spells::LONG_BUFFS - spells::SHORT_BUFFS + EQ::spells::LONG_BUFFS +
+			       EQ::spells::SHORT_BUFFS;
 		// we're a song
 		if (index >= spells::LONG_BUFFS)
-			return index - spells::LONG_BUFFS + EQEmu::spells::LONG_BUFFS;
+			return index - spells::LONG_BUFFS + EQ::spells::LONG_BUFFS;
 		// we're a normal buff
 		return index; // as long as we guard against bad slots server side, we should be fine
 	}

common/patches/uf.h

@@ -43,7 +43,7 @@ namespace UF
 	protected:
 
 		virtual std::string Describe() const;
-		virtual const EQEmu::versions::ClientVersion ClientVersion() const;
+		virtual const EQ::versions::ClientVersion ClientVersion() const;
 
 		//magic macro to declare our opcode processors
 		#include "ss_declare.h"

common/patches/uf_limits.h

@@ -31,7 +31,7 @@ namespace UF
 	const int16 INULL = 0;
 
 	namespace inventory {
-		inline EQEmu::versions::ClientVersion GetInventoryRef() { return EQEmu::versions::ClientVersion::UF; }
+		inline EQ::versions::ClientVersion GetInventoryRef() { return EQ::versions::ClientVersion::UF; }
 
 		const bool ConcatenateInvTypeLimbo = true;
 
@@ -43,7 +43,7 @@ namespace UF
 	} /*inventory*/
 
 	namespace invtype {
-		inline EQEmu::versions::ClientVersion GetInvTypeRef() { return EQEmu::versions::ClientVersion::UF; }
+		inline EQ::versions::ClientVersion GetInvTypeRef() { return EQ::versions::ClientVersion::UF; }
 
 		namespace enum_ {
 			enum InventoryTypes : int16 {
@@ -106,7 +106,7 @@ namespace UF
 	} /*invtype*/
 
 	namespace invslot {
-		inline EQEmu::versions::ClientVersion GetInvSlotRef() { return EQEmu::versions::ClientVersion::UF; }
+		inline EQ::versions::ClientVersion GetInvSlotRef() { return EQ::versions::ClientVersion::UF; }
 
 		namespace enum_ {
 			enum InventorySlots : int16 {
@@ -205,7 +205,7 @@ namespace UF
 	} /*invslot*/
 
 	namespace invbag {
-		inline EQEmu::versions::ClientVersion GetInvBagRef() { return EQEmu::versions::ClientVersion::UF; }
+		inline EQ::versions::ClientVersion GetInvBagRef() { return EQ::versions::ClientVersion::UF; }
 
 		const int16 SLOT_INVALID = IINVALID;
 		const int16 SLOT_BEGIN = INULL;
@@ -237,7 +237,7 @@ namespace UF
 	} /*invbag*/
 
 	namespace invaug {
-		inline EQEmu::versions::ClientVersion GetInvAugRef() { return EQEmu::versions::ClientVersion::UF; }
+		inline EQ::versions::ClientVersion GetInvAugRef() { return EQ::versions::ClientVersion::UF; }
 
 		const int16 SOCKET_INVALID = IINVALID;
 		const int16 SOCKET_BEGIN = INULL;
@@ -249,7 +249,7 @@ namespace UF
 	} /*invaug*/
 
 	namespace item {
-		inline EQEmu::versions::ClientVersion GetItemRef() { return EQEmu::versions::ClientVersion::UF; }
+		inline EQ::versions::ClientVersion GetItemRef() { return EQ::versions::ClientVersion::UF; }
 
 		enum ItemPacketType : int {
 			ItemPacketMerchant = 100,
@@ -268,7 +268,7 @@ namespace UF
 	} /*item*/
 
 	namespace profile {
-		inline EQEmu::versions::ClientVersion GetProfileRef() { return EQEmu::versions::ClientVersion::UF; }
+		inline EQ::versions::ClientVersion GetProfileRef() { return EQ::versions::ClientVersion::UF; }
 
 		const int16 BANDOLIERS_SIZE = 20;		// number of bandolier instances
 		const int16 BANDOLIER_ITEM_COUNT = 4;	// number of equipment slots in bandolier instance
@@ -280,11 +280,11 @@ namespace UF
 	} /*profile*/
 
 	namespace constants {
-		inline EQEmu::versions::ClientVersion GetConstantsRef() { return EQEmu::versions::ClientVersion::UF; }
+		inline EQ::versions::ClientVersion GetConstantsRef() { return EQ::versions::ClientVersion::UF; }
 
-		const EQEmu::expansions::Expansion EXPANSION = EQEmu::expansions::Expansion::UF;
-		const uint32 EXPANSION_BIT = EQEmu::expansions::bitUF;
-		const uint32 EXPANSIONS_MASK = EQEmu::expansions::maskUF;
+		const EQ::expansions::Expansion EXPANSION = EQ::expansions::Expansion::UF;
+		const uint32 EXPANSION_BIT = EQ::expansions::bitUF;
+		const uint32 EXPANSIONS_MASK = EQ::expansions::maskUF;
 
 		const size_t CHARACTER_CREATION_LIMIT = 12;
 
@@ -293,21 +293,21 @@ namespace UF
 	} /*constants*/
 
 	namespace behavior {
-		inline EQEmu::versions::ClientVersion GetBehaviorRef() { return EQEmu::versions::ClientVersion::UF; }
+		inline EQ::versions::ClientVersion GetBehaviorRef() { return EQ::versions::ClientVersion::UF; }
 
 		const bool CoinHasWeight = false;
 
 	} /*behavior*/
 
 	namespace skills {
-		inline EQEmu::versions::ClientVersion GetSkillsRef() { return EQEmu::versions::ClientVersion::UF; }
+		inline EQ::versions::ClientVersion GetSkillsRef() { return EQ::versions::ClientVersion::UF; }
 
-		const size_t LastUsableSkill = EQEmu::skills::SkillTripleAttack;
+		const size_t LastUsableSkill = EQ::skills::SkillTripleAttack;
 
 	} /*skills*/
 
 	namespace spells {
-		inline EQEmu::versions::ClientVersion GetSkillsRef() { return EQEmu::versions::ClientVersion::UF; }
+		inline EQ::versions::ClientVersion GetSkillsRef() { return EQ::versions::ClientVersion::UF; }
 		
 		enum class CastingSlot : uint32 {
 			Gem1 = 0,

common/patches/uf_ops.h

@@ -38,13 +38,16 @@ E(OP_Damage)
 E(OP_DeleteCharge)
 E(OP_DeleteItem)
 E(OP_DisciplineUpdate)
+E(OP_DzChooseZone)
 E(OP_DzCompass)
 E(OP_DzExpeditionEndsWarning)
 E(OP_DzExpeditionInfo)
-E(OP_DzExpeditionList)
-E(OP_DzJoinExpeditionConfirm)
-E(OP_DzLeaderStatus)
+E(OP_DzExpeditionInvite)
+E(OP_DzExpeditionLockoutTimers)
 E(OP_DzMemberList)
+E(OP_DzMemberListName)
+E(OP_DzMemberListStatus)
+E(OP_DzSetLeaderName)
 E(OP_Emote)
 E(OP_ExpansionInfo)
 E(OP_FormattedMessage)
@@ -120,6 +123,12 @@ D(OP_ConsiderCorpse)
 D(OP_Consume)
 D(OP_Damage)
 D(OP_DeleteItem)
+D(OP_DzAddPlayer)
+D(OP_DzChooseZoneReply)
+D(OP_DzExpeditionInviteResponse)
+D(OP_DzMakeLeader)
+D(OP_DzRemovePlayer)
+D(OP_DzSwapPlayer)
 D(OP_Emote)
 D(OP_EnvDamage)
 D(OP_FaceChange)

common/patches/uf_structs.h

@@ -149,7 +149,7 @@ struct TintProfile
 			Tint_Struct Primary;
 			Tint_Struct Secondary;
 		};
-		Tint_Struct Slot[EQEmu::textures::materialCount];
+		Tint_Struct Slot[EQ::textures::materialCount];
 	};
 };
 
@@ -178,7 +178,7 @@ struct TextureProfile
 			Texture_Struct Primary;
 			Texture_Struct Secondary;
 		};
-		Texture_Struct Slot[EQEmu::textures::materialCount];
+		Texture_Struct Slot[EQ::textures::materialCount];
 	};
 
 	TextureProfile();
@@ -195,7 +195,7 @@ struct CharacterSelectEntry_Struct
 /*0000*/	uint8 Beard;				//
 /*0001*/	uint8 HairColor;			//
 /*0000*/	uint8 Face;					//
-/*0000*/	CharSelectEquip	Equip[EQEmu::textures::materialCount];
+/*0000*/	CharSelectEquip	Equip[EQ::textures::materialCount];
 /*0000*/	uint32 PrimaryIDFile;		//
 /*0000*/	uint32 SecondaryIDFile;		//
 /*0000*/	uint8 Unknown15;			// 0xff
@@ -444,7 +444,11 @@ struct NewZone_Struct {
 /*0848*/	int32	unknown848;
 /*0852*/	uint16	zone_id;
 /*0854*/	uint16	zone_instance;
-/*0856*/	char	unknown856[20];
+/*0856*/	uint32	scriptNPCReceivedanItem;
+/*0860*/	uint32	bCheck;					// padded bool
+/*0864*/	uint32	scriptIDSomething;
+/*0868*/	uint32	underworld_teleport_index; // > 0 teleports w/ zone point index, invalid succors, -1 affects some collisions
+/*0872*/	uint32	scriptIDSomething3;
 /*0876*/	uint32	SuspendBuffs;
 /*0880*/	uint32	unknown880;	//seen 50
 /*0884*/	uint32	unknown884;	//seen 10
@@ -4215,8 +4219,8 @@ struct ItemQuaternaryBodyStruct
 	int32 HealAmt;
 	int32 SpellDmg;
 	int32 Clairvoyance;
-	uint8 unknown18;	//Power Source Capacity or evolve filename?
-	uint32 evolve_string; // Some String, but being evolution related is just a guess
+	int32 SubType;
+	uint8 evolve_string; // Some String, but being evolution related is just a guess
 	uint8 unknown19;
 	uint32 unknown20;	// Bard Stuff?
 	uint32 unknown21;
@@ -4246,52 +4250,160 @@ struct VeteranReward
 /*012*/	VeteranRewardItem items[8];
 };
 
-struct ExpeditionEntryHeader_Struct
+
+struct ExpeditionInvite_Struct
+{
+/*000*/ uint32 client_id;            // unique character id
+/*004*/ uint32 unknown004;
+/*008*/ char   inviter_name[64];
+/*072*/ char   expedition_name[128];
+/*200*/ uint8  swapping;             // 0: adding 1: swapping
+/*201*/ char   swap_name[64];        // if swapping, swap name being removed
+/*265*/ uint8  padding[3];
+/*268*/ uint16 dz_zone_id;           // dz_id zone/instance pair, sent back in reply
+/*270*/ uint16 dz_instance_id;
+};
+
+struct ExpeditionInviteResponse_Struct
 {
 /*000*/ uint32 unknown000;
-/*000*/ uint32 number_of_entries;
-};
-
-struct ExpeditionJoinPrompt_Struct
-{
-/*000*/ uint32 clientid;
 /*004*/ uint32 unknown004;
-/*008*/ char player_name[64];
-/*072*/ char expedition_name[64];
-};
-
-struct ExpeditionExpireWarning
-{
-/*000*/ uint32 clientid;
-/*004*/ uint32 unknown004;
-/*008*/ uint32 minutes_remaining;
+/*008*/ uint16 dz_zone_id;     // dz_id pair sent in invite
+/*010*/ uint16 dz_instance_id;
+/*012*/ uint8  accepted;       // 0: declined 1: accepted
+/*013*/ uint8  swapping;       // 0: adding 1: swapping (sent in invite)
+/*014*/ char   swap_name[64];  // swap name sent in invite
+/*078*/ uint8  unknown078;     // padding garbage?
+/*079*/ uint8  unknown079;     // padding garbage?
 };
 
 struct ExpeditionInfo_Struct
 {
-/*000*/ uint32 clientid;
+/*000*/ uint32 client_id;
 /*004*/ uint32 unknown004;
-/*008*/ uint32 unknown008;
+/*008*/ uint32 assigned; // padded bool
 /*012*/ uint32 max_players;
-/*016*/ char expedition_name[128];
-/*142*/ char leader_name[64];
+/*016*/ char   expedition_name[128];
+/*144*/ char   leader_name[64];
 };
 
-struct ExpeditionCompassEntry_Struct
+struct ExpeditionMemberEntry_Struct
 {
-/*000*/ float unknown000; //seen *((uint32*)) = 1584791871
-/*004*/ uint32 enabled; //guess
-/*008*/ uint32 unknown008; //seen 1019
+/*000*/ char name[1];            // variable length, null terminated, max 0x40 (64)
+/*000*/ uint8 expedition_status; // 0: unknown 1: Online, 2: Offline, 3: In Dynamic Zone, 4: Link Dead
+};
+
+struct ExpeditionMemberList_Struct
+{
+/*000*/ uint32 client_id;
+/*004*/ uint32 member_count; // number of players in window
+/*008*/ ExpeditionMemberEntry_Struct members[0]; // variable length
+};
+
+struct ExpeditionMemberListName_Struct
+{
+/*000*/ uint32 client_id;
+/*004*/ uint32 unknown004;
+/*008*/ uint32 add_name;   // padded bool, 0: remove name, 1: add name with unknown status
+/*012*/ char   name[64];
+};
+
+struct ExpeditionLockoutTimerEntry_Struct
+{
+/*000*/ char   expedition_name[1]; // variable length, null terminated, max 0x80 (128)
+/*000*/ uint32 seconds_remaining;
+/*000*/ int32  event_type;         // seen -1 (0xffffffff) for replay timers and 1 for event timers
+/*000*/ char   event_name[1];      // variable length, null terminated, max 0x100 (256)
+};
+
+struct ExpeditionLockoutTimers_Struct
+{
+/*000*/ uint32 client_id;
+/*004*/ uint32 count;
+/*008*/ ExpeditionLockoutTimerEntry_Struct timers[0];
+};
+
+struct ExpeditionSetLeaderName_Struct
+{
+/*000*/ uint32 client_id;
+/*004*/ uint32 unknown004;
+/*008*/ char   leader_name[64];
+};
+
+struct ExpeditionCommand_Struct
+{
+/*000*/ uint32 unknown000;
+/*004*/ uint32 unknown004;
+/*008*/ char   name[64];
+};
+
+struct ExpeditionCommandSwap_Struct
+{
+/*000*/ uint32 unknown000;
+/*004*/ uint32 unknown004;
+/*008*/ char   add_player_name[64]; // swap to (player must confirm)
+/*072*/ char   rem_player_name[64]; // swap from
+};
+
+struct ExpeditionExpireWarning
+{
+/*000*/ uint32 client_id;
+/*004*/ uint32 unknown004;
+/*008*/ uint32 minutes_remaining;
+};
+
+struct DynamicZoneCompassEntry_Struct
+{
+/*000*/ uint16 dz_zone_id;      // target dz id pair
+/*002*/ uint16 dz_instance_id;
+/*004*/ uint32 dz_type;         // 1: Expedition, 2: Tutorial (purple), 3: Task, 4: Mission, 5: Quest (green)
+/*008*/ uint32 unknown008;
 /*012*/ float y;
 /*016*/ float x;
 /*020*/ float z;
 };
 
-struct ExpeditionCompass_Struct
+struct DynamicZoneCompass_Struct
 {
-/*000*/ uint32 clientid;
+/*000*/ uint32 client_id;
 /*004*/ uint32 count;
-/*008*/ ExpeditionCompassEntry_Struct entries[0];
+/*008*/ DynamicZoneCompassEntry_Struct entries[0];
+};
+
+struct DynamicZoneChooseZoneEntry_Struct
+{
+/*000*/ uint16 dz_zone_id;     // dz_id pair
+/*002*/ uint16 dz_instance_id;
+/*004*/ uint32 unknown_id1;    // sent back in reply
+/*008*/ uint32 dz_type;        // 1: Expedition, 2: Tutorial, 3: Task, 4: Mission, 5: Quest -- sent back in reply
+/*012*/ uint32 unknown_id2;    // possibly an id based on dz type, for expeditions this was same as dz_id (zone|instance) but task dz was different
+/*016*/ char   description[1]; // variable length, null terminated, max 0x80 (128)
+/*000*/ char   leader_name[1]; // variable length, null terminated, max 0x40 (64)
+};
+
+struct DynamicZoneChooseZone_Struct
+{
+/*000*/ uint32 client_id;
+/*004*/ uint32 count;
+/*008*/ DynamicZoneChooseZoneEntry_Struct choices[0];
+};
+
+struct DynamicZoneChooseZoneReply_Struct
+{
+/*000*/ uint32 unknown000;     // ff ff ff ff
+/*004*/ uint32 unknown004;     // seen 69 00 00 00
+/*008*/ uint32 unknown008;     // ff ff ff ff
+/*012*/ uint32 unknown_id1;    // from choose zone entry message
+/*016*/ uint16 dz_zone_id;     // dz_id pair
+/*018*/ uint16 dz_instance_id;
+/*020*/ uint32 dz_type;        // 1: Expedition, 2: Tutorial, 3: Task, 4: Mission, 5: Quest
+/*024*/ uint32 unknown_id2;    // from choose zone entry message
+/*028*/ uint32 unknown028;     // 00 00 00 00
+/*032*/ uint32 unknown032;     // always same as unknown044
+/*036*/ uint32 unknown036;
+/*040*/ uint32 unknown040;
+/*044*/ uint32 unknown044;     // always same as unknown032
+/*048*/ uint32 unknown048;     // seen 01 00 00 00 and 02 00 00 00
 };
 
 struct AltCurrencySelectItem_Struct {