[LDoN] Update methods for removing wins/losses

Add LDoN remove methods for losses and wins.
2026-05-22 20:33:01 +00:00 · 2021-06-02 08:51:24 -04:00 · 2021-06-01 20:57:03 -04:00
1772 changed files with 241496 additions and 358584 deletions
@@ -0,0 +1,21 @@
+// For format details, see https://aka.ms/vscode-remote/devcontainer.json or this file's README at:
+// https://github.com/microsoft/vscode-dev-containers/tree/v0.101.1/containers/ubuntu-18.04-git
+{	
+	"name": "Ubuntu 18.04 EQEMU",
+	// Moved from dockerfile to image so it builds faster
+	"image": "eqemu/devcontainer:0.0.2",
+
+	// Set *default* container specific settings.json values on container create.
+	"settings": { 
+		"terminal.integrated.shell.linux": "/bin/bash"
+	},
+
+	"runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ],
+	
+	// Add the IDs of extensions you want installed when the container is created.
+	"extensions": ["ms-vscode.cpptools", "ms-azuretools.vscode-docker"],
+	"mounts": ["source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind"],
+	"remoteEnv": {
+		"HOST_PROJECT_PATH": "${localWorkspaceFolder}"
+	}
+}
@@ -1,98 +1,16 @@
 ---
-
 kind: pipeline
 type: docker
-name: Build Linux
+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

-volumes:
-  - name: cache
-    host:
-      path: /var/lib/cache-release
-
 steps:
-  - name: Build Linux X64
-    image: akkadius/eqemu-server:v14
-    environment:
-      GITHUB_TOKEN:
-        from_secret: GH_RELEASE_GITHUB_API_TOKEN
-      RCLONE_CONFIG_REMOTE_TYPE: ftp
-      RCLONE_FTP_HOST: drone.akkadius.com
-      RCLONE_FTP_USER: artifacts
-      RCLONE_FTP_PASS:
-        from_secret: RCLONE_FTP_PASS
+  - 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:
-      - ./utils/scripts/build/linux-build.sh
-    volumes:
-      - name: cache
-        path: /home/eqemu/.ccache/
-
---
-
-kind: pipeline
-type: exec
-name: Build Windows
-
-# Limits how many of these builds can run on the drone runner at a time, this isn't about cores
-concurrency:
-  limit: 1
-
-platform:
-  os: windows
-  arch: amd64
-
-steps:
-  - name: Build Windows X64
-    environment:
-      RCLONE_CONFIG_REMOTE_TYPE: ftp
-      RCLONE_FTP_HOST: drone.akkadius.com
-      RCLONE_FTP_USER: artifacts
-      RCLONE_FTP_PASS:
-        from_secret: RCLONE_FTP_PASS
-      GITHUB_TOKEN:
-        from_secret: GH_RELEASE_GITHUB_API_TOKEN
-    commands:
-      - .\utils\scripts\build\windows-build.ps1
-
---
-
-kind: pipeline
-type: docker
-name: Publish Artifacts to Github
-
-steps:
-  - name: Upload Artifacts
-    image: akkadius/eqemu-build-releaser:v3
-    environment:
-      RCLONE_CONFIG_REMOTE_TYPE: ftp
-      RCLONE_FTP_HOST: drone.akkadius.com
-      RCLONE_FTP_USER: artifacts
-      RCLONE_FTP_PASS:
-        from_secret: RCLONE_FTP_PASS
-      GH_RELEASE_GITHUB_API_TOKEN:
-        from_secret: GH_RELEASE_GITHUB_API_TOKEN
-      GITHUB_TOKEN:
-        from_secret: GH_RELEASE_GITHUB_API_TOKEN
-    commands:
-      - ./utils/scripts/build/should-release/should-release
-      - rclone config create remote ftp env_auth true > /dev/null
-      - |
-        rclone copy remote: --include "eqemu-server*.zip" .
-      - gh-release --assets=eqemu-server-linux-x64.zip,eqemu-server-windows-x64.zip -y
-      - |
-        rclone delete remote: --include "eqemu-server*.zip"
-
-trigger:
-  branch:
-    - master
-  event:
-    - push
-
-depends_on:
-  - Build Windows
-  - Build Linux
-
-
+      - 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))
@@ -54,20 +54,3 @@ bin/
 /Win32
 /x64
 /client_files/**/CMakeFiles/
-
-.idea
-
-# Clangd Generated Files.
-compile_flags.txt
-.cache/
-
-# vscode generated settings
-.vscode/
-
-# Build pipeline
-!utils/scripts/build/
-!utils/scripts/build/should-release/should-release
-!utils/scripts/build/should-release/should-release.exe
-
-# CMake Files
-cmake-build-relwithdebinfo/*
@@ -0,0 +1,19 @@
+language: cpp
+compiler: gcc
+dist: bionic
+
+addons:
+  apt:
+    packages:
+      - libmysqlclient-dev
+      - libperl-dev
+      - libboost-dev
+      - liblua5.1-0-dev
+      - zlib1g-dev
+      - uuid-dev
+      - libssl-dev
+
+script:
+  - cmake -G "Unix Makefiles" -DEQEMU_BUILD_TESTS=ON -DEQEMU_ENABLE_BOTS=ON -DEQEMU_BUILD_LOGIN=ON
+  - make -j2
+  - ./bin/tests
@@ -0,0 +1,16 @@
+{
+    "configurations": [
+        {
+            "name": "Linux",
+            "includePath": [
+                "${workspaceFolder}/**",
+                "/usr/include/mysql"
+            ],
+            "defines": [],
+            "compilerPath": "/usr/bin/gcc",
+            "cStandard": "c11",
+            "cppStandard": "c++17"
+        }
+    ],
+    "version": 4
+}
@@ -0,0 +1,164 @@
+{
+    // See https://go.microsoft.com/fwlink/?LinkId=733558
+    // for the documentation about the tasks.json format
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "make",
+            "type": "shell",
+            "command": "cd bin && make",
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
+            "problemMatcher": [
+                "$gcc"
+            ]
+        },
+        {
+            "label": "make clean",
+            "type": "shell",
+            "command": "cd bin && make clean",
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
+            "problemMatcher": [
+                "$gcc"
+            ]
+        },
+        {
+            "label": "cmake",
+            "type": "shell",
+            "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
+            },
+            "problemMatcher":{
+                "owner": "cpp",
+                "fileLocation": "relative",
+                "pattern":[
+                    {
+                        "regexp": "([\\w+|\\\\]*\\.\\w+)\\((\\d+)\\)\\: (warning|error) (.*)$",
+                        "file": 1,
+                        "location": 2,
+                        "severity": 3,
+                        "message": 4
+                    }
+                ]
+            }
+        },
+        {
+            "label": "download maps",
+            "type": "shell",
+            "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
+            },
+            "problemMatcher": [
+                "$gcc"
+            ]
+        },
+        {
+            "label": "download quests",
+            "type": "shell",
+            "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
+            },
+            "problemMatcher": [
+                "$gcc"
+            ]
+        },
+        {
+            "label": "download eqemu_config",
+            "type": "shell",
+            "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
+            },
+            "problemMatcher": [
+                "$gcc"
+            ]
+        },
+        {
+            "label": "rebuild database (mariadb must be started)",
+            "type": "shell",
+            "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
+            },
+            "problemMatcher": [
+                "$gcc"
+            ]
+        },
+        {
+            "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}/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
+            }
+        },
+        {
+            "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}/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
+            }
+        },
+        {
+            "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}/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
+            }
+        },
+        {
+            "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}/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
+            }
+        },
+        {
+            "label": "queryserv",
+            "type": "shell",
+            "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
+            }
+        },
+        {
+            "label": "mariadb",
+            "type": "shell",
+            "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
+            }
+        }
+    ]
+}
@@ -40,14 +40,14 @@ Assuming it is starting in c:/projects/eqemu and the x64 dependencies were extra

 	mkdir build
 	cd build
-	cmake -G "Visual Studio 15 2017 Win64" -DEQEMU_BUILD_TESTS=ON -DEQEMU_BUILD_LOGIN=ON -DEQEMU_BUILD_ZLIB=ON -DCMAKE_TOOLCHAIN_FILE="c:/projects/eqemu/vcpkg/vcpkg-export-20180828-145455/scripts/buildsystems/vcpkg.cmake" ..
+	cmake -G "Visual Studio 15 2017 Win64" -DEQEMU_BUILD_TESTS=ON -DEQEMU_BUILD_LOGIN=ON -DEQEMU_BUILD_ZLIB=ON -DEQEMU_ENABLE_BOTS=ON -DCMAKE_TOOLCHAIN_FILE="c:/projects/eqemu/vcpkg/vcpkg-export-20180828-145455/scripts/buildsystems/vcpkg.cmake" ..

 ##### Linux
 Similarly to Windows running CMake on Linux is simple it just omits the toolchain file and uses a different generator.

 	mkdir build
 	cd build
-	cmake -G "Unix Makefiles" -DEQEMU_BUILD_TESTS=ON -DEQEMU_BUILD_LOGIN=ON ..
+	cmake -G "Unix Makefiles" -DEQEMU_BUILD_TESTS=ON -DEQEMU_ENABLE_BOTS=ON -DEQEMU_BUILD_LOGIN=ON ..

 ### Building

@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 3.12)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.2)

 SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/" ${CMAKE_MODULE_PATH})

@@ -12,37 +12,16 @@ 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 20)
+SET(CMAKE_CXX_STANDARD 14)
 SET(CMAKE_CXX_STANDARD_REQUIRED ON)
 SET(CMAKE_CXX_EXTENSIONS OFF)

-OPTION(EQEMU_BUILD_STATIC "Build with static linking" OFF)
-OPTION(EQEMU_BUILD_PCH "Build with precompiled headers (Windows)" ON)
-
-IF (EQEMU_BUILD_STATIC)
-	SET(BUILD_SHARED_LIBS OFF)
-	SET(CMAKE_FIND_LIBRARY_SUFFIXES ".lib" ".a")
-	MESSAGE(STATUS "Building with static linking")
-	SET(CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++")
-	IF (UNIX)
-		SET(PERL_LIBRARY "/opt/eqemu-perl/lib/5.32.1/x86_64-linux-thread-multi/CORE/libperl.so")
-		SET(PERL_INCLUDE_PATH "/opt/eqemu-perl/lib/5.32.1/x86_64-linux-thread-multi/CORE/")
-		SET(PERL_EXECUTABLE "/opt/eqemu-perl/bin/perl")
-	ENDIF ()
-ENDIF (EQEMU_BUILD_STATIC)
-
 IF(MSVC)
 	ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS)
 	ADD_DEFINITIONS(-DNOMINMAX)
 	ADD_DEFINITIONS(-DCRASH_LOGGING)
-	ADD_DEFINITIONS(-D_HAS_AUTO_PTR_ETC) # for Luabind on C++17
-
+	
 	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
-
-	OPTION(EQEMU_DISABLE_MSVC_WARNINGS "Disable MSVC compile warnings." ON)
-	IF(EQEMU_DISABLE_MSVC_WARNINGS)
-		ADD_DEFINITIONS( "/W0 /D_CRT_SECURE_NO_WARNINGS /wd4005 /wd4996 /nologo /Os")
-	ENDIF(EQEMU_DISABLE_MSVC_WARNINGS)
 ELSE(MSVC)
 	ADD_DEFINITIONS(-DHAS_UNION_SEMUN)
 ENDIF(MSVC)
@@ -139,16 +118,11 @@ ELSE()
 	MESSAGE(STATUS "* mbedTLS:                               MISSING *")
 ENDIF()

-MESSAGE(STATUS "PERL_INCLUDE_PATH: ${PERL_INCLUDE_PATH}")
-MESSAGE(STATUS "PERL_LIBRARY: ${PERL_LIBRARY}")
-MESSAGE(STATUS "PERL_INCLUDE_DIR: ${PERL_INCLUDE_DIR}")
-MESSAGE(STATUS "PERL_INCLUDE_DIRS: ${PERL_INCLUDE_DIRS}")
-MESSAGE(STATUS "PERL_LIBRARIES: ${PERL_LIBRARIES}")
-MESSAGE(STATUS "PERL_VERSION: ${PERL_VERSION}")
-
 MESSAGE(STATUS "**************************************************")

 #options
+OPTION(EQEMU_DEPOP_INVALIDATES_CACHE "#repop invalidates the npc_types cache (will cause a larger database hit on #repop but is more convienent)." ON)
+OPTION(EQEMU_ENABLE_BOTS "Enable Bots" OFF)
 OPTION(EQEMU_COMMANDS_LOGGING "Enable GM Command logs" ON)
 OPTION(EQEMU_BUILD_SERVER "Build the game server." ON)
 OPTION(EQEMU_BUILD_LOGIN "Build the login server." ON)
@@ -157,58 +131,21 @@ 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)

-#PRNG options
-OPTION(EQEMU_ADDITIVE_LFIB_PRNG "Use Additive LFib for PRNG." OFF)
-MARK_AS_ADVANCED(EQEMU_ADDITIVE_LFIB_PRNG)
-OPTION(EQEMU_BIASED_INT_DIST "Use biased int dist instead of uniform." OFF)
-MARK_AS_ADVANCED(EQEMU_BIASED_INT_DIST)
-SET(EQEMU_CUSTOM_PRNG_ENGINE "" CACHE STRING "Custom random engine. (ex. std::default_random_engine)")
-MARK_AS_ADVANCED(EQEMU_CUSTOM_PRNG_ENGINE)
-
-IF(CMAKE_COMPILER_IS_GNUCXX)
-	OPTION(EQEMU_SFMT19937 "Use GCC's extention for SIMD Fast MT19937." OFF)
-	MARK_AS_ADVANCED(EQEMU_SFMT19937)
-ENDIF()
-
-IF(EQEMU_ADDITIVE_LFIB_PRNG)
-	ADD_DEFINITIONS(-DUSE_ADDITIVE_LFIB_PRNG)
-	IF(EQEMU_SFMT19937)
-		MESSAGE(STATUS "SFMT19937 and ADDITITVE_LFIB_PRNG both set, SFMT19937 ignored.")
-		SET(EQEMU_SFMT19937 OFF)
-	ENDIF()
-	IF(NOT EQEMU_CUSTOM_PRNG_ENGINE STREQUAL "")
-		MESSAGE(STATUS "CUSTOM_PRNG_ENGINE and ADDITITVE_LFIB_PRNG both set, CUSTOM_PRNG_ENGINE ignored.")
-		SET(EQEMU_CUSTOM_PRNG_ENGINE "")
-	ENDIF()
-ENDIF()
-
-IF(EQEMU_SFMT19937)
-	ADD_DEFINITIONS(-DUSE_SFMT19937)
-	IF(NOT EQEMU_CUSTOM_PRNG_ENGINE STREQUAL "")
-		MESSAGE(STATUS "CUSTOM_PRNG_ENGINE and SFMT19937 both set, CUSTOM_PRNG_ENGINE ignored.")
-		SET(EQEMU_CUSTOM_PRNG_ENGINE "")
-	ENDIF()
-ENDIF()
-
-IF(NOT EQEMU_CUSTOM_PRNG_ENGINE STREQUAL "")
-	ADD_DEFINITIONS(-DUSE_CUSTOM_PRNG_ENGINE=${EQEMU_CUSTOM_PRNG_ENGINE})
-ENDIF()
-
-IF(EQEMU_BIASED_INT_DIST)
-	ADD_DEFINITIONS(-DBIASED_INT_DIST)
-ENDIF()
-
 IF(EQEMU_COMMANDS_LOGGING)
 	ADD_DEFINITIONS(-DCOMMANDS_LOGGING)
 ENDIF(EQEMU_COMMANDS_LOGGING)

+IF(EQEMU_ENABLE_BOTS)
+	ADD_DEFINITIONS(-DBOTS)
+ENDIF(EQEMU_ENABLE_BOTS)
+
 #database
 IF(MySQL_FOUND AND MariaDB_FOUND)
 	SET(DATABASE_LIBRARY_SELECTION MariaDB CACHE STRING "Database library to use:
 			MySQL
 			MariaDB"
 	)
-
+	
 	IF(DATABASE_LIBRARY_SELECTION STREQUAL "MySQL")
 		SET(DATABASE_LIBRARY_TYPE "  MySQL")
 		SET(DATABASE_LIBRARY_LIBS ${MySQL_LIBRARIES})
@@ -239,16 +176,13 @@ IF(OpenSSL_FOUND AND MBEDTLS_FOUND)
 			OpenSSL
 			mbedTLS"
 	)
-
+	
 	IF(TLS_LIBRARY_SELECTION STREQUAL "OpenSSL")
 		SET(TLS_LIBRARY_TYPE " OpenSSL")
 		SET(TLS_LIBRARY_ENABLED ON)
 		SET(TLS_LIBRARY_LIBS ${OPENSSL_LIBRARIES})
 		SET(TLS_LIBRARY_INCLUDE ${OPENSSL_INCLUDE_DIR})
 		ADD_DEFINITIONS(-DEQEMU_USE_OPENSSL)
-		IF(${OPENSSL_VERSION} VERSION_GREATER_EQUAL "1.1.1")
-			ADD_DEFINITIONS(-DCPPHTTPLIB_OPENSSL_SUPPORT)
-		ENDIF()
 	ELSEIF(TLS_LIBRARY_SELECTION STREQUAL "mbedTLS")
 		SET(TLS_LIBRARY_TYPE " mbedTLS")
 		SET(TLS_LIBRARY_ENABLED ON)
@@ -264,9 +198,6 @@ ELSEIF(OpenSSL_FOUND)
 	SET(TLS_LIBRARY_LIBS ${OPENSSL_LIBRARIES})
 	SET(TLS_LIBRARY_INCLUDE ${OPENSSL_INCLUDE_DIR})
 	ADD_DEFINITIONS(-DEQEMU_USE_OPENSSL)
-	IF(${OPENSSL_VERSION} VERSION_GREATER_EQUAL "1.1.1")
-		ADD_DEFINITIONS(-DCPPHTTPLIB_OPENSSL_SUPPORT)
-	ENDIF()
 ELSEIF(MBEDTLS_FOUND)
 	SET(TLS_LIBRARY_TYPE " mbedTLS")
 	SET(TLS_LIBRARY_ENABLED ON)
@@ -333,10 +264,6 @@ ELSE()
 	SET(ZLIB_LIBRARY_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/libs/zlibng")
 ENDIF()

-IF (EQEMU_BUILD_STATIC)
-	SET(ZLIB_LIBRARY_LIBS libz.a)
-ENDIF(EQEMU_BUILD_STATIC)
-
 MESSAGE(STATUS "")
 MESSAGE(STATUS "**************************************************")
 MESSAGE(STATUS "* Library Usage                                  *")
@@ -366,8 +293,10 @@ INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/recastnavigat
 INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/recastnavigation/Recast/Include")
 INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/websocketpp")

-# silence obnoxious deprecation message
-ADD_DEFINITIONS(-DBOOST_BIND_GLOBAL_PLACEHOLDERS)
+OPTION(EQEMU_BUILD_LOGGING "Build Logging (To speed up compilation)" ON)
+IF(EQEMU_BUILD_LOGGING)
+	ADD_DEFINITIONS(-DBUILD_LOGGING)
+ENDIF()

 IF(TLS_LIBRARY_ENABLED)
 	SET(SERVER_LIBS ${SERVER_LIBS} ${TLS_LIBRARY_LIBS})
@@ -381,12 +310,12 @@ ENDIF()

 IF(LUA_LIBRARY_ENABLED)
 	OPTION(EQEMU_BUILD_LUA "Build Lua parser." ON)
-
+	
 	IF(EQEMU_BUILD_LUA)
 		ADD_DEFINITIONS(-DLUA_EQEMU)
 		SET(ZONE_LIBS ${LUA_LIBRARY_LIBS})
 		INCLUDE_DIRECTORIES(SYSTEM "${LUA_LIBRARY_INCLUDE}")
-
+		
 		OPTION(EQEMU_SANITIZE_LUA_LIBS "Sanitize Lua Libraries (Remove OS and IO standard libraries from being able to run)." ON)
 		IF(EQEMU_SANITIZE_LUA_LIBS)
 			ADD_DEFINITIONS(-DSANITIZE_LUA_LIBS)
@@ -397,14 +326,10 @@ ENDIF()
 IF(PERL_LIBRARY_ENABLED)
 	OPTION(EQEMU_BUILD_PERL "Build Perl parser." ON)
 	IF(EQEMU_BUILD_PERL)
-		SET(SERVER_LIBS ${SERVER_LIBS} ${PERL_LIBRARY_LIBS} perlbind)
+		SET(SERVER_LIBS ${SERVER_LIBS} ${PERL_LIBRARY_LIBS})
 		INCLUDE_DIRECTORIES(SYSTEM "${PERL_LIBRARY_INCLUDE}")
 		ADD_DEFINITIONS(-DEMBPERL)
 		ADD_DEFINITIONS(-DEMBPERL_PLUGIN)
-		ADD_DEFINITIONS(-DPERLBIND_NO_STRICT_SCALAR_TYPES)
-		IF (UNIX AND EQEMU_BUILD_STATIC)
-			SET(SERVER_LIBS ${SERVER_LIBS} libcrypt.a)
-		ENDIF ()
 	ENDIF()
 ENDIF()

@@ -438,13 +363,13 @@ IF(EQEMU_BUILD_SERVER OR EQEMU_BUILD_LOGIN OR EQEMU_BUILD_TESTS OR EQEMU_BUILD_H
 	ADD_SUBDIRECTORY(libs)
 	ADD_SUBDIRECTORY(submodules/fmt)
 	ADD_SUBDIRECTORY(submodules/libuv)
-
+	
 	IF(EQEMU_BUILD_ZLIB)
 		SET(ZLIB_COMPAT ON CACHE BOOL "Compile with zlib compatible API")
 		SET(ZLIB_ENABLE_TESTS OFF CACHE BOOL "Build test binaries")
 		ADD_SUBDIRECTORY(libs/zlibng)
 	ENDIF()
-
+	
 	SET(RECASTNAVIGATION_DEMO OFF CACHE BOOL "Build demo")
 	SET(RECASTNAVIGATION_TESTS OFF CACHE BOOL "Build tests")
 	SET(RECASTNAVIGATION_EXAMPLES OFF CACHE BOOL "Build examples")
@@ -1,7 +1,7 @@
 # EQEmulator Core Server
-| Drone (Linux x64) | Drone (Windows x64)   |
-|:---:|:---:|
-|[![Build Status](http://drone.akkadius.com/api/badges/EQEmu/Server/status.svg)](http://drone.akkadius.com/EQEmu/Server)   |[![Build Status](http://drone.akkadius.com/api/badges/EQEmu/Server/status.svg)](http://drone.akkadius.com/EQEmu/Server)   |
+|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/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)   |

 ***

@@ -18,16 +18,16 @@
 |**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 Guide](https://docs.eqemu.io/server/installation/server-installation-windows/)
+* [Install Guide](https://eqemu.gitbook.io/server/categories/installation/server-installation-windows)

 ### > Debian/Ubuntu/CentOS/Fedora

-* [Install Guide](https://docs.eqemu.io/server/installation/server-installation-linux/)
+* [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

-> wget --no-check-certificate https://raw.githubusercontent.com/EQEmu/Server/master/utils/scripts/linux_installer/install.sh -O install.sh && chmod 755 install.sh && ./install.sh 
+> wget --no-check-certificate https://raw.githubusercontent.com/EQEmu/Server/master/utils/scripts/linux_installer/install.sh -O install.sh && chmod 755 install.sh && ./install.sh

 ## Supported Clients

@@ -56,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://docs.eqemu.io/)
+- [EQEmulator Wiki](https://eqemu.gitbook.io/)

 ## Related Repositories
 * [ProjectEQ Quests](https://github.com/ProjectEQ/projecteqquests)
@@ -0,0 +1,21 @@
+version: 1.0.{build}
+branches:
+  only:
+  - master
+image: Visual Studio 2017
+configuration: RelWithDebInfo
+clone_folder: c:\projects\eqemu
+init:
+- ps: git config --global core.autocrlf input
+cache: c:\tools\vcpkg\installed\
+before_build:
+- ps: "$wc = New-Object System.Net.WebClient\n$wc.DownloadFile(\"http://strawberryperl.com/download/5.26.2.1/strawberry-perl-5.26.2.1-64bit-portable.zip\", \"c:\\projects\\eqemu\\strawberry-perl-5.26.2.1-64bit-portable.zip\")\ncd c:\\projects\\eqemu\n7z x c:/projects/eqemu/strawberry-perl-5.26.2.1-64bit-portable.zip -oc:/projects/eqemu/strawberry-perl-portable -y\n(Get-Content C:/projects/eqemu/strawberry-perl-portable/perl/lib/CORE/config.h).replace('#define PERL_STATIC_INLINE static __inline__', '#define PERL_STATIC_INLINE static __inline') | Set-Content C:/projects/eqemu/strawberry-perl-portable/perl/lib/CORE/config.h\nvcpkg install boost-geometry:x64-windows boost-dynamic-bitset:x64-windows luajit:x64-windows libsodium:x64-windows libmysql:x64-windows openssl:x64-windows zlib:x64-windows \nmkdir build\ncd build\ncmake -G \"Visual Studio 15 2017 Win64\" -DEQEMU_BUILD_TESTS=ON -DEQEMU_BUILD_LOGIN=ON -EQEMU_ENABLE_BOTS=ON -DPERL_EXECUTABLE=\"C:/projects/eqemu/strawberry-perl-portable/perl/bin/perl.exe\" -DPERL_INCLUDE_PATH=\"C:/projects/eqemu/strawberry-perl-portable/perl/lib/CORE\" -DPERL_LIBRARY=\"C:/projects/eqemu/strawberry-perl-portable/perl/lib/CORE/libperl526.a\" -DCMAKE_TOOLCHAIN_FILE=\"c:/tools/vcpkg/scripts/buildsystems/vcpkg.cmake\" .."
+build:
+  project: C:\projects\eqemu\build\EQEmu.sln
+  parallel: true
+  verbosity: minimal
+after_build:
+- cmd: >-
+    7z a build_x64-bots.zip C:\projects\eqemu\build\bin\RelWithDebInfo\*.exe C:\projects\eqemu\build\bin\RelWithDebInfo\*.dll C:\projects\eqemu\build\bin\RelWithDebInfo\*.pdb C:\projects\eqemu\build\libs\zlibng\RelWithDebInfo\*.dll
+
+    appveyor PushArtifact build_x64-bots.zip
@@ -0,0 +1,21 @@
+version: 1.0.{build}
+branches:
+  only:
+  - master
+image: Visual Studio 2017
+configuration: RelWithDebInfo
+clone_folder: c:\projects\eqemu
+init:
+- ps: git config --global core.autocrlf input
+cache: c:\tools\vcpkg\installed\
+before_build:
+- ps: "$wc = New-Object System.Net.WebClient\n$wc.DownloadFile(\"http://strawberryperl.com/download/5.26.2.1/strawberry-perl-5.26.2.1-64bit-portable.zip\", \"c:\\projects\\eqemu\\strawberry-perl-5.26.2.1-64bit-portable.zip\")\ncd c:\\projects\\eqemu\n7z x c:/projects/eqemu/strawberry-perl-5.26.2.1-64bit-portable.zip -oc:/projects/eqemu/strawberry-perl-portable -y\n(Get-Content C:/projects/eqemu/strawberry-perl-portable/perl/lib/CORE/config.h).replace('#define PERL_STATIC_INLINE static __inline__', '#define PERL_STATIC_INLINE static __inline') | Set-Content C:/projects/eqemu/strawberry-perl-portable/perl/lib/CORE/config.h\nvcpkg install boost-geometry:x64-windows boost-dynamic-bitset:x64-windows luajit:x64-windows libsodium:x64-windows libmysql:x64-windows openssl:x64-windows zlib:x64-windows \nmkdir build\ncd build\ncmake -G \"Visual Studio 15 2017 Win64\" -DEQEMU_BUILD_TESTS=ON -DEQEMU_BUILD_LOGIN=ON -EQEMU_ENABLE_BOTS=OFF -DPERL_EXECUTABLE=\"C:/projects/eqemu/strawberry-perl-portable/perl/bin/perl.exe\" -DPERL_INCLUDE_PATH=\"C:/projects/eqemu/strawberry-perl-portable/perl/lib/CORE\" -DPERL_LIBRARY=\"C:/projects/eqemu/strawberry-perl-portable/perl/lib/CORE/libperl526.a\" -DCMAKE_TOOLCHAIN_FILE=\"c:/tools/vcpkg/scripts/buildsystems/vcpkg.cmake\" .."
+build:
+  project: C:\projects\eqemu\build\EQEmu.sln
+  parallel: true
+  verbosity: minimal
+after_build:
+- cmd: >-
+    7z a build_x64-no-bots.zip C:\projects\eqemu\build\bin\RelWithDebInfo\*.exe C:\projects\eqemu\build\bin\RelWithDebInfo\*.dll C:\projects\eqemu\build\bin\RelWithDebInfo\*.pdb C:\projects\eqemu\build\libs\zlibng\RelWithDebInfo\*.dll
+
+    appveyor PushArtifact build_x64-no-bots.zip
@@ -3,7 +3,7 @@
 ############################################
 #
 # New changelog can be found here
-# https://docs.eqemu.io/server/changelog/server
+# https://eqemu.gitbook.io/changelog/
 #
 ############################################
 # Deprecated
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 3.5)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.2)

 add_subdirectory(import)
 add_subdirectory(export)
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 3.12)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.2)

 SET(export_sources
 	main.cpp
@@ -25,15 +25,11 @@
 #include "../../common/platform.h"
 #include "../../common/crash.h"
 #include "../../common/rulesys.h"
-#include "../../common/strings.h"
+#include "../../common/string_util.h"
 #include "../../common/content/world_content_service.h"
-#include "../../common/zone_store.h"
-#include "../../common/path_manager.h"

 EQEmuLogSys LogSys;
 WorldContentService content_service;
-ZoneStore zone_store;
-PathManager path;

 void ExportSpells(SharedDatabase *db);
 void ExportSkillCaps(SharedDatabase *db);
@@ -46,8 +42,6 @@ int main(int argc, char **argv)
 	LogSys.LoadLogSettingsDefaults();
 	set_exception_handler();

-	path.LoadPaths();
-
 	LogInfo("Client Files Export Utility");
 	if (!EQEmuConfig::LoadConfig()) {
 		LogError("Unable to load configuration file");
@@ -86,13 +80,11 @@ int main(int argc, char **argv)
 			return 1;
 		}
 	} else {
-		content_db.SetMySQL(database);
+		content_db.SetMysql(database.getMySQL());
 	}

-	LogSys.SetDatabase(&database)
-		->SetLogPath(path.GetLogPath())
-		->LoadLogDatabaseSettings()
-		->StartFileLogs();
+	database.LoadLogSettings(LogSys.log_settings);
+	LogSys.StartFileLogs();

 	std::string arg_1;

@@ -131,8 +123,7 @@ void ExportSpells(SharedDatabase *db)
 {
 	LogInfo("Exporting Spells");

-	std::string file = fmt::format("{}/export/spells_us.txt", path.GetServerPath());
-	FILE *f = fopen(file.c_str(), "w");
+	FILE *f = fopen("export/spells_us.txt", "w");
 	if (!f) {
 		LogError("Unable to open export/spells_us.txt to write, skipping.");
 		return;
@@ -183,7 +174,7 @@ bool SkillUsable(SharedDatabase *db, int skill_id, int class_id)
 	}

 	auto row = results.begin();
-	if (row[0] && Strings::ToInt(row[0]) > 0) {
+	if (row[0] && atoi(row[0]) > 0) {
 		return true;
 	}

@@ -207,15 +198,14 @@ int GetSkill(SharedDatabase *db, int skill_id, int class_id, int level)
 	}

 	auto row = results.begin();
-	return Strings::ToInt(row[0]);
+	return atoi(row[0]);
 }

 void ExportSkillCaps(SharedDatabase *db)
 {
 	LogInfo("Exporting Skill Caps");

-	std::string file = fmt::format("{}/export/SkillCaps.txt", path.GetServerPath());
-	FILE *f = fopen(file.c_str(), "w");
+	FILE *f = fopen("export/SkillCaps.txt", "w");
 	if (!f) {
 		LogError("Unable to open export/SkillCaps.txt to write, skipping.");
 		return;
@@ -245,8 +235,7 @@ void ExportBaseData(SharedDatabase *db)
 {
 	LogInfo("Exporting Base Data");

-	std::string file = fmt::format("{}/export/BaseData.txt", path.GetServerPath());
-	FILE *f = fopen(file.c_str(), "w");
+	FILE *f = fopen("export/BaseData.txt", "w");
 	if (!f) {
 		LogError("Unable to open export/BaseData.txt to write, skipping.");
 		return;
@@ -279,8 +268,7 @@ void ExportDBStrings(SharedDatabase *db)
 {
 	LogInfo("Exporting DB Strings");

-	std::string file = fmt::format("{}/export/dbstr_us.txt", path.GetServerPath());
-	FILE *f = fopen(file.c_str(), "w");
+	FILE *f = fopen("export/dbstr_us.txt", "w");
 	if (!f) {
 		LogError("Unable to open export/dbstr_us.txt to write, skipping.");
 		return;
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 3.12)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.2)

 SET(import_sources
 	main.cpp
@@ -23,17 +23,11 @@
 #include "../../common/platform.h"
 #include "../../common/crash.h"
 #include "../../common/rulesys.h"
-#include "../../common/strings.h"
+#include "../../common/string_util.h"
 #include "../../common/content/world_content_service.h"
-#include "../../common/zone_store.h"
-#include "../../common/path_manager.h"
-#include "../../common/repositories/base_data_repository.h"
-#include "../../common/file.h"

 EQEmuLogSys LogSys;
 WorldContentService content_service;
-ZoneStore zone_store;
-PathManager path;

 void ImportSpells(SharedDatabase *db);
 void ImportSkillCaps(SharedDatabase *db);
@@ -45,8 +39,6 @@ int main(int argc, char **argv) {
 	LogSys.LoadLogSettingsDefaults();
 	set_exception_handler();

-	path.LoadPaths();
-
 	LogInfo("Client Files Import Utility");
 	if(!EQEmuConfig::LoadConfig()) {
 		LogError("Unable to load configuration file.");
@@ -85,13 +77,11 @@ int main(int argc, char **argv) {
 			return 1;
 		}
 	} else {
-		content_db.SetMySQL(database);
+		content_db.SetMysql(database.getMySQL());
 	}

-	LogSys.SetDatabase(&database)
-		->SetLogPath(path.GetLogPath())
-		->LoadLogDatabaseSettings()
-		->StartFileLogs();
+	database.LoadLogSettings(LogSys.log_settings);
+	LogSys.StartFileLogs();

 	ImportSpells(&content_db);
 	ImportSkillCaps(&content_db);
@@ -134,10 +124,9 @@ bool IsStringField(int i) {

 void ImportSpells(SharedDatabase *db) {
 	LogInfo("Importing Spells");
-	std::string file = fmt::format("{}/import/spells_us.txt", path.GetServerPath());
-	FILE *f = fopen(file.c_str(), "r");
+	FILE *f = fopen("import/spells_us.txt", "r");
 	if(!f) {
-		LogError("Unable to open {} to read, skipping.", file);
+		LogError("Unable to open import/spells_us.txt to read, skipping.");
 		return;
 	}

@@ -156,8 +145,8 @@ void ImportSpells(SharedDatabase *db) {
 			}
 		}

-		std::string escaped = ::Strings::Escape(buffer);
-		auto split = Strings::Split(escaped, '^');
+		std::string escaped = ::EscapeString(buffer);
+		auto split = SplitString(escaped, '^');
 		int line_columns = (int)split.size();

 		std::string sql;
@@ -224,10 +213,9 @@ void ImportSpells(SharedDatabase *db) {
 void ImportSkillCaps(SharedDatabase *db) {
 	LogInfo("Importing Skill Caps");

-	std::string file = fmt::format("{}/import/SkillCaps.txt", path.GetServerPath());
-	FILE *f = fopen(file.c_str(), "r");
+	FILE *f = fopen("import/SkillCaps.txt", "r");
 	if(!f) {
-		LogError("Unable to open {} to read, skipping.", file);
+		LogError("Unable to open import/SkillCaps.txt to read, skipping.");
 		return;
 	}

@@ -236,17 +224,17 @@ void ImportSkillCaps(SharedDatabase *db) {

 	char buffer[2048];
 	while(fgets(buffer, 2048, f)) {
-		auto split = Strings::Split(buffer, '^');
+		auto split = SplitString(buffer, '^');

 		if(split.size() < 4) {
 			continue;
 		}

 		int class_id, skill_id, level, cap;
-		class_id = Strings::ToInt(split[0].c_str());
-		skill_id = Strings::ToInt(split[1].c_str());
-		level = Strings::ToInt(split[2].c_str());
-		cap = Strings::ToInt(split[3].c_str());
+		class_id = atoi(split[0].c_str());
+		skill_id = atoi(split[1].c_str());
+		level = atoi(split[2].c_str());
+		cap = atoi(split[3].c_str());

 		std::string sql = StringFormat("INSERT INTO skill_caps(class, skillID, level, cap) VALUES(%d, %d, %d, %d)",
 			class_id, skill_id, level, cap);
@@ -257,54 +245,57 @@ void ImportSkillCaps(SharedDatabase *db) {
 	fclose(f);
 }

-void ImportBaseData(SharedDatabase *db)
-{
+void ImportBaseData(SharedDatabase *db) {
 	LogInfo("Importing Base Data");

-	const std::string& file_name = fmt::format("{}/import/BaseData.txt", path.GetServerPath());
-
-	const auto& file_contents = File::GetContents(file_name);
-	if (!file_contents.error.empty()) {
-		LogError("{}", file_contents.error);
+	FILE *f = fopen("import/BaseData.txt", "r");
+	if(!f) {
+		LogError("Unable to open import/BaseData.txt to read, skipping.");
+		return;
 	}

-	db->QueryDatabase("DELETE FROM base_data");
+	std::string delete_sql = "DELETE FROM base_data";
+	db->QueryDatabase(delete_sql);

-	std::vector<BaseDataRepository::BaseData> v;
+	char buffer[2048];
+	while(fgets(buffer, 2048, f)) {
+		auto split = SplitString(buffer, '^');

-	auto e = BaseDataRepository::NewEntity();
-
-	for (const auto& line: Strings::Split(file_contents.contents, "\n")) {
-		const auto& line_data = Strings::Split(line, '^');
-
-		if (line_data.size() < 10) {
+		if(split.size() < 10) {
 			continue;
 		}

-		e.level     = static_cast<uint8_t>(Strings::ToUnsignedInt(line_data[0]));
-		e.class_    = static_cast<uint8_t>(Strings::ToUnsignedInt(line_data[1]));
-		e.hp        = Strings::ToFloat(line_data[2]);
-		e.mana      = Strings::ToFloat(line_data[3]);
-		e.end       = Strings::ToFloat(line_data[4]);
-		e.hp_regen  = Strings::ToFloat(line_data[5]);
-		e.end_regen = Strings::ToFloat(line_data[6]);
-		e.hp_fac    = Strings::ToFloat(line_data[7]);
-		e.mana_fac  = Strings::ToFloat(line_data[8]);
-		e.end_fac   = Strings::ToFloat(line_data[9]);
+		std::string sql;
+		int level, class_id;
+		double hp, mana, end, unk1, unk2, hp_fac, mana_fac, end_fac;

-		v.emplace_back(e);
+		level = atoi(split[0].c_str());
+		class_id = atoi(split[1].c_str());
+		hp = atof(split[2].c_str());
+		mana = atof(split[3].c_str());
+		end = atof(split[4].c_str());
+		unk1 = atof(split[5].c_str());
+		unk2 = atof(split[6].c_str());
+		hp_fac = atof(split[7].c_str());
+		mana_fac = atof(split[8].c_str());
+		end_fac = atof(split[9].c_str());
+
+		sql = StringFormat("INSERT INTO base_data(level, class, hp, mana, end, unk1, unk2, hp_fac, "
+			"mana_fac, end_fac) VALUES(%d, %d, %f, %f, %f, %f, %f, %f, %f, %f)",
+			level, class_id, hp, mana, end, unk1, unk2, hp_fac, mana_fac, end_fac);
+
+		db->QueryDatabase(sql);
 	}

-	BaseDataRepository::InsertMany(*db, v);
+	fclose(f);
 }

 void ImportDBStrings(SharedDatabase *db) {
 	LogInfo("Importing DB Strings");

-	std::string file = fmt::format("{}/import/dbstr_us.txt", path.GetServerPath());
-	FILE *f = fopen(file.c_str(), "r");
+	FILE *f = fopen("import/dbstr_us.txt", "r");
 	if(!f) {
-		LogError("Unable to open {} to read, skipping.", file);
+		LogError("Unable to open import/dbstr_us.txt to read, skipping.");
 		return;
 	}

@@ -326,7 +317,7 @@ void ImportDBStrings(SharedDatabase *db) {
 			}
 		}

-		auto split = Strings::Split(buffer, '^');
+		auto split = SplitString(buffer, '^');

 		if(split.size() < 2) {
 			continue;
@@ -336,11 +327,11 @@ void ImportDBStrings(SharedDatabase *db) {
 		int id, type;
 		std::string value;

-		id = Strings::ToInt(split[0].c_str());
-		type = Strings::ToInt(split[1].c_str());
+		id = atoi(split[0].c_str());
+		type = atoi(split[1].c_str());

 		if(split.size() >= 3) {
-			value = ::Strings::Escape(split[2]);
+			value = ::EscapeString(split[2]);
 		}

 		sql = StringFormat("INSERT INTO db_str(id, type, value) VALUES(%u, %u, '%s')",
@@ -1,147 +0,0 @@
-/*	EQEMu: Everquest Server Emulator
-	Copyright (C) 2001-2021 EQEMu Development Team (http://eqemulator.net)
-
-	This program is free software; you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation; version 2 of the License.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY except by those people which sell it, which
-	are required to give you total support for your newly bought product;
-	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-	A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
-	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
-
-#pragma once
-
-#include <cstdint>
-#include <limits>
-#include <type_traits>
-#include <algorithm>
-#include <iostream>
-
-/*
- * This is an additive lagged fibonacci generator as seen in The Art of Computer Programming, Vol. 2
- * This should roughly match the implementation that EQ's client uses and be compatible with our Random class
- *
- * EQ's rand looks like it was from an example implementation that as posted on pscode.com
- *
- * You might also want to consider defining BIASED_INT_DIST as well to more closely match EQ
- */
-
-namespace EQ {
-	template<typename UIntType, size_t w, size_t j, size_t k>
-	class additive_lagged_fibonacci_engine {
-		static_assert(std::is_unsigned<UIntType>::value, "result_type must be an unsigned integral type");
-		static_assert(0u < j && j < k, "0 < j < k");
-		static_assert(0u < w && w <= std::numeric_limits<UIntType>::digits,
-			      "template argument substituting w out of bounds");
-
-	public:
-		using result_type = UIntType;
-		static constexpr size_t word_size = w;
-		static constexpr size_t short_lag = j;
-		static constexpr size_t long_lag = k;
-		static constexpr result_type default_seed = 19780503u; // default for subtract_with_carry_engine
-
-		additive_lagged_fibonacci_engine() : additive_lagged_fibonacci_engine(default_seed) {}
-
-		explicit additive_lagged_fibonacci_engine(result_type sd) { seed(sd); }
-
-		void seed(result_type seed = default_seed)
-		{
-			state1 = long_lag - long_lag;
-			state2 = long_lag - short_lag;
-			state[0] = static_cast<int>(seed) & ((1u << word_size) - 1);
-			state[1] = 1;
-			for (int i = 2; i < long_lag; ++i)
-				state[i] = (state[i - 1] + state[i - 2]) & ((1u << word_size) - 1);
-			return;
-			}
-			// TODO: seed via seed_seq
-
-			static constexpr result_type min() { return 0; }
-			static constexpr result_type max() { return ((1u << word_size) - 1) >> 6; }
-
-			void discard(unsigned long long z) {
-				for (; z != 0ULL; --z)
-					(*this)();
-			}
-
-			result_type operator()() {
-				result_type rand = (state[state1] + state[state2]) & ((1u << word_size) - 1);
-				state[state1] = rand;
-				if (++state1 == long_lag)
-					state1 = 0;
-				if (++state2 == long_lag)
-					state2 = 0;
-
-				return rand >> 6;
-			}
-
-		private:
-			result_type state1;
-			result_type state2;
-			result_type state[long_lag];
-
-		public:
-			template<typename UInt, size_t W, size_t J, size_t K>
-			friend bool operator==(const additive_lagged_fibonacci_engine<UInt, W, J, K> &x,
-					const additive_lagged_fibonacci_engine<UInt, W, J, K> &y)
-			{
-				return std::equal(x.state, x.state + long_lag, y.state) && x.state1 == y.state1 &&
-				       x.state2 == y.state2;
-			}
-
-			template<typename UInt, size_t W, size_t J, size_t K>
-			friend bool operator!=(const additive_lagged_fibonacci_engine<UInt, W, J, K> &x,
-					const additive_lagged_fibonacci_engine<UInt, W, J, K> &y)
-			{ return !(x == y); }
-
-			template<typename UInt, size_t W, size_t J, size_t K, typename CharT, typename Traits>
-			friend std::basic_ostream<CharT, Traits> &
-			operator<<(std::basic_istream<CharT, Traits> &os, additive_lagged_fibonacci_engine<UInt, W, J, K> &x)
-			{
-				using ios_base = typename std::basic_istream<CharT, Traits>::ios_base;
-
-				const typename ios_base::fmtflags flags = os.flags();
-				const CharT fill = os.fill();
-				const CharT space = os.widen(' ');
-				os.flags(ios_base::dec | ios_base::fixed | ios_base::left);
-				os.fill(space);
-
-				for (size_t i = 0; i < long_lag; ++i)
-					os << x.state[i] << space;
-				os << x.state1 << space << x.state2;
-
-				os.flags(flags);
-				os.fill(fill);
-				return os;
-			}
-
-			template<typename UInt, size_t W, size_t J, size_t K, typename CharT, typename Traits>
-			friend std::basic_istream<CharT, Traits> &
-			operator>>(std::basic_istream<CharT, Traits> &is, additive_lagged_fibonacci_engine<UInt, W, J, K> &x)
-			{
-				using ios_base = typename std::basic_istream<CharT, Traits>::ios_base;
-
-				const typename ios_base::fmtflags flags = is.flags();
-				is.flags(ios_base::dec | ios_base::skipws);
-
-				for (size_t i = 0; i < long_lag; ++i)
-					is >> x.state[i];
-				is >> x.state1;
-				is >> x.state2;
-
-				is.flags(flags);
-				return is;
-			}
-	};
-
-	using EQRand = additive_lagged_fibonacci_engine<uint32_t, 30, 24, 55>;
-};
-
@@ -0,0 +1,190 @@
+/*
+ *  Boost Software License - Version 1.0 - August 17th, 2003
+ *  
+ *  Permission is hereby granted, free of charge, to any person or organization
+ *  obtaining a copy of the software and accompanying documentation covered by
+ *  this license (the "Software") to use, reproduce, display, distribute,
+ *  execute, and transmit the Software, and to prepare derivative works of the
+ *  Software, and to permit third-parties to whom the Software is furnished to
+ *  do so, all subject to the following:
+ *  
+ *  The copyright notices in the Software and this entire statement, including
+ *  the above license grant, this restriction and the following disclaimer,
+ *  must be included in all copies of the Software, in whole or in part, and
+ *  all derivative works of the Software, unless such copies or derivative
+ *  works are solely in the form of machine-executable object code generated by
+ *  a source language processor.
+ *  
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+ *  SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+ *  FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ *  ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ *  DEALINGS IN THE SOFTWARE.
+ */
+
+// 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
+
+#include <algorithm>
+#include <typeinfo>
+
+namespace EQ
+{
+	class Any
+	{
+	public:
+		Any()
+			: content(nullptr) 
+		{
+		}
+
+		template<typename ValueType>
+		Any(const ValueType &value)
+			: content(new Holder<ValueType>(value))
+		{
+		}
+
+		Any(const Any &other)
+			: content(other.content ? other.content->clone() : 0)
+		{
+		}
+		
+		~Any()
+		{
+			if(content)
+				delete content;
+		}
+
+		Any& swap(Any &rhs)
+		{
+			std::swap(content, rhs.content);
+			return *this;
+		}
+
+		template<typename ValueType>
+		Any& operator=(const ValueType &rhs)
+		{
+			Any(rhs).swap(*this);
+			return *this;
+		}
+
+		Any& operator=(Any rhs)
+		{
+			rhs.swap(*this);
+			return *this;
+		}
+
+		bool empty() const
+		{
+			return !content;
+		}
+
+		const std::type_info& type() const
+		{
+			return content ? content->type() : typeid(void);
+		}
+
+		class Placeholder
+		{
+		public:
+			virtual ~Placeholder()
+			{
+			}
+
+			virtual const std::type_info& type() const = 0;
+			virtual Placeholder* clone() const = 0;
+		};
+
+
+		template<typename ValueType>
+		class Holder : public Placeholder
+		{
+		public:
+			Holder(const ValueType &value)
+				: held(value)
+			{
+			}
+
+			virtual const std::type_info& type() const
+			{
+				return typeid(ValueType);
+			}
+
+			virtual Placeholder* clone() const
+			{
+				return new Holder(held);
+			}
+
+			 ValueType held;
+
+		private:
+			Holder& operator=(const Holder&);
+		};
+
+	private:
+		template<typename ValueType>
+		friend ValueType* any_cast(Any*);
+
+		template<typename ValueType>
+		friend ValueType* unsafe_any_cast(Any*);
+
+		Placeholder* content;
+	};
+
+	class bad_any_cast : public std::bad_cast
+	{
+	public:
+		virtual const char * what() const throw()
+		{
+			return "DBI::bad_any_cast: failed conversion using DBI::any_cast";
+		}
+	};
+
+	template<typename ValueType>
+	ValueType* any_cast(Any* operand)
+	{
+		return operand && 
+			operand->type() == typeid(ValueType) ? &static_cast<Any::Holder<ValueType>*>(operand->content)->held : nullptr;
+	}
+
+	template<typename ValueType>
+	inline const ValueType* any_cast(const Any* operand)
+	{
+		return any_cast<ValueType>(const_cast<Any*>(operand));
+	}
+
+	template<typename ValueType>
+	ValueType any_cast(Any& operand)
+	{
+		typedef typename std::remove_reference<ValueType>::type nonref;
+		nonref* result = any_cast<nonref>(&operand);
+		if(!result)
+			throw bad_any_cast();
+		return *result;
+	}
+	
+	template<typename ValueType>
+	inline ValueType any_cast(const Any& operand)
+	{
+		typedef typename std::remove_reference<ValueType>::type nonref;
+		return any_cast<const nonref&>(const_cast<Any&>(operand));
+	}
+
+	template<typename ValueType>
+	inline ValueType* unsafe_any_cast(Any* operand)
+	{
+		return &static_cast<Any::Holder<ValueType>*>(operand->content)->held;
+	}
+
+	template<typename ValueType>
+	inline const ValueType* unsafe_any_cast(const Any* operand)
+	{
+		return unsafe_any_cast<ValueType>(const_cast<Any*>(operand));
+	}
+}
+
+#endif
@@ -0,0 +1,34 @@
+/*	EQEMu: Everquest Server Emulator
+	Copyright (C) 2001-2013 EQEMu Development Team (http://eqemulator.net)
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; version 2 of the License.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY except by those people which sell it, which
+	are required to give you total support for your newly bought product;
+	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+	A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
+
+#ifndef __EQEMU_COMMON_BASE_DATA_H
+#define __EQEMU_COMMON_BASE_DATA_H
+
+struct BaseDataStruct
+{
+	double base_hp;
+	double base_mana;
+	double base_end;
+	double hp_regen;
+	double end_regen;
+	double hp_factor;
+	double mana_factor;
+	double endurance_factor;
+};
+
+#endif
@@ -23,18 +23,18 @@

 BasePacket::BasePacket(const unsigned char *buf, uint32 len)
 {
-	pBuffer=nullptr;
-	size=0;
-	_wpos = 0;
-	_rpos = 0;
-	timestamp.tv_sec = 0;
+	this->pBuffer=nullptr;
+	this->size=0;
+	this->_wpos = 0;
+	this->_rpos = 0;
+	this->timestamp.tv_sec = 0;
 	if (len>0) {
-		size=len;
+		this->size=len;
 		pBuffer= new unsigned char[len];
 		if (buf) {
-			memcpy(pBuffer,buf,len);
+			memcpy(this->pBuffer,buf,len);
 		} else {
-			memset(pBuffer,0,len);
+			memset(this->pBuffer,0,len);
 		}
 	}
 }
@@ -27,17 +27,16 @@ typedef enum {
 	BT_Extraplanar		= 6,
 	BT_Magical			= 7,	//this name might be a bit off,
 	BT_SummonedUndead	= 8,
-	BT_RaidGiant		= 9,    //Velious era Raid Giant
-	BT_RaidColdain      = 10,   //Velious era Raid Coldain
+	BT_RaidGiant		= 9,
+	//					...
 	BT_NoTarget			= 11,	//no name, can't target this bodytype
 	BT_Vampire			= 12,
 	BT_Atenha_Ra		= 13,
 	BT_Greater_Akheva	= 14,
 	BT_Khati_Sha		= 15,
-	BT_Seru				= 16,	
-	BT_Grieg_Veneficus  = 17,
+	BT_Seru				= 16,	//not confirmed....
 	BT_Draz_Nurakk      = 18,
-	BT_Zek				= 19,	//"creatures from the Plane of War."
+	BT_Zek				= 19,
 	BT_Luggald			= 20,
 	BT_Animal			= 21,
 	BT_Insect			= 22,
@@ -47,23 +46,20 @@ typedef enum {
 	BT_Dragon			= 26,
 	BT_Summoned2		= 27,
 	BT_Summoned3		= 28,
-	BT_Dragon2          = 29,   //database data indicates this is a dragon type (kunark and DoN?)
+						//29
 	BT_VeliousDragon	= 30,	//might not be a tight set
-	BT_Familiar			= 31,
+	//					...
 	BT_Dragon3			= 32,
 	BT_Boxes			= 33,
 	BT_Muramite			= 34,	//tribal dudes
 	//					...
 	BT_NoTarget2		= 60,
 	//					...
-	BT_SwarmPet			= 63,	//Looks like weapon proc related temp pets and few misc pets, should not be used for checking swarm pets in general.
-	BT_MonsterSummon	= 64,
-	                   // 65,   trap or effect related?
+	BT_SwarmPet			= 63,	//is this valid, or made up?
+	//					...
 	BT_InvisMan			= 66,	//no name, seen on 'InvisMan', can be /targeted
 	BT_Special			= 67
 } bodyType;
 /* bodytypes above 64 make the mob not show up */

-constexpr int format_as(bodyType type) { return static_cast<int>(type); }
-
 #endif
@@ -19,106 +19,98 @@
 #define CLASSES_CH

 #include "../common/types.h"
-#include "../common/rulesys.h"
-#include <string>
-#include <map>

-namespace Class {
-	constexpr uint8 None                      = 0;
-	constexpr uint8 Warrior                   = 1;
-	constexpr uint8 Cleric                    = 2;
-	constexpr uint8 Paladin                   = 3;
-	constexpr uint8 Ranger                    = 4;
-	constexpr uint8 ShadowKnight              = 5;
-	constexpr uint8 Druid                     = 6;
-	constexpr uint8 Monk                      = 7;
-	constexpr uint8 Bard                      = 8;
-	constexpr uint8 Rogue                     = 9;
-	constexpr uint8 Shaman                    = 10;
-	constexpr uint8 Necromancer               = 11;
-	constexpr uint8 Wizard                    = 12;
-	constexpr uint8 Magician                  = 13;
-	constexpr uint8 Enchanter                 = 14;
-	constexpr uint8 Beastlord                 = 15;
-	constexpr uint8 Berserker                 = 16;
-	constexpr uint8 WarriorGM                 = 20;
-	constexpr uint8 ClericGM                  = 21;
-	constexpr uint8 PaladinGM                 = 22;
-	constexpr uint8 RangerGM                  = 23;
-	constexpr uint8 ShadowKnightGM            = 24;
-	constexpr uint8 DruidGM                   = 25;
-	constexpr uint8 MonkGM                    = 26;
-	constexpr uint8 BardGM                    = 27;
-	constexpr uint8 RogueGM                   = 28;
-	constexpr uint8 ShamanGM                  = 29;
-	constexpr uint8 NecromancerGM             = 30;
-	constexpr uint8 WizardGM                  = 31;
-	constexpr uint8 MagicianGM                = 32;
-	constexpr uint8 EnchanterGM               = 33;
-	constexpr uint8 BeastlordGM               = 34;
-	constexpr uint8 BerserkerGM               = 35;
-	constexpr uint8 Banker                    = 40;
-	constexpr uint8 Merchant                  = 41;
-	constexpr uint8 DiscordMerchant           = 59;
-	constexpr uint8 AdventureRecruiter        = 60;
-	constexpr uint8 AdventureMerchant         = 61;
-	constexpr uint8 LDoNTreasure              = 62;
-	constexpr uint8 TributeMaster             = 63;
-	constexpr uint8 GuildTributeMaster        = 64;
-	constexpr uint8 GuildBanker               = 66;
-	constexpr uint8 NorrathsKeepersMerchant   = 67;
-	constexpr uint8 DarkReignMerchant         = 68;
-	constexpr uint8 FellowshipMaster          = 69;
-	constexpr uint8 AlternateCurrencyMerchant = 70;
-	constexpr uint8 MercenaryLiaison          = 71;
+#define WARRIOR 1
+#define CLERIC 2
+#define PALADIN 3
+#define RANGER 4
+#define SHADOWKNIGHT 5
+#define DRUID 6
+#define MONK 7
+#define BARD 8
+#define ROGUE 9
+#define SHAMAN 10
+#define NECROMANCER 11
+#define WIZARD 12
+#define MAGICIAN 13
+#define ENCHANTER 14
+#define BEASTLORD 15
+#define BERSERKER 16
+#define WARRIORGM 20
+#define CLERICGM 21
+#define PALADINGM 22
+#define RANGERGM 23
+#define SHADOWKNIGHTGM 24
+#define DRUIDGM 25
+#define MONKGM 26
+#define BARDGM 27
+#define ROGUEGM 28
+#define SHAMANGM 29
+#define NECROMANCERGM 30
+#define WIZARDGM 31
+#define MAGICIANGM 32
+#define ENCHANTERGM 33
+#define BEASTLORDGM 34
+#define BERSERKERGM 35
+#define BANKER 40
+#define MERCHANT 41
+#define DISCORD_MERCHANT 59
+#define ADVENTURERECRUITER 60
+#define ADVENTUREMERCHANT 61
+#define LDON_TREASURE 62	// objects you can use /open on first seen in LDONs
+#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
+#define ALT_CURRENCY_MERCHANT 70
+#define MERCERNARY_MASTER 71

-	constexpr uint8  PLAYER_CLASS_COUNT  = 16;
-	constexpr uint16 ALL_CLASSES_BITMASK = 65535;
-};

-static std::map<uint8, uint16> player_class_bitmasks = {
-	{Class::Warrior,      1},
-	{Class::Cleric,       2},
-	{Class::Paladin,      4},
-	{Class::Ranger,       8},
-	{Class::ShadowKnight, 16},
-	{Class::Druid,        32},
-	{Class::Monk,         64},
-	{Class::Bard,         128},
-	{Class::Rogue,        256},
-	{Class::Shaman,       512},
-	{Class::Necromancer,  1024},
-	{Class::Wizard,       2048},
-	{Class::Magician,     4096},
-	{Class::Enchanter,    8192},
-	{Class::Beastlord,    16384},
-	{Class::Berserker,    32768},
-};
+// player class values
+#define PLAYER_CLASS_UNKNOWN 0
+#define PLAYER_CLASS_WARRIOR 1
+#define PLAYER_CLASS_CLERIC 2
+#define PLAYER_CLASS_PALADIN 3
+#define PLAYER_CLASS_RANGER 4
+#define PLAYER_CLASS_SHADOWKNIGHT 5
+#define PLAYER_CLASS_DRUID 6
+#define PLAYER_CLASS_MONK 7
+#define PLAYER_CLASS_BARD 8
+#define PLAYER_CLASS_ROGUE 9
+#define PLAYER_CLASS_SHAMAN 10
+#define PLAYER_CLASS_NECROMANCER 11
+#define PLAYER_CLASS_WIZARD 12
+#define PLAYER_CLASS_MAGICIAN 13
+#define PLAYER_CLASS_ENCHANTER 14
+#define PLAYER_CLASS_BEASTLORD 15
+#define PLAYER_CLASS_BERSERKER 16

-static std::string shadow_knight_class_name = (
-	RuleB(World, UseOldShadowKnightClassExport) ?
-	"Shadowknight" :
-	"Shadow Knight"
-);
+#define PLAYER_CLASS_COUNT 16

-static std::map<uint8, std::string> class_names = {
-	{Class::Warrior,      "Warrior"},
-	{Class::Cleric,       "Cleric"},
-	{Class::Paladin,      "Paladin"},
-	{Class::Ranger,       "Ranger"},
-	{Class::ShadowKnight, shadow_knight_class_name},
-	{Class::Druid,        "Druid"},
-	{Class::Monk,         "Monk"},
-	{Class::Bard,         "Bard"},
-	{Class::Rogue,        "Rogue"},
-	{Class::Shaman,       "Shaman"},
-	{Class::Necromancer,  "Necromancer"},
-	{Class::Wizard,       "Wizard"},
-	{Class::Magician,     "Magician"},
-	{Class::Enchanter,    "Enchanter"},
-	{Class::Beastlord,    "Beastlord"},
-	{Class::Berserker,    "Berserker"},
-};
+
+// player class bits
+#define PLAYER_CLASS_UNKNOWN_BIT 0
+#define PLAYER_CLASS_WARRIOR_BIT 1
+#define PLAYER_CLASS_CLERIC_BIT 2
+#define PLAYER_CLASS_PALADIN_BIT 4
+#define PLAYER_CLASS_RANGER_BIT 8
+#define PLAYER_CLASS_SHADOWKNIGHT_BIT 16
+#define PLAYER_CLASS_DRUID_BIT 32
+#define PLAYER_CLASS_MONK_BIT 64
+#define PLAYER_CLASS_BARD_BIT 128
+#define PLAYER_CLASS_ROGUE_BIT 256
+#define PLAYER_CLASS_SHAMAN_BIT 512
+#define PLAYER_CLASS_NECROMANCER_BIT 1024
+#define PLAYER_CLASS_WIZARD_BIT 2048
+#define PLAYER_CLASS_MAGICIAN_BIT 4096
+#define PLAYER_CLASS_ENCHANTER_BIT 8192
+#define PLAYER_CLASS_BEASTLORD_BIT 16384
+#define PLAYER_CLASS_BERSERKER_BIT 32768
+
+#define PLAYER_CLASS_ALL_MASK 65535	// was 65536


 #define ARMOR_TYPE_UNKNOWN 0
@@ -133,12 +125,13 @@ static std::map<uint8, std::string> class_names = {


 const char* GetClassIDName(uint8 class_id, uint8 level = 0);
+const char* GetPlayerClassName(uint32 player_class_value, uint8 level = 0);

-bool IsPlayerClass(uint8 class_id);
-const std::string GetPlayerClassAbbreviation(uint8 class_id);
+uint32 GetPlayerClassValue(uint8 class_id);
+uint32 GetPlayerClassBit(uint8 class_id);

-uint8 GetPlayerClassValue(uint8 class_id);
-uint16 GetPlayerClassBit(uint8 class_id);
+uint8 GetClassIDFromPlayerClassValue(uint32 player_class_value);
+uint8 GetClassIDFromPlayerClassBit(uint32 player_class_bit);

 bool IsFighterClass(uint8 class_id);
 bool IsSpellFighterClass(uint8 class_id);
@@ -147,8 +140,7 @@ bool IsHybridClass(uint8 class_id);
 bool IsCasterClass(uint8 class_id);
 bool IsINTCasterClass(uint8 class_id);
 bool IsWISCasterClass(uint8 class_id);
-bool IsHeroicINTCasterClass(uint8 class_id);
-bool IsHeroicWISCasterClass(uint8 class_id);
+
 bool IsPlateClass(uint8 class_id);
 bool IsChainClass(uint8 class_id);
 bool IsLeatherClass(uint8 class_id);
@@ -39,15 +39,15 @@ namespace EQEmuCommand {
 	{
 		if (cmd[{"-d", "--debug"}]) {
 			std::cout << "Positional args:\n";
-			for (auto &pos_arg: cmd.pos_args())
+			for (auto &pos_arg : cmd.pos_args())
 				std::cout << '\t' << pos_arg << std::endl;

 			std::cout << "\nFlags:\n";
-			for (auto &flag: cmd.flags())
+			for (auto &flag : cmd.flags())
 				std::cout << '\t' << flag << std::endl;

 			std::cout << "\nParameters:\n";
-			for (auto &param: cmd.params())
+			for (auto &param : cmd.params())
 				std::cout << '\t' << param.first << " : " << param.second << std::endl;
 		}
 	}
@@ -69,22 +69,22 @@ namespace EQEmuCommand {
 	{
 		bool arguments_filled = true;

-		int       index = 2;
-		for (auto &arg: arguments) {
+		int index = 2;
+		for (auto &arg : arguments) {
 			if (cmd(arg).str().empty() && cmd(index).str().empty()) {
 				arguments_filled = false;
 			}
 			index++;
 		}

-		if (!arguments_filled || (argc == 2 && !cmd[{"-h", "--help"}]) || (argc == 3 && cmd[{"-h", "--help"}])) {
+		if (!arguments_filled || argc == 2 || cmd[{"-h", "--help"}]) {
 			std::string arguments_string;
-			for (auto   &arg: arguments) {
+			for (auto &arg : arguments) {
 				arguments_string += " " + arg;
 			}

 			std::string options_string;
-			for (auto   &opt: options) {
+			for (auto   &opt : options) {
 				options_string += "  " + opt + "\n";
 			}

@@ -124,6 +124,14 @@ namespace EQEmuCommand {
 	)
 	{
 		std::string description;
+		bool        ran_command = false;
+		for (auto   &it: in_function_map) {
+			if (it.first == argv[1]) {
+				(it.second)(argc, argv, cmd, description);
+				ran_command = true;
+			}
+		}
+
 		if (cmd[{"-h", "--help"}]) {
 			std::cout << std::endl;
 			std::cout <<
@@ -134,7 +142,9 @@ namespace EQEmuCommand {
 					  << std::endl
 					  << std::endl;

-			// Get max command length for padding length
+			/**
+			 * Get max command length for padding length
+			 */
 			int max_command_length = 0;

 			for (auto &it: in_function_map) {
@@ -145,14 +155,18 @@ namespace EQEmuCommand {
 				}
 			}

-			// Display command menu
+			/**
+			 * Display command menu
+			 */
 			std::string command_section;
 			for (auto   &it: in_function_map) {
-				description.clear();
+				description = "";

 				(it.second)(argc, argv, cmd, description);

-				// Print section header
+				/**
+				 * Print section header
+				 */
 				std::string command_prefix = it.first.substr(0, it.first.find(":"));

 				if (command_prefix.find("test") != std::string::npos) {
@@ -164,7 +178,9 @@ namespace EQEmuCommand {
 					std::cout << termcolor::reset << command_prefix << std::endl;
 				}

-				// Print commands
+				/**
+				 * Print commands
+				 */
 				std::stringstream command;
 				command << termcolor::colorize << termcolor::yellow << it.first << termcolor::reset;
 				printf("  %-*s %s\n", max_command_length, command.str().c_str(), description.c_str());
@@ -175,15 +191,6 @@ namespace EQEmuCommand {
 			std::exit(0);
 		}

-		bool ran_command = false;
-
-		for (auto &it: in_function_map) {
-			if (it.first == argv[1]) {
-				(it.second)(argc, argv, cmd, description);
-				ran_command = true;
-			}
-		}
-
 		if (ran_command) {
 			std::exit(0);
 		}
@@ -1,11 +1,28 @@
-#include "world_content_service.h"
+/**
+ * EQEmulator: Everquest Server Emulator
+ * Copyright (C) 2001-2019 EQEmulator Development Team (https://github.com/EQEmu/Server)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY except by those people which sell it, which
+ * are required to give you total support for your newly bought product;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */

-#include <utility>
-#include <glm/vec3.hpp>
+#include "world_content_service.h"
 #include "../database.h"
 #include "../rulesys.h"
 #include "../eqemu_logsys.h"
-#include "../repositories/instance_list_repository.h"
+#include "../repositories/content_flags_repository.h"


 WorldContentService::WorldContentService()
@@ -18,12 +35,8 @@ int WorldContentService::GetCurrentExpansion() const
 	return current_expansion;
 }

-WorldContentService *WorldContentService::SetExpansionContext()
+void WorldContentService::SetExpansionContext()
 {
-	// do a rule manager reload until where we store expansion is changed to somewhere else
-	RuleManager::Instance()->LoadRules(GetDatabase(), "default", true);
-
-	// pull expansion from rules
 	int expansion = RuleI(Expansion, CurrentExpansion);
 	if (expansion >= Expansion::Classic && expansion <= Expansion::MaxId) {
 		content_service.SetCurrentExpansion(expansion);
@@ -34,8 +47,6 @@ WorldContentService *WorldContentService::SetExpansionContext()
 		GetCurrentExpansion(),
 		GetCurrentExpansionName()
 	);
-
-	return this;
 }

 std::string WorldContentService::GetCurrentExpansionName()
@@ -62,47 +73,15 @@ void WorldContentService::SetCurrentExpansion(int current_expansion)
 /**
 * @return
 */
-const std::vector<ContentFlagsRepository::ContentFlags> &WorldContentService::GetContentFlags() const
+const std::vector<std::string> &WorldContentService::GetContentFlags() const
 {
 	return content_flags;
 }

-/**
- * @return
- */
-std::vector<std::string> WorldContentService::GetContentFlagsEnabled()
-{
-	std::vector<std::string> enabled_flags;
-
-	for (auto &f: GetContentFlags()) {
-		if (f.enabled) {
-			enabled_flags.emplace_back(f.flag_name);
-		}
-	}
-
-	return enabled_flags;
-}
-
-/**
- * @return
- */
-std::vector<std::string> WorldContentService::GetContentFlagsDisabled()
-{
-	std::vector<std::string> disabled_flags;
-
-	for (auto &f: GetContentFlags()) {
-		if (!f.enabled) {
-			disabled_flags.emplace_back(f.flag_name);
-		}
-	}
-
-	return disabled_flags;
-}
-
 /**
 * @param content_flags
 */
-void WorldContentService::SetContentFlags(const std::vector<ContentFlagsRepository::ContentFlags> &content_flags)
+void WorldContentService::SetContentFlags(std::vector<std::string> content_flags)
 {
 	WorldContentService::content_flags = content_flags;
 }
@@ -111,10 +90,10 @@ void WorldContentService::SetContentFlags(const std::vector<ContentFlagsReposito
 * @param content_flag
 * @return
 */
-bool WorldContentService::IsContentFlagEnabled(const std::string &content_flag)
+bool WorldContentService::IsContentFlagEnabled(const std::string& content_flag)
 {
-	for (auto &f: GetContentFlags()) {
-		if (f.flag_name == content_flag && f.enabled == true) {
+	for (auto &flag : GetContentFlags()) {
+		if (flag == content_flag) {
 			return true;
 		}
 	}
@@ -122,233 +101,20 @@ bool WorldContentService::IsContentFlagEnabled(const std::string &content_flag)
 	return false;
 }

-/**
- * @param content_flag
- * @return
- */
-bool WorldContentService::IsContentFlagDisabled(const std::string &content_flag)
+void WorldContentService::ReloadContentFlags(Database &db)
 {
-	for (auto &f: GetContentFlags()) {
-		if (f.flag_name == content_flag && f.enabled == false) {
-			return true;
-		}
+	std::vector<std::string> set_content_flags;
+	auto                     content_flags = ContentFlagsRepository::GetWhere(db, "enabled = 1");
+
+	set_content_flags.reserve(content_flags.size());
+	for (auto &flags: content_flags) {
+		set_content_flags.push_back(flags.flag_name);
 	}

-	return false;
-}
-
-bool WorldContentService::DoesPassContentFiltering(const ContentFlags &f)
-{
-	// if we're not set to (-1 All) then fail when we aren't within minimum expansion
-	if (f.min_expansion > Expansion::EXPANSION_ALL && current_expansion < f.min_expansion && current_expansion != -1) {
-		return false;
-	}
-
-	// if we're not set to (-1 All) then fail when we aren't within max expansion
-	if (f.max_expansion > Expansion::EXPANSION_ALL && current_expansion > f.max_expansion && current_expansion != -1) {
-		return false;
-	}
-
-	// if we don't have any enabled flag in enabled flags, we fail
-	for (const auto &flag: Strings::Split(f.content_flags)) {
-		if (!Strings::Contains(GetContentFlagsEnabled(), flag)) {
-			return false;
-		}
-	}
-
-	// if we don't have any disabled flag in disabled flags, we fail
-	for (const auto &flag: Strings::Split(f.content_flags_disabled)) {
-		if (!Strings::Contains(GetContentFlagsDisabled(), flag)) {
-			return false;
-		}
-	}
-
-	return true;
-}
-
-void WorldContentService::ReloadContentFlags()
-{
-	std::vector<ContentFlagsRepository::ContentFlags> set_content_flags;
-	auto                                              flags = ContentFlagsRepository::All(*GetDatabase());
-
-	set_content_flags.reserve(flags.size());
-	for (auto &f: flags) {
-		set_content_flags.push_back(f);
-
-		LogInfo(
-			"Loaded content flag [{}] [{}]",
-			f.flag_name,
-			(f.enabled ? "enabled" : "disabled")
-		);
-	}
-
-	SetContentFlags(set_content_flags);
-	LoadZones();
-	LoadStaticGlobalZoneInstances();
-}
-
-Database *WorldContentService::GetDatabase() const
-{
-	return m_database;
-}
-
-WorldContentService *WorldContentService::SetDatabase(Database *database)
-{
-	WorldContentService::m_database = database;
-
-	return this;
-}
-
-Database *WorldContentService::GetContentDatabase() const
-{
-	return m_content_database;
-}
-
-WorldContentService *WorldContentService::SetContentDatabase(Database *database)
-{
-	WorldContentService::m_content_database = database;
-
-	return this;
-}
-
-void WorldContentService::SetContentFlag(const std::string &content_flag_name, bool enabled)
-{
-	auto flags = ContentFlagsRepository::GetWhere(
-		*GetDatabase(),
-		fmt::format("flag_name = '{}'", content_flag_name)
+	LogInfo(
+		"Enabled content flags [{}]",
+		implode(", ", set_content_flags)
 	);

-	auto f = ContentFlagsRepository::NewEntity();
-	if (!flags.empty()) {
-		f = flags.front();
-	}
-
-	f.enabled   = enabled ? 1 : 0;
-	f.flag_name = content_flag_name;
-
-	if (!flags.empty()) {
-		ContentFlagsRepository::UpdateOne(*GetDatabase(), f);
-	}
-	else {
-		ContentFlagsRepository::InsertOne(*GetDatabase(), f);
-	}
-
-	ReloadContentFlags();
+	SetContentFlags(set_content_flags);
 }
-
-// HandleZoneRoutingMiddleware is meant to handle content and context aware zone routing
-//
-// example # 1
-// lavastorm (pre-don) version 0 (classic)
-// lavastorm (don) version 1
-// we want to route players to the correct version of lavastorm based on the current server side expansion
-// in order to do that the simplest and cleanest way we intercept the zoning process and route players to an "instance" of the zone
-// the reason why we're doing this is because all of the zoning logic already is handled by two keys "zone_id" and "instance_id"
-// we can leverage static, never expires instances to handle this but to the client they don't see it any other way than a public normal zone
-// scripts handle all the same way, you don't have to think about instances, the middleware will handle the magic
-// the versions of zones are represented by two zone entries that have potentially different min/max expansion and/or different content flags
-// we decide to route the client to the correct version of the zone based on the current server side expansion
-void WorldContentService::HandleZoneRoutingMiddleware(ZoneChange_Struct *zc)
-{
-	auto r = FindZone(zc->zoneID, zc->instanceID);
-	if (r.zone_id == 0) {
-		return;
-	}
-
-	zc->instanceID = r.instance.id;
-}
-
-// LoadStaticGlobalZoneInstances loads all static global zone instances
-// these are zones that are never set to expire and are global
-// these are used commonly in v1/v2/v3 versions of the same zone for expansion routing
-WorldContentService * WorldContentService::LoadStaticGlobalZoneInstances()
-{
-	m_zone_instances = InstanceListRepository::GetWhere(*GetDatabase(), fmt::format("never_expires = 1 AND is_global = 1"));
-
-	LogInfo("Loaded [{}] zone_instances", m_zone_instances.size());
-
-	return this;
-}
-
-// LoadZones sets the zones for the world content service
-// this is used for zone routing middleware
-// we pull the zone list from the zone repository and feed from the zone store for now
-// we're holding a copy in the content service - but we're talking 250kb of data in memory to handle routing of zoning
-WorldContentService * WorldContentService::LoadZones()
-{
-	m_zones = ZoneRepository::All(*GetContentDatabase());
-
-	LogInfo("Loaded [{}] zones", m_zones.size());
-
-	return this;
-}
-
-// FindZone is critical to the zone routing middleware and any logic that needs to route players to the correct zone
-// era contextual routing, multiple version of zones, etc
-WorldContentService::FindZoneResult WorldContentService::FindZone(uint32 zone_id, uint32 instance_id)
-{
-	// if we're already in a regular instance, we don't want to route the player to another instance
-	if (instance_id > RuleI(Instances, ReservedInstances)) {
-		return WorldContentService::FindZoneResult{};
-	}
-
-	for (auto &z: m_zones) {
-		if (z.zoneidnumber == zone_id) {
-			auto f = ContentFlags{
-				.min_expansion = z.min_expansion,
-				.max_expansion = z.max_expansion,
-				.content_flags = z.content_flags,
-				.content_flags_disabled = z.content_flags_disabled
-			};
-
-			if (DoesPassContentFiltering(f)) {
-				LogInfo(
-					"Attempting to route player to zone [{}] ({}) version [{}] long_name [{}]",
-					z.short_name,
-					z.zoneidnumber,
-					z.version,
-					z.long_name
-				);
-
-				// first pass, explicit match on public static global zone instances
-				for (auto &i: m_zone_instances) {
-					if (i.zone == zone_id && i.version == z.version) {
-						LogInfo(
-							"Routed player to instance [{}] of zone [{}] ({}) version [{}] long_name [{}] notes [{}]",
-							i.id,
-							z.short_name,
-							z.zoneidnumber,
-							z.version,
-							z.long_name,
-							i.notes
-						);
-
-						return WorldContentService::FindZoneResult{
-							.zone_id = static_cast<uint32>(z.zoneidnumber),
-							.instance = i,
-							.zone = z
-						};
-					}
-				}
-
-				LogInfo(
-					"Routed player to non-instance zone [{}] ({}) version [{}] long_name [{}] notes [{}]",
-					z.short_name,
-					z.zoneidnumber,
-					z.version,
-					z.long_name,
-					z.note
-				);
-
-				return WorldContentService::FindZoneResult{
-					.zone_id = static_cast<uint32>(z.zoneidnumber),
-					.instance = InstanceListRepository::NewEntity(),
-					.zone = z
-				};
-			}
-		}
-	}
-
-	return WorldContentService::FindZoneResult{};
-}
-
@@ -1,21 +1,31 @@
+/**
+ * EQEmulator: Everquest Server Emulator
+ * Copyright (C) 2001-2019 EQEmulator Development Team (https://github.com/EQEmu/Server)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY except by those people which sell it, which
+ * are required to give you total support for your newly bought product;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
 #ifndef EQEMU_WORLD_CONTENT_SERVICE_H
 #define EQEMU_WORLD_CONTENT_SERVICE_H

 #include <string>
 #include <vector>
-#include "../repositories/content_flags_repository.h"
-#include "../repositories/zone_repository.h"
-#include "../repositories/instance_list_repository.h"

 class Database;

-struct ContentFlags {
-	int16       min_expansion;
-	int16       max_expansion;
-	std::string content_flags;
-	std::string content_flags_disabled;
-};
-
 namespace Expansion {
 	static const int EXPANSION_ALL        = -1;
 	static const int EXPANSION_FILTER_MAX = 99;
@@ -42,7 +52,7 @@ namespace Expansion {
 		VeilOfAlaris,
 		RainOfFear,
 		CallOfTheForsaken,
-		TheDarkenedSea,
+		TheDarkendSea,
 		TheBrokenMirror,
 		EmpiresOfKunark,
 		RingOfScale,
@@ -115,7 +125,7 @@ public:
 	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 IsTheDarkenedSeaEnabled() { return GetCurrentExpansion() >= Expansion::ExpansionNumber::TheDarkenedSea || 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; }
@@ -143,54 +153,22 @@ public:
 	bool IsCurrentExpansionVeilOfAlaris() { return current_expansion == Expansion::ExpansionNumber::VeilOfAlaris; }
 	bool IsCurrentExpansionRainOfFear() { return current_expansion == Expansion::ExpansionNumber::RainOfFear; }
 	bool IsCurrentExpansionCallOfTheForsaken() { return current_expansion == Expansion::ExpansionNumber::CallOfTheForsaken; }
-	bool IsCurrentExpansionTheDarkenedSea() { return current_expansion == Expansion::ExpansionNumber::TheDarkenedSea; }
+	bool IsCurrentExpansionTheDarkendSea() { return current_expansion == Expansion::ExpansionNumber::TheDarkendSea; }
 	bool IsCurrentExpansionTheBrokenMirror() { return current_expansion == Expansion::ExpansionNumber::TheBrokenMirror; }
 	bool IsCurrentExpansionEmpiresOfKunark() { return current_expansion == Expansion::ExpansionNumber::EmpiresOfKunark; }
 	bool IsCurrentExpansionRingOfScale() { return current_expansion == Expansion::ExpansionNumber::RingOfScale; }
 	bool IsCurrentExpansionTheBurningLands() { return current_expansion == Expansion::ExpansionNumber::TheBurningLands; }
 	bool IsCurrentExpansionTormentOfVelious() { return current_expansion == Expansion::ExpansionNumber::TormentOfVelious; }

-	const std::vector<ContentFlagsRepository::ContentFlags> &GetContentFlags() const;
-	std::vector<std::string> GetContentFlagsEnabled();
-	std::vector<std::string> GetContentFlagsDisabled();
-	bool IsContentFlagEnabled(const std::string& content_flag);
-	bool IsContentFlagDisabled(const std::string& content_flag);
-	void SetContentFlags(const std::vector<ContentFlagsRepository::ContentFlags>& content_flags);
-	void ReloadContentFlags();
-	WorldContentService * SetExpansionContext();
-
-	bool DoesPassContentFiltering(const ContentFlags& f);
-
-	WorldContentService * SetDatabase(Database *database);
-	Database *GetDatabase() const;
-
-	WorldContentService * SetContentDatabase(Database *database);
-	Database *GetContentDatabase() const;
-
-	void SetContentFlag(const std::string &content_flag_name, bool enabled);
-
-	void HandleZoneRoutingMiddleware(ZoneChange_Struct *zc);
-
-	struct FindZoneResult {
-		uint32                               zone_id = 0;
-		InstanceListRepository::InstanceList instance;
-		ZoneRepository::Zone                 zone;
-	};
-
-	FindZoneResult FindZone(uint32 zone_id, uint32 instance_id);
 private:
 	int current_expansion{};
-	std::vector<ContentFlagsRepository::ContentFlags> content_flags;
-
-	// reference to database
-	Database *m_database;
-	Database *m_content_database;
-
-	// holds a record of the zone table from the database
-	std::vector<ZoneRepository::Zone> m_zones = {};
-	WorldContentService *LoadStaticGlobalZoneInstances();
-	std::vector<InstanceListRepository::InstanceList> m_zone_instances;
-	WorldContentService * LoadZones();
+	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 ReloadContentFlags(Database &db);
+	void SetExpansionContext();
 };

 extern WorldContentService content_service;
@@ -1,95 +1,6 @@
 #include "global_define.h"
 #include "eqemu_logsys.h"
 #include "crash.h"
-#include "strings.h"
-#include "process/process.h"
-#include "http/httplib.h"
-#include "http/uri.h"
-#include "json/json.h"
-#include "version.h"
-#include "eqemu_config.h"
-#include "serverinfo.h"
-#include "rulesys.h"
-#include "platform.h"
-
-#include <cstdio>
-#include <vector>
-
-#if WINDOWS
-#define popen _popen
-#endif
-
-void SendCrashReport(const std::string &crash_report)
-{
-	// can configure multiple endpoints if need be
-	std::vector<std::string> endpoints = {
-		"https://spire.akkadius.com/api/v1/analytics/server-crash-report",
-//		"http://localhost:3010/api/v1/analytics/server-crash-report", // development
-	};
-
-	auto      config = EQEmuConfig::get();
-	for (auto &e: endpoints) {
-		uri u(e);
-
-		std::string base_url = fmt::format("{}://{}", u.get_scheme(), u.get_host());
-		if (u.get_port()) {
-			base_url += fmt::format(":{}", u.get_port());
-		}
-
-		// client
-		httplib::Client r(base_url);
-		r.set_connection_timeout(1, 0);
-		r.set_read_timeout(1, 0);
-		r.set_write_timeout(1, 0);
-
-		// os info
-		auto os         = EQ::GetOS();
-		auto cpus       = EQ::GetCPUs();
-		auto process_id = EQ::GetPID();
-		auto rss        = EQ::GetRSS() / 1048576.0;
-		auto uptime     = static_cast<uint32>(EQ::GetUptime());
-
-		// payload
-		Json::Value p;
-		p["platform_name"]     = GetPlatformName();
-		p["crash_report"]      = crash_report;
-		p["server_version"]    = CURRENT_VERSION;
-		p["compile_date"]      = COMPILE_DATE;
-		p["compile_time"]      = COMPILE_TIME;
-		p["server_name"]       = config->LongName;
-		p["server_short_name"] = config->ShortName;
-		p["uptime"]            = uptime;
-		p["os_machine"]        = os.machine;
-		p["os_release"]        = os.release;
-		p["os_version"]        = os.version;
-		p["os_sysname"]        = os.sysname;
-		p["process_id"]        = process_id;
-		p["rss_memory"]        = rss;
-		p["cpus"]              = cpus.size();
-		p["origination_info"]  = "";
-
-		if (!LogSys.origination_info.zone_short_name.empty()) {
-			p["origination_info"] = fmt::format(
-				"{} ({}) instance_id [{}]",
-				LogSys.origination_info.zone_short_name,
-				LogSys.origination_info.zone_long_name,
-				LogSys.origination_info.instance_id
-			);
-		}
-
-		std::stringstream payload;
-		payload << p;
-
-		if (auto res = r.Post(e, payload.str(), "application/json")) {
-			if (res->status == 200) {
-				LogInfo("Sent crash report");
-			}
-			else {
-				LogError("Failed to send crash report to [{}]", e);
-			}
-		}
-	}
-}

 #if defined(_WINDOWS) && defined(CRASH_LOGGING)
 #include "StackWalker.h"
@@ -101,30 +12,22 @@ public:
 	EQEmuStackWalker(DWORD dwProcessId, HANDLE hProcess) : StackWalker(dwProcessId, hProcess) { }
 	virtual void OnOutput(LPCSTR szText) {
 		char buffer[4096];
-		for (int i = 0; i < 4096; ++i) {
-			if (szText[i] == 0) {
+		for(int i = 0; i < 4096; ++i) {
+			if(szText[i] == 0) {
 				buffer[i] = '\0';
 				break;
 			}

-			if (szText[i] == '\n' || szText[i] == '\r') {
+			if(szText[i] == '\n' || szText[i] == '\r') {
 				buffer[i] = ' ';
-			}
-			else {
+			} else {
 				buffer[i] = szText[i];
 			}
 		}

-		std::string line = buffer;
-		_lines.push_back(line);
-
 		Log(Logs::General, Logs::Crash, buffer);
 		StackWalker::OnOutput(szText);
 	}
-
-	const std::vector<std::string>& GetLines() { return _lines; }
-private:
-	std::vector<std::string> _lines;
 };

 LONG WINAPI windows_exception_handler(EXCEPTION_POINTERS *ExceptionInfo)
@@ -198,20 +101,7 @@ LONG WINAPI windows_exception_handler(EXCEPTION_POINTERS *ExceptionInfo)

 	if(EXCEPTION_STACK_OVERFLOW != ExceptionInfo->ExceptionRecord->ExceptionCode)
 	{
-		EQEmuStackWalker sw;
-		sw.ShowCallstack(GetCurrentThread(), ExceptionInfo->ContextRecord);
-
-		if (RuleB(Analytics, CrashReporting)) {
-			std::string crash_report;
-			auto& lines = sw.GetLines();
-
-			for (auto& line : lines) {
-				crash_report += line;
-				crash_report += "\n";
-			}
-
-			SendCrashReport(crash_report);
-		}
+		EQEmuStackWalker sw; sw.ShowCallstack(GetCurrentThread(), ExceptionInfo->ContextRecord);
 	}

 	return EXCEPTION_EXECUTE_HANDLER;
@@ -235,27 +125,9 @@ void set_exception_handler() {

 void print_trace()
 {
-	bool does_gdb_exist = Strings::Contains(Process::execute("gdb -v"), "GNU");
-	if (!does_gdb_exist) {
-		LogCrash(
-			"[Error] GDB is not installed, if you want crash dumps on Linux to work properly you will need GDB installed"
-		);
-		std::exit(1);
-	}
+	auto uid = geteuid();

-	auto        uid              = geteuid();
-	std::string temp_output_file = fmt::format("/tmp/dump-output-{}", Strings::Random(10));
-
-	// check for passwordless sudo if not root
-	if (uid != 0) {
-		bool sudo_password_required = Strings::Contains(Process::execute("sudo -n true"), "a password is required");
-		if (sudo_password_required) {
-			LogCrash(
-				"[Error] Current user does not have passwordless sudo installed. It is required to automatically process crash dumps with GDB as non-root."
-			);
-			std::exit(1);
-		}
-	}
+	std::string temp_output_file = "/tmp/dump-output";

 	char pid_buf[30];
 	sprintf(pid_buf, "%d", getpid());
@@ -264,6 +136,7 @@ void print_trace()
 	int child_pid = fork();
 	if (!child_pid) {
 		int fd = open(temp_output_file.c_str(), O_RDWR | O_CREAT, S_IRUSR | S_IWUSR);
+
 		dup2(fd, 1); // redirect output to stderr
 		fprintf(stdout, "stack trace for %s pid=%s\n", name_buf, pid_buf);
 		if (uid == 0) {
@@ -278,22 +151,16 @@ void print_trace()
 		abort(); /* If gdb failed to start */
 	}
 	else {
-		waitpid(child_pid, nullptr, 0);
+		waitpid(child_pid, NULL, 0);
 	}

 	std::ifstream    input(temp_output_file);
-	std::string      crash_report;
 	for (std::string line; getline(input, line);) {
 		LogCrash("{}", line);
-		crash_report += fmt::format("{}\n", line);
 	}

 	std::remove(temp_output_file.c_str());

-	if (RuleB(Analytics, CrashReporting)) {
-		SendCrashReport(crash_report);
-	}
-
 	exit(1);
 }

@@ -313,7 +313,7 @@ namespace cron
 		{
 			try
 			{
-				return static_cast<cron_int>(Strings::ToUnsignedInt(text.data()));
+				return static_cast<cron_int>(std::stoul(text.data()));
 			}
 			catch (std::exception const & ex)
 			{
@@ -34,6 +34,8 @@
 #include <vector>
 #include <map>

+//atoi is not uint32 or uint32 safe!!!!
+#define atoul(str) strtoul(str, nullptr, 10)

 class MySQLRequestResult;
 class Client;
@@ -76,7 +78,6 @@ class PTimerList;

 #define SQL(...) #__VA_ARGS__

-class LogSettings;
 class Database : public DBcore {
 public:
 	Database();
@@ -86,6 +87,7 @@ public:

 	/* Character Creation */

+	bool AddToNameFilter(const char *name);
 	bool CreateCharacter(
 		uint32 account_id,
 		char *name,
@@ -106,27 +108,30 @@ public:
 	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 SetMQDetectionFlag(const char *accountname, const char *charactername, const std::string &hacked, const char *zone);
 	bool UpdateName(const char *oldname, const char *newname);
 	bool CopyCharacter(
-		const std::string& source_character_name,
-		const std::string& destination_character_name,
-		const std::string& destination_account_name
+		std::string source_character_name,
+		std::string destination_character_name,
+		std::string destination_account_name
 	);

 	/* General Information Queries */

-	bool	AddBannedIP(std::string banned_ip, std::string notes); //Add IP address to the banned_ips table.
-	bool	AddToNameFilter(std::string name);
-	bool	CheckBannedIPs(std::string login_ip); //Check incoming connection against banned IP table.
-	bool	CheckGMIPs(std::string login_ip, uint32 account_id);
-	bool	CheckNameFilter(std::string name, bool surname = false);
-	bool	CheckUsedName(std::string name);
+	bool	AddBannedIP(char* bannedIP, const char* notes); //Add IP address to the banned_ips table.
+	bool	AddGMIP(char* ip_address, char* name);
+	bool	CheckBannedIPs(const char* loginIP); //Check incoming connection against banned IP table.
+	bool	CheckGMIPs(const char* loginIP, uint32 account_id);
+	bool	CheckNameFilter(const char* name, bool surname = false);
+	bool	CheckUsedName(const char* name);

 	uint32	GetAccountIDByChar(const char* charname, uint32* oCharID = 0);
 	uint32	GetAccountIDByChar(uint32 char_id);
-	uint32	GetAccountIDByName(std::string account_name, std::string loginserver, int16* status = 0, uint32* lsid = 0);
-	uint32	GetCharacterID(const std::string& name);
-	uint32	GetCharacterInfo(std::string character_name, uint32 *account_id, uint32 *zone_id, uint32 *instance_id);
+	uint32	GetAccountIDByName(const char* accname, const char *loginserver, int16* status = 0, uint32* lsid = 0);
+	uint32	GetCharacterID(const char *name);
+	uint32	GetCharacterInfo(const char* iName, uint32* oAccID = 0, uint32* oZoneID = 0, uint32* oInstanceID = 0, float* oX = 0, float* oY = 0, float* oZ = 0);
 	uint32	GetGuildIDByCharID(uint32 char_id);
 	uint32  GetGroupIDByCharID(uint32 char_id);
 	uint32  GetRaidIDByCharID(uint32 char_id);
@@ -135,42 +140,41 @@ public:
 	void	GetCharName(uint32 char_id, char* name);
 	std::string GetCharNameByID(uint32 char_id);
 	std::string GetNPCNameByID(uint32 npc_id);
-	std::string GetCleanNPCNameByID(uint32 npc_id);
-	void	LoginIP(uint32 account_id, std::string login_ip);
+	void	LoginIP(uint32 AccountID, const char* LoginIP);

 	/* Instancing */

-	bool AddClientToInstance(uint16 instance_id, uint32 character_id);
-	bool CheckInstanceByCharID(uint16 instance_id, uint32 character_id);
+	bool AddClientToInstance(uint16 instance_id, uint32 char_id);
+	bool CharacterInInstanceGroup(uint16 instance_id, uint32 char_id);
 	bool CheckInstanceExists(uint16 instance_id);
 	bool CheckInstanceExpired(uint16 instance_id);
 	bool CreateInstance(uint16 instance_id, uint32 zone_id, uint32 version, uint32 duration);
 	bool GetUnusedInstanceID(uint16 &instance_id);
-	bool IsGlobalInstance(uint16 instance_id);
+	bool GlobalInstance(uint16 instance_id);
 	bool RemoveClientFromInstance(uint16 instance_id, uint32 char_id);
 	bool RemoveClientsFromInstance(uint16 instance_id);
-	bool VerifyInstanceAlive(uint16 instance_id, uint32 character_id);
+	bool VerifyInstanceAlive(uint16 instance_id, uint32 char_id);
 	bool VerifyZoneInstance(uint32 zone_id, uint16 instance_id);

 	uint16 GetInstanceID(uint32 zone, uint32 charid, int16 version);
-	std::vector<uint16> GetInstanceIDs(uint32 zone_id, uint32 character_id);
-	uint8_t GetInstanceVersion(uint16 instance_id);
+	uint16 GetInstanceVersion(uint16 instance_id);
 	uint32 GetTimeRemainingInstance(uint16 instance_id, bool &is_perma);
-	uint32 GetInstanceZoneID(uint16 instance_id);
+	uint32 VersionFromInstanceID(uint16 instance_id);
+	uint32 ZoneIDFromInstanceID(uint16 instance_id);

 	void AssignGroupToInstance(uint32 gid, uint32 instance_id);
 	void AssignRaidToInstance(uint32 rid, uint32 instance_id);
+	void BuryCorpsesInInstance(uint16 instance_id);
 	void DeleteInstance(uint16 instance_id);
-	void FlagInstanceByGroupLeader(uint32 zone_id, int16 version, uint32 charid, uint32 group_id);
-	void FlagInstanceByRaidLeader(uint32 zone_id, int16 version, uint32 charid, uint32 raid_id);
-	void GetCharactersInInstance(uint16 instance_id, std::list<uint32> &character_ids);
+	void FlagInstanceByGroupLeader(uint32 zone, int16 version, uint32 charid, uint32 gid);
+	void FlagInstanceByRaidLeader(uint32 zone, int16 version, uint32 charid, uint32 rid);
+	void GetCharactersInInstance(uint16 instance_id, std::list<uint32> &charid_list);
 	void PurgeExpiredInstances();
 	void SetInstanceDuration(uint16 instance_id, uint32 new_duration);
-	void CleanupInstanceCorpses();

 	/* Adventure related. */

-	void UpdateAdventureStatsEntry(uint32 char_id, uint8 theme, bool win = false, bool remove = false);
+	void UpdateAdventureStatsEntry(uint32 char_id, uint8 theme, bool win, bool remove = false);
 	bool GetAdventureStats(uint32 char_id, AdventureStats_Struct *as);

 	/* Account Related */
@@ -184,26 +188,23 @@ public:

 	int16	CheckStatus(uint32 account_id);

-	void	SetAccountCRCField(uint32 account_id, std::string field_name, uint64 checksum);
-
 	uint32	CheckLogin(const char* name, const char* password, const char *loginserver, int16* oStatus = 0);
 	uint32	CreateAccount(const char* name, const char* password, int16 status, const char* loginserver, uint32 lsaccount_id);
 	uint32	GetAccountIDFromLSID(const std::string& in_loginserver_id, uint32 in_loginserver_account_id, char* in_account_name = 0, int16* in_status = 0);
-	uint8	GetAgreementFlag(uint32 account_id);
+	uint8	GetAgreementFlag(uint32 acctid);

 	void	GetAccountFromID(uint32 id, char* oAccountName, int16* oStatus);
-	void	SetAgreementFlag(uint32 account_id);
+	void	SetAgreementFlag(uint32 acctid);

-	int  GetIPExemption(std::string account_ip);
-	void SetIPExemption(std::string account_ip, int exemption_amount);
+	int		GetIPExemption(std::string account_ip);

 	int		GetInstanceID(uint32 char_id, uint32 zone_id);


 	/* Groups */

-	std::string GetGroupLeaderForLogin(std::string character_name);
-	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);
+	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);

@@ -227,20 +228,28 @@ public:

 	void    PurgeAllDeletedDataBuckets();

+	/* Database Conversions 'database_conversions.cpp' */
+
+	bool	CheckDatabaseConversions();
+	bool	CheckDatabaseConvertCorpseDeblob();
+	bool	CheckDatabaseConvertPPDeblob();

 	/* Database Variables */

 	bool	GetVariable(std::string varname, std::string &varvalue);
-	bool	SetVariable(const std::string& varname, const std::string &varvalue);
+	bool	SetVariable(const std::string varname, const std::string &varvalue);
 	bool	LoadVariables();

 	/* General Queries */

+	bool	GetSafePoints(const char* zone_short_name, uint32 instance_version, float* safe_x = 0, float* safe_y = 0, float* safe_z = 0, float* safe_heading = 0, int16* minstatus = 0, uint8* minlevel = 0, char *flag_needed = nullptr);
 	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);

-	uint8	GetPEQZone(uint32 zone_id, uint32 version);
-	uint8	GetMinStatus(uint32 zone_id, uint32 instance_version);
+	uint32	GetZoneGraveyardID(uint32 zone_id, uint32 version);
+
+	uint8	GetPEQZone(uint32 zoneID, uint32 version);
 	uint8	GetRaceSkill(uint8 skillid, uint8 in_race);
 	uint8	GetServerType();
 	uint8	GetSkillCap(uint8 skillid, uint8 in_race, uint8 in_class, uint16 in_level);
@@ -258,8 +267,8 @@ public:
 	int		CountInvSnapshots();
 	void	ClearInvSnapshots(bool from_now = false);

-	void SourceDatabaseTableFromUrl(std::string table_name, std::string url);
-	void SourceSqlFromUrl(std::string url);
+	/* EQEmuLogSys */
+	void	LoadLogSettings(EQEmuLogSys::LogSettings* log_settings);

 private:

@@ -23,12 +23,10 @@
 #include <iterator>
 #include "database_dump_service.h"
 #include "../eqemu_logsys.h"
-#include "../strings.h"
+#include "../string_util.h"
 #include "../eqemu_config.h"
 #include "../database_schema.h"
-#include "../file.h"
-#include "../process/process.h"
-#include "../termcolor/rang.hpp"
+#include "../file_util.h"

 #include <ctime>

@@ -37,12 +35,43 @@
 #else

 #include <sys/time.h>
-#include <thread>

 #endif

 #define DATABASE_DUMP_PATH "backups/"

+/**
+ * @param cmd
+ * @param return_result
+ * @return
+ */
+std::string DatabaseDumpService::execute(const std::string &cmd, bool return_result = true)
+{
+	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());
+	}
+
+	std::string result;
+
+	if (return_result) {
+		std::ifstream file(file_name);
+		result = {std::istreambuf_iterator<char>(file), std::istreambuf_iterator<char>()};
+		std::remove(file_name);
+
+	}
+
+	return result;
+}
+
 /**
 * @return bool
 */
@@ -59,7 +88,7 @@ bool DatabaseDumpService::IsMySQLInstalled()
 */
 bool DatabaseDumpService::IsTarAvailable()
 {
-	std::string version_output = Process::execute("tar --version");
+	std::string version_output = execute("tar --version");

 	return version_output.find("GNU tar") != std::string::npos;
 }
@@ -70,7 +99,7 @@ bool DatabaseDumpService::IsTarAvailable()
 */
 bool DatabaseDumpService::Is7ZipAvailable()
 {
-	std::string version_output = Process::execute("7z --help");
+	std::string version_output = execute("7z --help");

 	return version_output.find("7-Zip") != std::string::npos;
 }
@@ -88,13 +117,11 @@ bool DatabaseDumpService::HasCompressionBinary()
 */
 std::string DatabaseDumpService::GetMySQLVersion()
 {
-	std::string version_output = Process::execute("mysql --version");
+	std::string version_output = execute("mysql --version");

-	return Strings::Trim(version_output);
+	return trim(version_output);
 }

-const std::string CREDENTIALS_FILE = "login.my.cnf";
-
 /**
 * @return
 */
@@ -103,66 +130,114 @@ std::string DatabaseDumpService::GetBaseMySQLDumpCommand()
 	auto config = EQEmuConfig::get();
 	if (IsDumpContentTables() && !config->ContentDbHost.empty()) {
 		return fmt::format(
-			"mysqldump --defaults-extra-file={} {}",
-			CREDENTIALS_FILE,
+			"mysqldump -u {} -p{} -h {} --port={} {}",
+			config->ContentDbUsername,
+			config->ContentDbPassword,
+			config->ContentDbHost,
+			config->ContentDbPort,
 			config->ContentDbName
 		);
 	};

 	return fmt::format(
-		"mysqldump --defaults-extra-file={} {}",
-		CREDENTIALS_FILE,
+		"mysqldump -u {} -p{} -h {} --port={} {}",
+		config->DatabaseUsername,
+		config->DatabasePassword,
+		config->DatabaseHost,
+		config->DatabasePort,
 		config->DatabaseDB
 	);
 }

+/**
+ * @return
+ */
 std::string DatabaseDumpService::GetPlayerTablesList()
 {
-	return Strings::Join(DatabaseSchema::GetPlayerTables(), " ");
-}
-
-std::string DatabaseDumpService::GetBotTablesList()
-{
-	return Strings::Join(DatabaseSchema::GetBotTables(), " ");
-}
-
-std::string DatabaseDumpService::GetMercTablesList()
-{
-	return Strings::Join(DatabaseSchema::GetMercTables(), " ");
+	std::string              tables_list;
+	std::vector<std::string> tables = DatabaseSchema::GetPlayerTables();
+	for (const auto          &table : tables) {
+		tables_list += table + " ";
+	}
+
+	return trim(tables_list);
 }

+/**
+ * @return
+ */
 std::string DatabaseDumpService::GetLoginTableList()
 {
-	return Strings::Join(DatabaseSchema::GetLoginTables(), " ");
+	std::string              tables_list;
+	std::vector<std::string> tables = DatabaseSchema::GetLoginTables();
+	for (const auto          &table : tables) {
+		tables_list += table + " ";
+	}
+
+	return trim(tables_list);
 }

+/**
+ * @return
+ */
 std::string DatabaseDumpService::GetQueryServTables()
 {
-	return Strings::Join(DatabaseSchema::GetQueryServerTables(), " ");
+	std::string              tables_list;
+	std::vector<std::string> tables = DatabaseSchema::GetQueryServerTables();
+	for (const auto          &table : tables) {
+		tables_list += table + " ";
+	}
+
+	return trim(tables_list);
 }

+/**
+ * @return
+ */
 std::string DatabaseDumpService::GetSystemTablesList()
 {
-	auto system_tables  = DatabaseSchema::GetServerTables();
-	auto version_tables = DatabaseSchema::GetVersionTables();
+	std::string tables_list;

-	system_tables.insert(
-		std::end(system_tables),
-		std::begin(version_tables),
-		std::end(version_tables)
-	);
+	std::vector<std::string> tables = DatabaseSchema::GetServerTables();
+	for (const auto          &table : tables) {
+		tables_list += table + " ";
+	}

-	return Strings::Join(system_tables, " ");
+	tables = DatabaseSchema::GetVersionTables();
+	for (const auto &table : tables) {
+		tables_list += table + " ";
+	}
+
+	return trim(tables_list);
 }
-
+/**
+ * @return
+ */
 std::string DatabaseDumpService::GetStateTablesList()
 {
-	return Strings::Join(DatabaseSchema::GetStateTables(), " ");
+	std::string tables_list;
+
+	std::vector<std::string> tables = DatabaseSchema::GetStateTables();
+	for (const auto &table : tables) {
+		tables_list += table + " ";
+	}
+
+	return trim(tables_list);
 }

+/**
+ * @return
+ */
 std::string DatabaseDumpService::GetContentTablesList()
 {
-	return Strings::Join(DatabaseSchema::GetContentTables(), " ");
+	std::string tables_list;
+
+	std::vector<std::string> tables = DatabaseSchema::GetContentTables();
+	for (const auto          &table : tables) {
+		tables_list += table + " ";
+	}
+
+	return trim(tables_list);
 }

 /**
@@ -197,7 +272,7 @@ std::string DatabaseDumpService::GetDumpFileNameWithPath()
 	return GetSetDumpPath() + GetDumpFileName();
 }

-void DatabaseDumpService::DatabaseDump()
+void DatabaseDumpService::Dump()
 {
 	if (!IsMySQLInstalled()) {
 		LogError("MySQL is not installed; Please check your PATH for a valid MySQL installation");
@@ -243,16 +318,6 @@ void DatabaseDumpService::DatabaseDump()
 			dump_descriptor += "-player";
 		}

-		if (IsDumpBotTables()) {
-			tables_to_dump += GetBotTablesList() + " ";
-			dump_descriptor += "-bots";
-		}
-
-		if (IsDumpMercTables()) {
-			tables_to_dump += GetMercTablesList() + " ";
-			dump_descriptor += "-mercs";
-		}
-
 		if (IsDumpSystemTables()) {
 			tables_to_dump += GetSystemTablesList() + " ";
 			dump_descriptor += "-system";
@@ -279,11 +344,6 @@ void DatabaseDumpService::DatabaseDump()
 		}
 	}

-	if (IsDumpStaticInstanceData()) {
-		tables_to_dump += "instance_list";
-		options += " --no-create-info --where=\"instance_list.is_global > 0 and instance_list.never_expires > 0\"";
-	}
-
 	if (!dump_descriptor.empty()) {
 		SetDumpFileName(GetDumpFileName() + dump_descriptor);
 	}
@@ -296,76 +356,48 @@ void DatabaseDumpService::DatabaseDump()
 		pipe_file = fmt::format(" > {}.sql", GetDumpFileNameWithPath());
 	}

-	if (!File::Exists(GetSetDumpPath()) && !IsDumpOutputToConsole()) {
-		File::Makedir(GetSetDumpPath());
+	std::string execute_command = fmt::format(
+		"{} {} {} {}",
+		GetBaseMySQLDumpCommand(),
+		options,
+		tables_to_dump,
+		pipe_file
+	);
+
+	if (!FileUtil::exists(GetSetDumpPath()) && !IsDumpOutputToConsole()) {
+		FileUtil::mkdir(GetSetDumpPath());
 	}

 	if (IsDumpDropTableSyntaxOnly()) {
-		std::vector<std::string> tables = Strings::Split(tables_to_dump, ' ');
+		std::vector<std::string> tables = SplitString(tables_to_dump, ' ');

-		for (auto &table: tables) {
+		for (auto &table : tables) {
 			std::cout << "DROP TABLE IF EXISTS `" << table << "`;" << std::endl;
 		}

 		if (tables_to_dump.empty()) {
 			std::cerr << "No tables were specified" << std::endl;
 		}
-
-		return;
 	}
 	else {
-		const auto execute_command = fmt::format(
-			"{} {} {} {}",
-			GetBaseMySQLDumpCommand(),
-			options,
-			tables_to_dump,
-			pipe_file
-		);
-
-		LogInfo("Backing up database [{}]", execute_command);
-		LogInfo("This can take a few minutes depending on the size of your database");
-		LogInfo("LOADING... PLEASE WAIT...");
-
-		BuildCredentialsFile();
-		std::string execution_result = Process::execute(execute_command);
-		if (!execution_result.empty() && IsDumpOutputToConsole()) {
+		std::string execution_result = execute(execute_command, IsDumpOutputToConsole());
+		if (!execution_result.empty()) {
 			std::cout << execution_result;
 		}
 	}

-	if (!IsDumpOutputToConsole()) {
-		LogSys.LoadLogSettingsDefaults();
-	}
-
-	if (!pipe_file.empty()) {
-		std::string file = fmt::format("{}.sql", GetDumpFileNameWithPath());
-		auto        r    = File::GetContents(file);
-		if (!r.error.empty()) {
-			LogError("{}", r.error);
-		}
-
-		for (auto &line: Strings::Split(r.contents, "\n")) {
-			if (Strings::Contains(line, "mysqldump:")) {
-				LogError("{}", line);
-				LogError("Database dump failed. Correct the error before continuing or trying again");
-				LogError("This is to prevent data loss on behalf of the server operator");
-				RemoveSqlBackup();
-				std::exit(1);
-			}
-		}
-	}
-
 	if (!tables_to_dump.empty()) {
-		LogInfo("Dumping Tables [{}]", Strings::Trim(tables_to_dump));
+		LogInfo("Dumping Tables [{}]", tables_to_dump);
 	}

 	LogInfo("Database dump created at [{}.sql]", GetDumpFileNameWithPath());
+
 	if (IsDumpWithCompression() && !IsDumpOutputToConsole()) {
 		if (HasCompressionBinary()) {
-			LogInfo("Compression requested. Compressing dump [{}.sql]", GetDumpFileNameWithPath());
+			LogInfo("Compression requested... Compressing dump [{}.sql]", GetDumpFileNameWithPath());

 			if (IsTarAvailable()) {
-				Process::execute(
+				execute(
 					fmt::format(
 						"tar -zcvf {}.tar.gz -C {} {}.sql",
 						GetDumpFileNameWithPath(),
@@ -374,10 +406,9 @@ void DatabaseDumpService::DatabaseDump()
 					)
 				);
 				LogInfo("Compressed dump created at [{}.tar.gz]", GetDumpFileNameWithPath());
-				RemoveSqlBackup();
 			}
 			else if (Is7ZipAvailable()) {
-				Process::execute(
+				execute(
 					fmt::format(
 						"7z a -t7z {}.zip {}.sql",
 						GetDumpFileNameWithPath(),
@@ -385,7 +416,6 @@ void DatabaseDumpService::DatabaseDump()
 					)
 				);
 				LogInfo("Compressed dump created at [{}.zip]", GetDumpFileNameWithPath());
-				RemoveSqlBackup();
 			}
 			else {
 				LogInfo("Compression requested, but no available compression binary was found");
@@ -396,8 +426,6 @@ void DatabaseDumpService::DatabaseDump()
 		}
 	}

-	RemoveCredentialsFile();
-
 //	LogDebug("[{}] dump-to-console", IsDumpOutputToConsole());
 //	LogDebug("[{}] dump-path", GetSetDumpPath());
 //	LogDebug("[{}] compression", (IsDumpWithCompression() ? "true" : "false"));
@@ -408,7 +436,6 @@ void DatabaseDumpService::DatabaseDump()
 //	LogDebug("[{}] login", (IsDumpLoginServerTables() ? "true" : "false"));
 //	LogDebug("[{}] player", (IsDumpPlayerTables() ? "true" : "false"));
 //	LogDebug("[{}] system", (IsDumpSystemTables() ? "true" : "false"));
-//	LogDebug("[{}] bot", (IsDumpBotTables() ? "true" : "false"));
 }

 bool DatabaseDumpService::IsDumpSystemTables() const
@@ -550,83 +577,3 @@ void DatabaseDumpService::SetDumpStateTables(bool dump_state_tables)
 {
 	DatabaseDumpService::dump_state_tables = dump_state_tables;
 }
-
-bool DatabaseDumpService::IsDumpBotTables() const
-{
-	return dump_bot_tables;
-}
-
-void DatabaseDumpService::SetDumpBotTables(bool dump_bot_tables)
-{
-	DatabaseDumpService::dump_bot_tables = dump_bot_tables;
-}
-
-bool DatabaseDumpService::IsDumpMercTables() const
-{
-	return dump_merc_tables;
-}
-
-void DatabaseDumpService::SetDumpMercTables(bool dump_merc_tables)
-{
-	DatabaseDumpService::dump_merc_tables = dump_merc_tables;
-}
-
-void DatabaseDumpService::RemoveSqlBackup()
-{
-	std::string file = fmt::format("{}.sql", GetDumpFileNameWithPath());
-	if (File::Exists(file)) {
-		try {
-			std::filesystem::remove(file);
-		}
-		catch (std::exception &e) {
-			LogError("std::filesystem::remove err [{}]", e.what());
-		}
-	}
-
-	RemoveCredentialsFile();
-}
-
-void DatabaseDumpService::BuildCredentialsFile()
-{
-	auto          config = EQEmuConfig::get();
-	std::ofstream out(CREDENTIALS_FILE);
-	if (out.is_open()) {
-		if (IsDumpContentTables() && !config->ContentDbHost.empty()) {
-			out << "[mysqldump]" << std::endl;
-			out << "user=" << config->ContentDbUsername << std::endl;
-			out << "password=" << config->ContentDbPassword << std::endl;
-			out << "host=" << config->ContentDbHost << std::endl;
-			out << "port=" << config->ContentDbPort << std::endl;
-			out << "default-character-set=utf8" << std::endl;
-		}
-		else {
-			out << "[mysqldump]" << std::endl;
-			out << "user=" << config->DatabaseUsername << std::endl;
-			out << "password=" << config->DatabasePassword << std::endl;
-			out << "host=" << config->DatabaseHost << std::endl;
-			out << "port=" << config->DatabasePort << std::endl;
-			out << "default-character-set=utf8" << std::endl;
-		}
-		out.close();
-	}
-	else {
-		LogError("Failed to open credentials file for writing");
-	}
-}
-
-void DatabaseDumpService::RemoveCredentialsFile()
-{
-	if (File::Exists(CREDENTIALS_FILE)) {
-		std::filesystem::remove(CREDENTIALS_FILE);
-	}
-}
-
-bool DatabaseDumpService::IsDumpStaticInstanceData()
-{
-	return dump_static_instance_data;
-}
-
-void DatabaseDumpService::SetDumpStaticInstanceData(bool b)
-{
-	dump_static_instance_data = b;
-}
@@ -24,7 +24,7 @@

 class DatabaseDumpService {
 public:
-	void DatabaseDump();
+	void Dump();
 	bool IsDumpAllTables() const;
 	void SetDumpAllTables(bool dump_all_tables);
 	bool IsDumpWithNoData() const;
@@ -53,13 +53,6 @@ public:
 	void SetDumpDropTableSyntaxOnly(bool dump_drop_table_syntax_only);
 	bool IsDumpStateTables() const;
 	void SetDumpStateTables(bool dump_state_tables);
-	bool IsDumpBotTables() const;
-	void SetDumpBotTables(bool dump_bot_tables);
-	bool IsDumpMercTables() const;
-	void SetDumpMercTables(bool dump_bot_tables);
-
-	void SetDumpStaticInstanceData(bool b);
-	bool IsDumpStaticInstanceData();

 private:
 	bool        dump_all_tables             = false;
@@ -74,19 +67,14 @@ private:
 	bool        dump_with_compression       = false;
 	bool        dump_output_to_console      = false;
 	bool        dump_drop_table_syntax_only = false;
-	bool        dump_bot_tables             = false;
-	bool        dump_merc_tables            = false;
-	bool        dump_static_instance_data   = false;
-
 	std::string dump_path;
 	std::string dump_file_name;

+	std::string execute(const std::string &cmd, bool return_result);
 	bool IsMySQLInstalled();
 	std::string GetMySQLVersion();
 	std::string GetBaseMySQLDumpCommand();
 	std::string GetPlayerTablesList();
-	std::string GetBotTablesList();
-	std::string GetMercTablesList();
 	std::string GetSystemTablesList();
 	std::string GetStateTablesList();
 	std::string GetContentTablesList();
@@ -97,9 +85,6 @@ private:
 	std::string GetDumpFileNameWithPath();
 	std::string GetSetDumpPath();
 	std::string GetQueryServTables();
-	void RemoveSqlBackup();
-	void BuildCredentialsFile();
-	void RemoveCredentialsFile();
 };


@@ -1,324 +0,0 @@
-#include <filesystem>
-#include "database_update.h"
-#include "../eqemu_logsys.h"
-#include "../database.h"
-#include "../strings.h"
-#include "../rulesys.h"
-#include "../http/httplib.h"
-
-#include "database_update_manifest.cpp"
-#include "database_update_manifest_bots.cpp"
-#include "database_dump_service.h"
-
-constexpr int BREAK_LENGTH = 70;
-
-DatabaseVersion DatabaseUpdate::GetDatabaseVersions()
-{
-	auto results = m_database->QueryDatabase("SELECT `version`, `bots_version` FROM `db_version` LIMIT 1");
-	if (!results.Success() || !results.RowCount()) {
-		LogError("Failed to read from [db_version] table!");
-		return DatabaseVersion{};
-	}
-
-	auto r = results.begin();
-
-	return DatabaseVersion{
-		.server_database_version = Strings::ToInt(r[0]),
-		.bots_database_version = Strings::ToInt(r[1]),
-	};
-}
-
-DatabaseVersion DatabaseUpdate::GetBinaryDatabaseVersions()
-{
-	return DatabaseVersion{
-		.server_database_version = CURRENT_BINARY_DATABASE_VERSION,
-		.bots_database_version = (RuleB(Bots, Enabled) ? CURRENT_BINARY_BOTS_DATABASE_VERSION : 0),
-	};
-}
-
-// the amount of versions we look-back to ensure we have all migrations
-// we may not want to force these, but just warn about the look-backs
-constexpr int LOOK_BACK_AMOUNT = 10;
-
-// this check will take action
-void DatabaseUpdate::CheckDbUpdates()
-{
-	InjectBotsVersionColumn();
-	auto v = GetDatabaseVersions();
-	auto b = GetBinaryDatabaseVersions();
-	if (CheckVersionsUpToDate(v, b)) {
-		return;
-	}
-
-	if (UpdateManifest(manifest_entries, v.server_database_version, b.server_database_version)) {
-		LogInfo(
-			"Updates ran successfully, setting database version to [{}] from [{}]",
-			b.server_database_version,
-			v.server_database_version
-		);
-		m_database->QueryDatabase(fmt::format("UPDATE `db_version` SET `version` = {}", b.server_database_version));
-	}
-
-	if (b.bots_database_version > 0) {
-		if (UpdateManifest(bot_manifest_entries, v.bots_database_version, b.bots_database_version)) {
-			LogInfo(
-				"Updates ran successfully, setting database version to [{}] from [{}]",
-				b.bots_database_version,
-				v.bots_database_version
-			);
-			m_database->QueryDatabase(
-				fmt::format(
-					"UPDATE `db_version` SET `bots_version` = {}",
-					b.bots_database_version
-				)
-			);
-		}
-	}
-}
-
-std::string DatabaseUpdate::GetQueryResult(const ManifestEntry& e)
-{
-	auto results = (e.content_schema_update ? m_content_database : m_database)->QueryDatabase(e.check);
-
-	std::vector<std::string> result_lines = {};
-
-	for (auto row = results.begin(); row != results.end(); ++row) {
-		std::vector<std::string> cols;
-
-		int field_count = results.ColumnCount();
-		cols.reserve(field_count);
-		for (int i = 0; i < field_count; ++i) {
-			if (row[i] != nullptr) {
-				cols.emplace_back(row[i]);
-			}
-		}
-
-		result_lines.emplace_back(Strings::Join(cols, " "));
-	}
-
-	return Strings::Join(result_lines, "\n");
-}
-
-bool DatabaseUpdate::ShouldRunMigration(ManifestEntry &e, std::string query_result)
-{
-	std::string r = Strings::Trim(query_result);
-	if (e.condition == "contains") {
-		return Strings::Contains(r, e.match);
-	}
-	else if (e.condition == "match") {
-		return r == e.match;
-	}
-	else if (e.condition == "missing") {
-		return !Strings::Contains(r, e.match);
-	}
-	else if (e.condition == "empty") {
-		return r.empty();
-	}
-	else if (e.condition == "not_empty") {
-		return !r.empty();
-	}
-
-	return false;
-}
-
-// check if we are running in a terminal
-bool is_atty()
-{
-#ifdef _WINDOWS
-	return ::_isatty(_fileno(stdin));
-#else
-	return isatty(fileno(stdin));
-#endif
-}
-
-// return true if we ran updates
-bool DatabaseUpdate::UpdateManifest(
-	std::vector<ManifestEntry> entries,
-	int version_low,
-	int version_high
-)
-{
-	std::vector<int> missing_migrations = {};
-	if (version_low != version_high) {
-
-		LogSys.DisableMySQLErrorLogs();
-		for (int version = version_low + 1; version <= version_high; ++version) {
-			for (auto &e: entries) {
-				if (e.version == version) {
-					bool        has_migration = true;
-					std::string r             = GetQueryResult(e);
-					if (ShouldRunMigration(e, r)) {
-						has_migration = false;
-						missing_migrations.emplace_back(e.version);
-					}
-
-					std::string prefix = fmt::format(
-						"[{}]",
-						has_migration ? "ok" : "missing"
-					);
-
-					LogInfo(
-						"[{}] {:>10} | [{}]",
-						e.version,
-						prefix,
-						e.description
-					);
-				}
-			}
-		}
-		LogSys.EnableMySQLErrorLogs();
-		LogInfo("{}", Strings::Repeat("-", BREAK_LENGTH));
-
-		if (!missing_migrations.empty()) {
-			LogInfo("Automatically backing up database before applying updates");
-			LogInfo("{}", Strings::Repeat("-", BREAK_LENGTH));
-			auto s = DatabaseDumpService();
-			s.SetDumpAllTables(true);
-			s.SetDumpWithCompression(true);
-			s.DatabaseDump();
-			LogInfo("{}", Strings::Repeat("-", BREAK_LENGTH));
-		}
-
-		if (!missing_migrations.empty()) {
-			LogInfo("Running database migrations. Please wait...");
-			LogInfo("{}", Strings::Repeat("-", BREAK_LENGTH));
-		}
-
-		for (auto &m: missing_migrations) {
-			for (auto &e: entries) {
-				if (e.version == m) {
-					bool errored_migration = false;
-
-					auto r = (e.content_schema_update ? m_content_database : m_database)->QueryDatabaseMulti(e.sql);
-
-					// ignore empty query result "errors"
-					if (r.ErrorNumber() != 1065 && !r.ErrorMessage().empty()) {
-						LogError("(#{}) [{}]", r.ErrorNumber(), r.ErrorMessage());
-						errored_migration = true;
-
-						LogInfo("Required database update failed. This could be a problem");
-
-						// if terminal attached then prompt for skip
-						if (is_atty()) {
-							LogInfo("Would you like to skip this update? [y/n] (Timeout 60s)");
-
-							// user input
-							std::string input;
-							bool        gave_input        = false;
-							time_t      start_time        = time(nullptr);
-							time_t      wait_time_seconds = 60;
-
-							// spawn a concurrent thread that waits for input from std::cin
-							std::thread t1(
-								[&]() {
-									std::cin >> input;
-									gave_input = true;
-								}
-							);
-							t1.detach();
-
-							// check the inputReceived flag once every 50ms for 10 seconds
-							while (time(nullptr) < start_time + wait_time_seconds && !gave_input) {
-								std::this_thread::sleep_for(std::chrono::milliseconds(50));
-							}
-
-							// prompt for user skip
-							if (Strings::Trim(input) == "y") {
-								errored_migration = false;
-								LogInfo("Skipping update [{}] [{}]", e.version, e.description);
-							}
-						} else {
-							errored_migration = true;
-							LogInfo("Skipping update [{}] [{}]", e.version, e.description);
-						}
-					}
-
-					LogInfo(
-						"[{}] [{}] [{}]",
-						e.version,
-						e.description,
-						(errored_migration ? "error" : "ok")
-					);
-
-					if (errored_migration) {
-						LogError("Fatal | Database migration [{}] failed to run", e.description);
-						LogError("Fatal | Shutting down");
-						std::exit(1);
-					}
-				}
-			}
-		}
-
-		LogInfo("{}", Strings::Repeat("-", BREAK_LENGTH));
-
-		return true;
-	}
-
-	return false;
-}
-
-DatabaseUpdate *DatabaseUpdate::SetDatabase(Database *db)
-{
-	m_database = db;
-
-	return this;
-}
-
-DatabaseUpdate *DatabaseUpdate::SetContentDatabase(Database *db)
-{
-	m_content_database = db;
-
-	return this;
-}
-
-bool DatabaseUpdate::CheckVersionsUpToDate(DatabaseVersion v, DatabaseVersion b)
-{
-	LogInfo("{}", Strings::Repeat("-", BREAK_LENGTH));
-
-	LogInfo(
-		"{:>8} | database [{}] binary [{}] {}",
-		"Server",
-		v.server_database_version,
-		b.server_database_version,
-		(v.server_database_version == b.server_database_version) ? "up to date" : "checking updates"
-	);
-
-	if (RuleB(Bots, Enabled) && b.bots_database_version > 0) {
-		LogInfo(
-			"{:>8} | database [{}] binary [{}] {}",
-			"Bots",
-			v.bots_database_version,
-			b.bots_database_version,
-			(v.bots_database_version == b.bots_database_version) ? "up to date" : "checking updates"
-		);
-	}
-
-	LogInfo("{:>8} | [server.auto_database_updates] [<green>true]", "Config");
-
-	LogInfo("{}", Strings::Repeat("-", BREAK_LENGTH));
-
-	// server database version is required
-	bool server_up_to_date = v.server_database_version >= b.server_database_version;
-	// bots database version is optional, if not enabled then it is always up-to-date
-	bool bots_up_to_date   = RuleB(Bots, Enabled) ? v.bots_database_version >= b.bots_database_version : true;
-
-	return server_up_to_date && bots_up_to_date;
-}
-
-// checks to see if there are pending updates
-// used by zone to prevent launch or boot loop until updates are applied
-bool DatabaseUpdate::HasPendingUpdates()
-{
-	auto v = GetDatabaseVersions();
-	auto b = GetBinaryDatabaseVersions();
-
-	return !CheckVersionsUpToDate(v, b);
-}
-
-void DatabaseUpdate::InjectBotsVersionColumn()
-{
-	auto r = m_database->QueryDatabase("show columns from db_version where Field like '%bots_version%'");
-	if (r.RowCount() == 0) {
-		m_database->QueryDatabase("ALTER TABLE db_version ADD bots_version int(11) DEFAULT '0' AFTER version");
-	}
-}
@@ -1,40 +0,0 @@
-#ifndef EQEMU_DATABASE_UPDATE_H
-#define EQEMU_DATABASE_UPDATE_H
-
-#include "../database.h"
-
-struct ManifestEntry {
-	int         version{};     // database version of the migration
-	std::string description{}; // description of the migration ex: "add_new_table" or "add_index_to_table"
-	std::string check{};       // query that checks against the condition
-	std::string condition{};   // condition or "match_type" - Possible values [contains|match|missing|empty|not_empty]
-	std::string match{};       // match field that is not always used, but works in conjunction with "condition" values [missing|match|contains]
-	std::string sql{};         // the SQL DDL that gets ran when the condition is true
-	bool        content_schema_update{}; // if true, this migration is a content schema update and should be ran against the content database
-};
-
-struct DatabaseVersion {
-	int server_database_version;
-	int bots_database_version;
-};
-
-class DatabaseUpdate {
-public:
-	DatabaseVersion GetDatabaseVersions();
-	DatabaseVersion GetBinaryDatabaseVersions();
-	void CheckDbUpdates();
-	std::string GetQueryResult(const ManifestEntry& e);
-	static bool ShouldRunMigration(ManifestEntry &e, std::string query_result);
-	bool UpdateManifest(std::vector<ManifestEntry> entries, int version_low, int version_high);
-
-	DatabaseUpdate *SetDatabase(Database *db);
-	DatabaseUpdate *SetContentDatabase(Database *db);
-	bool HasPendingUpdates();
-private:
-	Database *m_database;
-	Database *m_content_database;
-	static bool CheckVersionsUpToDate(DatabaseVersion v, DatabaseVersion b);
-	void InjectBotsVersionColumn();
-};
-
-#endif //EQEMU_DATABASE_UPDATE_H
@@ -1,164 +0,0 @@
-#include "database_update.h"
-
-std::vector<ManifestEntry> bot_manifest_entries = {
-	ManifestEntry{
-		.version = 9035,
-		.description = "2022_12_04_bot_archery.sql",
-		.check = "SHOW COLUMNS FROM `bot_data` LIKE 'archery_setting'",
-		.condition = "empty",
-		.match = "",
-		.sql = R"(
-ALTER TABLE `bot_data`
-ADD COLUMN `archery_setting` TINYINT(2) UNSIGNED NOT NULL DEFAULT '0' AFTER `enforce_spell_settings`;
-)",
-	},
-	ManifestEntry{
-		.version = 9036,
-		.description = "2023_01_19_drop_bot_views.sql",
-		.check = "SHOW TABLES LIKE 'vw_groups'",
-		.condition = "not_empty",
-		.match = "",
-		.sql = R"(
-DROP VIEW vw_bot_groups;
-DROP VIEW vw_bot_character_mobs;
-DROP VIEW vw_groups;
-DROP VIEW vw_guild_members;
-DROP TABLE bot_guild_members;
-
-)",
-	},
-	ManifestEntry{
-		.version = 9037,
-		.description = "2023_01_22_add_name_index.sql",
-		.check = "show index from bot_data WHERE key_name = 'name`",
-		.condition = "",
-		.match = "empty",
-		.sql = R"(
-create index `name` on bot_data(`name`);
-)",
-	},
-	ManifestEntry{
-		.version = 9038,
-		.description = "2023_02_16_add_caster_range.sql",
-		.check = "SHOW COLUMNS FROM `bot_data` LIKE 'caster_range'",
-		.condition = "",
-		.match = "empty",
-		.sql = R"(
-ALTER TABLE `bot_data`
-ADD COLUMN `caster_range` INT(11) UNSIGNED NOT NULL DEFAULT '300' AFTER `archery_setting`;
-)",
-	},
-	ManifestEntry{
-		.version = 9039,
-		.description = "2023_03_31_remove_bot_groups.sql",
-		.check = "SHOW TABLES LIKE 'bot_groups'",
-		.condition = "",
-		.match = "not_empty",
-		.sql = R"(
-SET FOREIGN_KEY_CHECKS = 0;
-DROP TABLE IF EXISTS `bot_groups`;
-DROP TABLE IF EXISTS `bot_group_members`;
-SET FOREIGN_KEY_CHECKS = 1;
-)",
-	},
-	ManifestEntry{
-		.version = 9040,
-		.description = "2023_11_16_bot_starting_items.sql",
-		.check = "SHOW TABLES LIKE 'bot_starting_items'",
-		.condition = "empty",
-		.match = "",
-		.sql = R"(
-CREATE TABLE `bot_starting_items`  (
-`id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT,
-`races` int(11) UNSIGNED NOT NULL DEFAULT 0,
-`classes` int(11) UNSIGNED NOT NULL DEFAULT 0,
-`item_id` int(11) UNSIGNED NOT NULL DEFAULT 0,
-`item_charges` tinyint(3) UNSIGNED NOT NULL DEFAULT 1,
-`min_status` tinyint(3) UNSIGNED NOT NULL DEFAULT 0,
-`slot_id` mediumint(9) NOT NULL DEFAULT -1,
-`min_expansion` tinyint(4) NOT NULL DEFAULT -1,
-`max_expansion` tinyint(4) NOT NULL DEFAULT -1,
-`content_flags` varchar(100) CHARACTER SET latin1 COLLATE latin1_swedish_ci NULL DEFAULT NULL,
-`content_flags_disabled` varchar(100) CHARACTER SET latin1 COLLATE latin1_swedish_ci NULL DEFAULT NULL,
-PRIMARY KEY (`id`)
-) ENGINE = InnoDB CHARACTER SET = latin1 COLLATE = latin1_swedish_ci;
-)",
-	},
-	ManifestEntry{
-		.version = 9041,
-		.description = "2023_12_04_bot_timers.sql",
-		.check = "SHOW COLUMNS FROM `bot_timers` LIKE 'recast_time'",
-		.condition = "empty",
-		.match = "",
-		.sql = R"(
-ALTER TABLE `bot_timers`
-	ADD COLUMN `recast_time` INT(11) UNSIGNED NOT NULL DEFAULT '0' AFTER `timer_value`,
-	ADD COLUMN `is_spell` TINYINT(2) UNSIGNED NOT NULL DEFAULT 0 AFTER `recast_time`,
-	ADD COLUMN `is_disc` TINYINT(2) UNSIGNED NOT NULL DEFAULT 0 AFTER `is_spell`,
-	ADD COLUMN `spell_id` INT(11) UNSIGNED NOT NULL DEFAULT '0' AFTER `is_disc`,
-	ADD COLUMN `is_item` TINYINT(2) UNSIGNED NOT NULL DEFAULT 0 AFTER `spell_id`,
-	ADD COLUMN `item_id` INT(11) UNSIGNED NOT NULL DEFAULT '0' AFTER `is_item`;
-ALTER TABLE `bot_timers`
-	DROP FOREIGN KEY `FK_bot_timers_1`;
-ALTER TABLE `bot_timers`
-	DROP PRIMARY KEY;
-ALTER TABLE `bot_timers`
-	ADD PRIMARY KEY (`bot_id`, `timer_id`, `spell_id`, `item_id`);
-)"
-	},
-	ManifestEntry{
-		.version = 9042,
-		.description = "2024_01_27_delete_bot_foreign_keys.sql",
-		.check = "SHOW CREATE TABLE `bot_stances`",
-		.condition = "contains",
-		.match = "FOREIGN",
-		.sql = R"(
-ALTER TABLE `bot_buffs` DROP FOREIGN KEY `FK_bot_buffs_1`;
-ALTER TABLE `bot_heal_rotations` DROP FOREIGN KEY `FK_bot_heal_rotations`;
-ALTER TABLE `bot_heal_rotation_members` DROP FOREIGN KEY `FK_bot_heal_rotation_members_1`;
-ALTER TABLE `bot_heal_rotation_members` DROP FOREIGN KEY `FK_bot_heal_rotation_members_2`;
-ALTER TABLE `bot_heal_rotation_targets` DROP FOREIGN KEY `FK_bot_heal_rotation_targets`;
-ALTER TABLE `bot_inventories` DROP FOREIGN KEY `FK_bot_inventories_1`;
-ALTER TABLE `bot_pets` DROP FOREIGN KEY `FK_bot_pets_1`;
-ALTER TABLE `bot_pet_buffs` DROP FOREIGN KEY `FK_bot_pet_buffs_1`;
-ALTER TABLE `bot_pet_inventories` DROP FOREIGN KEY `FK_bot_pet_inventories_1`;
-ALTER TABLE `bot_stances` DROP FOREIGN KEY `FK_bot_stances_1`;
-)"
-	},
-	ManifestEntry{
-		.version = 9043,
-		.description = "2024_02_18_bot_starting_items_augments.sql",
-		.check = "SHOW COLUMNS FROM `bot_starting_items` LIKE 'augment_one'",
-		.condition = "empty",
-		.match = "",
-		.sql = R"(
-ALTER TABLE `bot_starting_items`
-ADD COLUMN `augment_one` int(11) UNSIGNED NOT NULL DEFAULT 0 AFTER `item_charges`,
-ADD COLUMN `augment_two` int(11) UNSIGNED NOT NULL DEFAULT 0 AFTER `augment_one`,
-ADD COLUMN `augment_three` int(11) UNSIGNED NOT NULL DEFAULT 0 AFTER `augment_two`,
-ADD COLUMN `augment_four` int(11) UNSIGNED NOT NULL DEFAULT 0 AFTER `augment_three`,
-ADD COLUMN `augment_five` int(11) UNSIGNED NOT NULL DEFAULT 0 AFTER `augment_four`,
-ADD COLUMN `augment_six` int(11) UNSIGNED NOT NULL DEFAULT 0 AFTER `augment_five`;
-)"
-	}
-// -- template; copy/paste this when you need to create a new entry
-//	ManifestEntry{
-//		.version = 9228,
-//		.description = "some_new_migration.sql",
-//		.check = "SHOW COLUMNS FROM `table_name` LIKE 'column_name'",
-//		.condition = "empty",
-//		.match = "",
-//		.sql = R"(
-//
-//)"
-};
-
-// see struct definitions for what each field does
-// struct ManifestEntry {
-// 	int         version{};     // database version of the migration
-// 	std::string description{}; // description of the migration ex: "add_new_table" or "add_index_to_table"
-// 	std::string check{};       // query that checks against the condition
-// 	std::string condition{};   // condition or "match_type" - Possible values [contains|match|missing|empty|not_empty]
-// 	std::string match{};       // match field that is not always used, but works in conjunction with "condition" values [missing|match|contains]
-// 	std::string sql{};         // the SQL DDL that gets ran when the condition is true
-// };
@@ -18,19 +18,10 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA

 #include "../common/global_define.h"
 #include "../common/rulesys.h"
-#include "../common/strings.h"
+#include "../common/string_util.h"
 #include "../common/timer.h"
-#include "../common/repositories/character_corpses_repository.h"
 #include "../common/repositories/dynamic_zone_members_repository.h"
 #include "../common/repositories/dynamic_zones_repository.h"
-#include "../common/repositories/group_id_repository.h"
-#include "../common/repositories/instance_list_repository.h"
-#include "../common/repositories/instance_list_player_repository.h"
-#include "../common/repositories/raid_members_repository.h"
-#include "../common/repositories/respawn_times_repository.h"
-#include "../common/repositories/spawn_condition_values_repository.h"
-#include "repositories/spawn2_disabled_repository.h"
-

 #include "database.h"

@@ -50,242 +41,251 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #include <sys/time.h>
 #endif

-
-bool Database::AddClientToInstance(uint16 instance_id, uint32 character_id)
+/**
+ * @param instance_id
+ * @param char_id
+ * @return
+ */
+bool Database::AddClientToInstance(uint16 instance_id, uint32 char_id)
 {
-	auto e = InstanceListPlayerRepository::NewEntity();
+	std::string query = StringFormat(
+		"REPLACE INTO `instance_list_player` (id, charid) "
+		"VALUES "
+		"(%lu, %lu)",
+		(unsigned long) instance_id,
+		(unsigned long) char_id
+	);

-	e.id = instance_id;
-	e.charid = character_id;
+	auto results = QueryDatabase(query);

-	return InstanceListPlayerRepository::ReplaceOne(*this, e);
+	return results.Success();
 }

-bool Database::CheckInstanceByCharID(uint16 instance_id, uint32 character_id)
+bool Database::CharacterInInstanceGroup(uint16 instance_id, uint32 char_id)
 {
-	if (!instance_id) {
-		return false;
-	}

-	auto l = InstanceListPlayerRepository::GetWhere(
-		*this,
-		fmt::format(
-			"id = {} AND charid = {}",
-			instance_id,
-			character_id
-		)
-	);
-	if (l.empty()) {
+	std::string query = StringFormat("SELECT charid FROM instance_list_player where id=%u AND charid=%u", instance_id, char_id);
+	auto results = QueryDatabase(query);
+
+	if (!results.Success())
+		return false;
+
+	if (results.RowCount() != 1)
 		return false;
-	}

 	return true;
 }

-bool Database::CheckInstanceExists(uint16 instance_id)
-{
-	if (!instance_id) {
-		return false;
-	}
+bool Database::CheckInstanceExists(uint16 instance_id) {
+	std::string query = StringFormat(
+		"SELECT "
+		"`id`  "
+		"FROM  "
+		"`instance_list`  "
+		"WHERE  "
+		"`id` = %u",
+		instance_id
+		);
+	auto results = QueryDatabase(query);

-	auto i = InstanceListRepository::FindOne(*this, instance_id);
-	if (!i.id) {
+	if (!results.Success())
+		return false;
+
+	if (results.RowCount() == 0)
 		return false;
-	}

 	return true;
 }

 bool Database::CheckInstanceExpired(uint16 instance_id)
 {
-	if (!instance_id) {
+
+	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
+	);
+
+	auto results = QueryDatabase(query);
+
+	if (!results.Success()) {
 		return true;
 	}

-	auto i = InstanceListRepository::FindOne(*this, instance_id);
-	if (!i.id) {
+	if (results.RowCount() == 0) {
 		return true;
 	}

-	if (i.never_expires) {
+	auto row = results.begin();
+
+	start_time    = atoi(row[0]);
+	duration      = atoi(row[1]);
+	never_expires = atoi(row[2]);
+
+	if (never_expires == 1) {
 		return false;
 	}

 	timeval tv{};
 	gettimeofday(&tv, nullptr);

-	return (i.start_time + i.duration) <= tv.tv_sec;
+	return (start_time + duration) <= tv.tv_sec;
+
 }

 bool Database::CreateInstance(uint16 instance_id, uint32 zone_id, uint32 version, uint32 duration)
 {
-	auto e = InstanceListRepository::NewEntity();
+	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
+	);

-	e.id = instance_id;
-	e.zone = zone_id;
-	e.version = version;
-	e.start_time = std::time(nullptr);
-	e.duration = duration;
+	auto results = QueryDatabase(query);

-	return InstanceListRepository::InsertOne(*this, e).id;
+	return results.Success();
 }

 bool Database::GetUnusedInstanceID(uint16 &instance_id)
 {
 	uint32 max_reserved_instance_id = RuleI(Instances, ReservedInstances);
-	uint32 max_instance_id          = 32000;
+	uint32 max                      = 32000;

-	// sanity check reserved
-	if (max_reserved_instance_id >= max_instance_id) {
-		instance_id = 0;
-		return false;
-	}
-
-	// recycle instances
-	if (RuleB(Instances, RecycleInstanceIds)) {
-
-		//query to get first unused id above reserved
-		auto query = fmt::format(
-			SQL(
-				SELECT id
-				FROM instance_list
-				WHERE id = {};
-			),
-			max_reserved_instance_id + 1
-		);
-
-		auto results = QueryDatabase(query);
-
-		// could not successfully query - bail out
-		if (!results.Success()) {
-			instance_id = 0;
-			return false;
-		}
-
-		// first id is available
-		if (results.RowCount() == 0) {
-			instance_id = max_reserved_instance_id + 1;
-			return true;
-		}
-
-		// now look for next available above reserved
-		query = fmt::format(
-			SQL(
-				SELECT MIN(i.id + 1) AS next_available
-				FROM instance_list i
-				LEFT JOIN instance_list i2 ON i.id + 1 = i2.id
-				WHERE i.id >= {}
-				AND i2.id IS NULL;
-			),
-			max_reserved_instance_id
-		);
-
-		results = QueryDatabase(query);
-
-		// could not successfully query - bail out
-		if (!results.Success()) {
-			instance_id = 0;
-			return false;
-		}
-
-		// did not retrieve any rows - bail out
-		if (results.RowCount() == 0) {
-			instance_id = 0;
-			return false;
-		}
-
-		auto row = results.begin();
-
-		// check that id is within limits
-		if (row[0] && Strings::ToInt(row[0]) <= max_instance_id) {
-			instance_id = Strings::ToInt(row[0]);
-			return true;
-		}
-
-		// no available instance ids
-		instance_id = 0;
-		return false;
-	}
-
-	// get max unused id above reserved
-	auto query = fmt::format(
-		"SELECT IFNULL(MAX(id), {}) + 1 FROM instance_list WHERE id > {}",
+	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;
+
+			)
+		);
+	}
+
 	auto results = QueryDatabase(query);

-	// could not successfully query - bail out
 	if (!results.Success()) {
 		instance_id = 0;
 		return false;
 	}

-	// did not retrieve any rows - bail out
+	if (results.RowCount() == 0) {
+		instance_id = max_reserved_instance_id;
+		return true;
+	}
+
+	auto row = results.begin();
+
+	if (atoi(row[0]) <= max) {
+		instance_id = atoi(row[0]);
+
+		return true;
+	}
+
+	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()) {
+		instance_id = 0;
+		return false;
+	}
+
 	if (results.RowCount() == 0) {
 		instance_id = 0;
 		return false;
 	}

-	auto row = results.begin();
+	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;
+		}

-	// no instances currently used
-	if (!row[0]) {
-		instance_id = max_reserved_instance_id + 1;
-		return true;
+		if (max_reserved_instance_id > max) {
+			instance_id = 0;
+			return false;
+		}
+
+		max_reserved_instance_id++;
 	}

-	// check that id is within limits
-	if (Strings::ToInt(row[0]) <= max_instance_id) {
-		instance_id = Strings::ToInt(row[0]);
-		return true;
-	}
+	instance_id = max_reserved_instance_id;

-	// no available instance ids
-	instance_id = 0;
-	return false;
+	return true;
 }

-bool Database::IsGlobalInstance(uint16 instance_id)
+bool Database::GlobalInstance(uint16 instance_id)
 {
-	if (!instance_id) {
-		return false;
-	}
+	std::string query = StringFormat(
+		"SELECT "
+		"is_global "
+		"FROM "
+		"instance_list "
+		"WHERE "
+		"id = %u "
+		"LIMIT 1 ",
+		instance_id
+		);
+	auto results = QueryDatabase(query);

-	auto i = InstanceListRepository::FindOne(*this, instance_id);
-	if (!i.id) {
+	if (!results.Success())
 		return false;
-	}

-	return i.is_global;
+	if (results.RowCount() == 0)
+		return false;
+
+	auto row = results.begin();
+
+	return (atoi(row[0]) == 1) ? true : false;
 }

 bool Database::RemoveClientFromInstance(uint16 instance_id, uint32 char_id)
 {
-	return InstanceListPlayerRepository::DeleteWhere(
-		*this,
-		fmt::format(
-			"id = {} AND charid = {}",
-			instance_id,
-			char_id
-		)
-	);
+	std::string query = StringFormat("DELETE FROM instance_list_player WHERE id=%lu AND charid=%lu",
+		(unsigned long)instance_id, (unsigned long)char_id);
+	auto results = QueryDatabase(query);
+
+	return results.Success();
 }

+
 bool Database::RemoveClientsFromInstance(uint16 instance_id)
 {
-	return InstanceListPlayerRepository::DeleteOne(*this, instance_id);
+	std::string query = StringFormat("DELETE FROM instance_list_player WHERE id=%lu", (unsigned long)instance_id);
+	auto results = QueryDatabase(query);
+
+	return results.Success();
 }

-bool Database::VerifyInstanceAlive(uint16 instance_id, uint32 character_id)
+bool Database::VerifyInstanceAlive(uint16 instance_id, uint32 char_id)
 {
 	//we are not saved to this instance so set our instance to 0
-	if (!IsGlobalInstance(instance_id) && !CheckInstanceByCharID(instance_id, character_id)) {
+	if (!GlobalInstance(instance_id) && !CharacterInInstanceGroup(instance_id, char_id))
 		return false;
-	}

-	if (CheckInstanceExpired(instance_id)) {
+	if (CheckInstanceExpired(instance_id))
+	{
 		DeleteInstance(instance_id);
 		return false;
 	}
@@ -295,102 +295,99 @@ bool Database::VerifyInstanceAlive(uint16 instance_id, uint32 character_id)

 bool Database::VerifyZoneInstance(uint32 zone_id, uint16 instance_id)
 {
-	auto l = InstanceListRepository::GetWhere(
-		*this,
-		fmt::format(
-			"id = {} AND zone = {}",
-			instance_id,
-			zone_id
-		)
-	);
-	if (l.empty()) {
+
+	std::string query = StringFormat("SELECT id FROM instance_list where id=%u AND zone=%u", instance_id, zone_id);
+	auto results = QueryDatabase(query);
+
+	if (!results.Success())
+		return false;
+
+	if (results.RowCount() == 0)
 		return false;
-	}

 	return true;
 }

-uint16 Database::GetInstanceID(uint32 zone_id, uint32 character_id, int16 version)
+uint16 Database::GetInstanceID(uint32 zone, uint32 character_id, int16 version)
 {
-	if (!zone_id) {
+	if (!zone)
+		return 0;
+
+	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; ",
+		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::GetInstanceVersion(uint16 instance_id) {
+	if (instance_id == 0)
+		return 0;
+
+	std::string query = StringFormat("SELECT version FROM instance_list where id=%u", instance_id);
+	auto results = QueryDatabase(query);
+
+	if (!results.Success())
+		return 0;
+
+	if (results.RowCount() == 0)
+		return 0;
+
+	auto row = results.begin();
+	return atoi(row[0]);
+}
+
+uint32 Database::GetTimeRemainingInstance(uint16 instance_id, bool &is_perma)
+{
+	uint32 start_time = 0;
+	uint32 duration = 0;
+	uint32 never_expires = 0;
+
+	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())
+	{
+		is_perma = false;
 		return 0;
 	}

-	const auto query = fmt::format(
-		"SELECT instance_list.id FROM "
-		"instance_list, instance_list_player WHERE "
-		"instance_list.zone = {} AND "
-		"instance_list.version = {} AND "
-		"instance_list.id = instance_list_player.id AND "
-		"instance_list_player.charid = {} "
-		"LIMIT 1;",
-		zone_id,
-		version,
-		character_id
-	);
-	auto results = QueryDatabase(query);
-
-	if (!results.Success() || !results.RowCount()) {
+	if (results.RowCount() == 0)
+	{
+		is_perma = false;
 		return 0;
 	}

 	auto row = results.begin();

-	return static_cast<uint16>(Strings::ToUnsignedInt(row[0]));
-}
+	start_time = atoi(row[0]);
+	duration = atoi(row[1]);
+	never_expires = atoi(row[2]);

-std::vector<uint16> Database::GetInstanceIDs(uint32 zone_id, uint32 character_id)
-{
-	std::vector<uint16> l;
-
-	if (!zone_id) {
-		return l;
-	}
-
-	const auto query = fmt::format(
-		"SELECT instance_list.id FROM "
-		"instance_list, instance_list_player WHERE "
-		"instance_list.zone = {} AND "
-		"instance_list.id = instance_list_player.id AND "
-		"instance_list_player.charid = {}",
-		zone_id,
-		character_id
-	);
-	auto results = QueryDatabase(query);
-
-	if (!results.Success() || !results.RowCount()) {
-		return l;
-	}
-
-	for (auto row : results) {
-		l.push_back(static_cast<uint16>(Strings::ToUnsignedInt(row[0])));
-	}
-
-	return l;
-}
-
-uint8_t Database::GetInstanceVersion(uint16 instance_id) {
-	if (!instance_id) {
-		return 0;
-	}
-
-	auto i = InstanceListRepository::FindOne(*this, instance_id);
-	if (!i.id) {
-		return 0;
-	}
-
-	return i.version;
-}
-
-uint32 Database::GetTimeRemainingInstance(uint16 instance_id, bool &is_perma)
-{
-	auto i = InstanceListRepository::FindOne(*this, instance_id);
-	if (!i.id) {
-		is_perma = false;
-		return 0;
-	}
-
-	if (i.never_expires) {
+	if (never_expires == 1)
+	{
 		is_perma = true;
 		return 0;
 	}
@@ -399,194 +396,204 @@ uint32 Database::GetTimeRemainingInstance(uint16 instance_id, bool &is_perma)

 	timeval tv;
 	gettimeofday(&tv, nullptr);
-	return ((i.start_time + i.duration) - tv.tv_sec);
+	return ((start_time + duration) - tv.tv_sec);
 }

-uint32 Database::GetInstanceZoneID(uint16 instance_id)
+uint32 Database::VersionFromInstanceID(uint16 instance_id)
 {
-	if (!instance_id) {
-		return 0;
-	}

-	auto i = InstanceListRepository::FindOne(*this, instance_id);
-	if (!i.id) {
-		return 0;
-	}
+	std::string query = StringFormat("SELECT version FROM instance_list where id=%u", instance_id);
+	auto results = QueryDatabase(query);

-	return i.zone;
+	if (!results.Success())
+		return 0;
+
+	if (results.RowCount() == 0)
+		return 0;
+
+	auto row = results.begin();
+
+	return atoi(row[0]);
+}
+
+uint32 Database::ZoneIDFromInstanceID(uint16 instance_id)
+{
+
+	std::string query = StringFormat("SELECT zone FROM instance_list where id=%u", instance_id);
+	auto results = QueryDatabase(query);
+
+	if (!results.Success())
+		return 0;
+
+	if (results.RowCount() == 0)
+		return 0;
+
+	auto row = results.begin();
+
+	return atoi(row[0]);
 }

 void Database::AssignGroupToInstance(uint32 group_id, uint32 instance_id)
 {
-	auto zone_id = GetInstanceZoneID(instance_id);
-	auto version = GetInstanceVersion(instance_id);

-	auto l = GroupIdRepository::GetWhere(
-		*this,
-		fmt::format(
-			"groupid = {}",
-			group_id
-		)
-	);
-	if (l.empty()) {
+	uint32 zone_id = ZoneIDFromInstanceID(instance_id);
+	uint16 version = VersionFromInstanceID(instance_id);
+
+	std::string query = StringFormat("SELECT `charid` FROM `group_id` WHERE `groupid` = %u", group_id);
+	auto results = QueryDatabase(query);
+
+	if (!results.Success())
 		return;
-	}

-	for (const auto& e : l) {
-		if (!GetInstanceID(zone_id, e.charid, version)) {
-			AddClientToInstance(instance_id, e.charid);
-		}
+	for (auto row = results.begin(); row != results.end(); ++row)
+	{
+		uint32 charid = atoi(row[0]);
+		if (GetInstanceID(zone_id, charid, version) == 0)
+			AddClientToInstance(instance_id, charid);
 	}
 }

 void Database::AssignRaidToInstance(uint32 raid_id, uint32 instance_id)
 {
-	auto zone_id = GetInstanceZoneID(instance_id);
-	auto version = GetInstanceVersion(instance_id);

-	auto l = RaidMembersRepository::GetWhere(
-		*this,
+	uint32 zone_id = ZoneIDFromInstanceID(instance_id);
+	uint16 version = VersionFromInstanceID(instance_id);
+
+	std::string query = StringFormat("SELECT `charid` FROM `raid_members` WHERE `raidid` = %u", raid_id);
+	auto results = QueryDatabase(query);
+
+	if (!results.Success())
+		return;
+
+	for (auto row = results.begin(); row != results.end(); ++row)
+	{
+		uint32 charid = atoi(row[0]);
+		if (GetInstanceID(zone_id, charid, version) == 0)
+			AddClientToInstance(instance_id, charid);
+	}
+}
+
+void Database::BuryCorpsesInInstance(uint16 instance_id) {
+	QueryDatabase(
 		fmt::format(
-			"raidid = {}",
-			raid_id
+			"UPDATE character_corpses SET is_buried = 1, instance_id = 0 WHERE instance_id = {}",
+			instance_id
 		)
 	);
-	if (l.empty()) {
-		return;
-	}
-
-	for (const auto& e : l) {
-		if (!GetInstanceID(zone_id, e.charid, version)) {
-			AddClientToInstance(instance_id, e.charid);
-		}
-	}
 }

 void Database::DeleteInstance(uint16 instance_id)
 {
-	InstanceListPlayerRepository::DeleteWhere(*this, fmt::format("id = {}", instance_id));
+	std::string query;
+	
+	query = StringFormat("DELETE FROM instance_list_player WHERE id=%u", instance_id);
+	QueryDatabase(query);

-	RespawnTimesRepository::DeleteWhere(*this, fmt::format("instance_id = {}", instance_id));
+	query = StringFormat("DELETE FROM respawn_times WHERE instance_id=%u", instance_id);
+	QueryDatabase(query);

-	SpawnConditionValuesRepository::DeleteWhere(*this, fmt::format("instance_id = {}", instance_id));
+	query = StringFormat("DELETE FROM spawn_condition_values WHERE instance_id=%u", instance_id);
+	QueryDatabase(query);

 	DynamicZoneMembersRepository::DeleteByInstance(*this, instance_id);
 	DynamicZonesRepository::DeleteWhere(*this, fmt::format("instance_id = {}", instance_id));

-	CharacterCorpsesRepository::BuryInstance(*this, instance_id);
+	BuryCorpsesInInstance(instance_id);
 }

-void Database::FlagInstanceByGroupLeader(uint32 zone_id, int16 version, uint32 character_id, uint32 group_id)
+void Database::FlagInstanceByGroupLeader(uint32 zone, int16 version, uint32 charid, uint32 gid)
 {
-	auto instance_id = GetInstanceID(zone_id, character_id, version);
-	if (instance_id) {
+	uint16 id = GetInstanceID(zone, charid, version);
+	if (id != 0)
 		return;
-	}

 	char ln[128];
 	memset(ln, 0, 128);
-	GetGroupLeadershipInfo(group_id, ln);
+	GetGroupLeadershipInfo(gid, ln);
+	uint32 l_charid = GetCharacterID((const char*)ln);
+	uint16 l_id = GetInstanceID(zone, l_charid, version);

-	auto group_leader_id = GetCharacterID((const char*)ln);
-	auto group_leader_instance_id = GetInstanceID(zone_id, group_leader_id, version);
-
-	if (!group_leader_instance_id) {
+	if (l_id == 0)
 		return;
-	}

-	AddClientToInstance(group_leader_instance_id, character_id);
+	AddClientToInstance(l_id, charid);
 }

-void Database::FlagInstanceByRaidLeader(uint32 zone_id, int16 version, uint32 character_id, uint32 raid_id)
+void Database::FlagInstanceByRaidLeader(uint32 zone, int16 version, uint32 charid, uint32 rid)
 {
-	uint16 instance_id = GetInstanceID(zone_id, character_id, version);
-	if (instance_id) {
+	uint16 id = GetInstanceID(zone, charid, version);
+	if (id != 0)
 		return;
-	}

-	auto raid_leader_id = GetCharacterID(GetRaidLeaderName(raid_id));
-	auto raid_leader_instance_id = GetInstanceID(zone_id, raid_leader_id, version);
+	uint32 l_charid = GetCharacterID(GetRaidLeaderName(rid));
+	uint16 l_id = GetInstanceID(zone, l_charid, version);

-	if (!raid_leader_instance_id) {
+	if (l_id == 0)
 		return;
-	}

-	AddClientToInstance(raid_leader_instance_id, character_id);
+	AddClientToInstance(l_id, charid);
 }

-void Database::GetCharactersInInstance(uint16 instance_id, std::list<uint32> &character_ids)
-{
-	auto l = InstanceListPlayerRepository::GetWhere(*this, fmt::format("id = {}", instance_id));
-	if (l.empty()) {
-		return;
-	}
+void Database::GetCharactersInInstance(uint16 instance_id, std::list<uint32> &charid_list) {

-	for (const auto& e : l) {
-		character_ids.push_back(e.charid);
-	}
+	std::string query = StringFormat("SELECT `charid` FROM `instance_list_player` WHERE `id` = %u", instance_id);
+	auto results = QueryDatabase(query);
+
+	if (!results.Success())
+		return;
+
+	for (auto row = results.begin(); row != results.end(); ++row)
+		charid_list.push_back(atoi(row[0]));
 }

 void Database::PurgeExpiredInstances()
 {
+
 	/**
 	 * 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
 	 */
-	auto l = InstanceListRepository::GetWhere(
-		*this,
-		"(start_time + duration) <= (UNIX_TIMESTAMP() - 86400) AND never_expires = 0"
-	);
-	if (l.empty()) {
+	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()) {
+		return;
+	}
+
+	if (results.RowCount() == 0) {
 		return;
 	}

 	std::vector<std::string> instance_ids;
-	for (const auto& e : l) {
-		instance_ids.emplace_back(std::to_string(e.id));
+	for (auto row = results.begin(); row != results.end(); ++row) {
+		instance_ids.emplace_back(row[0]);
 	}

-	const auto imploded_instance_ids = Strings::Implode(",", instance_ids);
+	std::string imploded_instance_ids = implode(",", instance_ids);

-	InstanceListRepository::DeleteWhere(*this, fmt::format("id IN ({})", imploded_instance_ids));
-	InstanceListPlayerRepository::DeleteWhere(*this, fmt::format("id IN ({})", imploded_instance_ids));
-	RespawnTimesRepository::DeleteWhere(*this, fmt::format("instance_id IN ({})", imploded_instance_ids));
-	SpawnConditionValuesRepository::DeleteWhere(*this, fmt::format("instance_id IN ({})", imploded_instance_ids));
-	CharacterCorpsesRepository::BuryInstances(*this, imploded_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));
 	DynamicZoneMembersRepository::DeleteByManyInstances(*this, imploded_instance_ids);
 	DynamicZonesRepository::DeleteWhere(*this, fmt::format("instance_id IN ({})", imploded_instance_ids));
-	Spawn2DisabledRepository::DeleteWhere(*this, fmt::format("instance_id IN ({})", imploded_instance_ids));
 }

 void Database::SetInstanceDuration(uint16 instance_id, uint32 new_duration)
 {
-	auto i = InstanceListRepository::FindOne(*this, instance_id);
-	if (!i.id) {
-		return;
-	}
-
-	i.start_time = std::time(nullptr);
-	i.duration = new_duration;
-
-	InstanceListRepository::UpdateOne(*this, i);
-}
-
-void Database::CleanupInstanceCorpses() {
-	auto l = InstanceListRepository::GetWhere(
-		*this,
-		"never_expires = 0"
-	);
-
-	if (l.empty()) {
-		return;
-	}
-
-	std::vector<std::string> instance_ids;
-	for (const auto& e : l) {
-		instance_ids.emplace_back(std::to_string(e.id));
-	}
-
-	const auto imploded_instance_ids = Strings::Implode(",", instance_ids);
-
-	CharacterCorpsesRepository::BuryInstances(*this, imploded_instance_ids);
+	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);
 }
@@ -53,7 +53,6 @@ namespace DatabaseSchema {
 			{"character_expedition_lockouts",  "character_id"},
 			{"character_exp_modifiers",        "character_id"},
 			{"character_inspect_messages",     "id"},
-			{"character_instance_safereturns", "character_id"},
 			{"character_item_recast",          "id"},
 			{"character_languages",            "id"},
 			{"character_leadership_abilities", "id"},
@@ -62,16 +61,13 @@ namespace DatabaseSchema {
 			{"character_pet_buffs",            "char_id"},
 			{"character_pet_info",             "char_id"},
 			{"character_pet_inventory",        "char_id"},
-			{"character_peqzone_flags",        "id"},
 			{"character_potionbelt",           "id"},
 			{"character_skills",               "id"},
 			{"character_spells",               "id"},
-			{"character_stats_record",         "character_id"},
-			{"character_task_timers",          "character_id"},
 			{"character_tasks",                "charid"},
-			{"character_tribute",              "character_id"},
+			{"character_tribute",              "id"},
 			{"completed_tasks",                "charid"},
-			{"data_buckets",                   "character_id"},
+			{"data_buckets",                   "id"},
 			{"faction_values",                 "char_id"},
 			{"friends",                        "charid"},
 			{"guild_members",                  "char_id"},
@@ -84,6 +80,7 @@ namespace DatabaseSchema {
 			{"player_titlesets",               "char_id"},
 			{"quest_globals",                  "charid"},
 			{"timers",                         "char_id"},
+			{"titles",                         "char_id"},
 			{"trader",                         "char_id"},
 			{"zone_flags",                     "charID"}
 		};
@@ -122,7 +119,6 @@ namespace DatabaseSchema {
 			"character_expedition_lockouts",
 			"character_exp_modifiers",
 			"character_inspect_messages",
-			"character_instance_safereturns",
 			"character_item_recast",
 			"character_languages",
 			"character_leadership_abilities",
@@ -131,12 +127,9 @@ namespace DatabaseSchema {
 			"character_pet_buffs",
 			"character_pet_info",
 			"character_pet_inventory",
-			"character_peqzone_flags",
 			"character_potionbelt",
 			"character_skills",
 			"character_spells",
-			"character_stats_record",
-			"character_task_timers",
 			"character_tasks",
 			"character_tribute",
 			"completed_tasks",
@@ -146,10 +139,8 @@ namespace DatabaseSchema {
 			"friends",
 			"guild_bank",
 			"guild_members",
-			"guild_permissions",
 			"guild_ranks",
 			"guild_relations",
-			"guild_tributes",
 			"guilds",
 			"instance_list_player",
 			"inventory",
@@ -163,6 +154,7 @@ namespace DatabaseSchema {
 			"spell_buckets",
 			"spell_globals",
 			"timers",
+			"titles",
 			"trader",
 			"trader_audit",
 			"zone_flags"
@@ -193,14 +185,13 @@ namespace DatabaseSchema {
 			"char_create_point_allocations",
 			"damageshieldtypes",
 			"doors",
-			"dynamic_zone_templates",
-			"faction_association",
 			"faction_base_data",
 			"faction_list",
 			"faction_list_mod",
 			"fishing",
 			"forage",
 			"global_loot",
+			"goallists",
 			"graveyard",
 			"grid",
 			"grid_entries",
@@ -226,9 +217,9 @@ namespace DatabaseSchema {
 			"npc_types_tint",
 			"object",
 			"pets",
-			"pets_beastlord_data",
 			"pets_equipmentset",
 			"pets_equipmentset_entries",
+			"proximities",
 			"skill_caps",
 			"spawn2",
 			"spawn_conditions",
@@ -260,9 +251,7 @@ namespace DatabaseSchema {
 	{
 		return {
 			"chatchannels",
-			"chatchannel_reserved_names",
 			"command_settings",
-			"command_subsettings",
 			"content_flags",
 			"db_str",
 			"eqtime",
@@ -276,7 +265,6 @@ namespace DatabaseSchema {
 			"perl_event_export_settings",
 			"profanity_list",
 			"rule_sets",
-			"titles",
 			"rule_values",
 			"variables",
 		};
@@ -321,23 +309,20 @@ namespace DatabaseSchema {
 			"banned_ips",
 			"bug_reports",
 			"bugs",
-			"completed_shared_task_activity_state",
-			"completed_shared_task_members",
-			"completed_shared_tasks",
-			"discord_webhooks",
 			"dynamic_zone_members",
 			"dynamic_zones",
+			"eventlog",
 			"expedition_lockouts",
 			"expeditions",
 			"gm_ips",
 			"group_id",
 			"group_leaders",
-			"instance_list",
+			"hackers",
 			"ip_exemptions",
+			"instance_list",
+			"item_tick",
 			"lfguild",
-			"merc_buffs",
 			"merchantlist_temp",
-			"mercs",
 			"object_contents",
 			"raid_details",
 			"raid_leaders",
@@ -346,13 +331,6 @@ namespace DatabaseSchema {
 			"respawn_times",
 			"saylink",
 			"server_scheduled_events",
-			"spawn2_disabled",
-			"player_event_log_settings",
-			"player_event_logs",
-			"shared_task_activity_state",
-			"shared_task_dynamic_zones",
-			"shared_task_members",
-			"shared_tasks",
 		};
 	}

@@ -385,57 +363,6 @@ namespace DatabaseSchema {
 		};
 	}

-	/**
-	 * @description Gets all player bot tables
-	 * @note These tables have no content in the PEQ daily dump
-	 *
-	 * @return
-	 */
-	static std::vector<std::string> GetBotTables()
-	{
-		return {
-			"bot_buffs",
-			"bot_command_settings",
-			"bot_create_combinations",
-			"bot_data",
-			"bot_heal_rotation_members",
-			"bot_heal_rotation_targets",
-			"bot_heal_rotations",
-			"bot_inspect_messages",
-			"bot_inventories",
-			"bot_owner_options",
-			"bot_pet_buffs",
-			"bot_pet_inventories",
-			"bot_pets",
-			"bot_spell_casting_chances",
-			"bot_spell_settings",
-			"bot_spells_entries",
-			"bot_stances",
-			"bot_timers"
-		};
-	}
-
-	static std::vector<std::string> GetMercTables()
-	{
-		return {
-			"merc_armorinfo",
-			"merc_inventory",
-			"merc_merchant_entries",
-			"merc_merchant_template_entries",
-			"merc_merchant_templates",
-			"merc_name_types",
-			"merc_npc_types",
-			"merc_spell_list_entries",
-			"merc_spell_lists",
-			"merc_stance_entries",
-			"merc_stats",
-			"merc_subtypes",
-			"merc_templates",
-			"merc_types",
-			"merc_weaponinfo"
-		};
-	}
-
 }

 #endif //EQEMU_DATABASE_SCHEMA_H
@@ -8,11 +8,11 @@

 #include "dbcore.h"

+#include <errmsg.h>
 #include <fstream>
 #include <iostream>
 #include <mysqld_error.h>
 #include <string.h>
-#include "strings.h"

 #ifdef _WINDOWS
 #define snprintf	_snprintf
@@ -34,16 +34,14 @@

 DBcore::DBcore()
 {
-	mysql      = mysql_init(nullptr);
-	mysqlOwner = true;
-	pHost      = nullptr;
-	pUser      = nullptr;
-	pPassword  = nullptr;
-	pDatabase  = nullptr;
-	pCompress  = false;
-	pSSL       = false;
-	pStatus    = Closed;
-	m_mutex    = new Mutex;
+	mysql_init(&mysql);
+	pHost           = nullptr;
+	pUser           = nullptr;
+	pPassword       = nullptr;
+	pDatabase       = nullptr;
+	pCompress       = false;
+	pSSL            = false;
+	pStatus         = Closed;
 }

 DBcore::~DBcore()
@@ -53,10 +51,16 @@ DBcore::~DBcore()
 	 * are re-using the default database connection pointer when we dont have an
 	 * external configuration setup ex: (content_database)
 	 */
-	if (mysqlOwner) {
-		mysql_close(mysql);
+	std::string mysql_connection_host;
+	if (mysql.host) {
+		mysql_connection_host = mysql.host;
 	}

+	if (GetOriginHost() != mysql_connection_host) {
+		return;
+	}
+
+	mysql_close(&mysql);
 	safe_delete_array(pHost);
 	safe_delete_array(pUser);
 	safe_delete_array(pPassword);
@@ -66,21 +70,20 @@ DBcore::~DBcore()
 // Sends the MySQL server a keepalive
 void DBcore::ping()
 {
-	if (!m_mutex->trylock()) {
+	if (!MDatabase.trylock()) {
 		// well, if's it's locked, someone's using it. If someone's using it, it doesnt need a keepalive
 		return;
 	}
-	mysql_ping(mysql);
-	m_mutex->unlock();
+	mysql_ping(&mysql);
+	MDatabase.unlock();
 }

-MySQLRequestResult DBcore::QueryDatabase(const std::string& query, bool retryOnFailureOnce)
+MySQLRequestResult DBcore::QueryDatabase(std::string query, bool retryOnFailureOnce)
 {
-	auto r = QueryDatabase(query.c_str(), query.length(), retryOnFailureOnce);
-	return r;
+	return QueryDatabase(query.c_str(), query.length(), retryOnFailureOnce);
 }

-bool DBcore::DoesTableExist(const std::string& table_name)
+bool DBcore::DoesTableExist(std::string table_name)
 {
 	auto results = QueryDatabase(fmt::format("SHOW TABLES LIKE '{}'", table_name));

@@ -92,16 +95,18 @@ MySQLRequestResult DBcore::QueryDatabase(const char *query, uint32 querylen, boo
 	BenchTimer timer;
 	timer.reset();

-	LockMutex lock(m_mutex);
+	LockMutex lock(&MDatabase);

 	// Reconnect if we are not connected before hand.
 	if (pStatus != Connected) {
 		Open();
 	}

+
+
 	// request query. != 0 indicates some kind of error.
-	if (mysql_real_query(mysql, query, querylen) != 0) {
-		unsigned int errorNumber = mysql_errno(mysql);
+	if (mysql_real_query(&mysql, query, querylen) != 0) {
+		unsigned int errorNumber = mysql_errno(&mysql);

 		if (errorNumber == CR_SERVER_GONE_ERROR) {
 			pStatus = Error;
@@ -125,26 +130,26 @@ MySQLRequestResult DBcore::QueryDatabase(const char *query, uint32 querylen, boo

 			auto errorBuffer = new char[MYSQL_ERRMSG_SIZE];

-			snprintf(errorBuffer, MYSQL_ERRMSG_SIZE, "#%i: %s", mysql_errno(mysql), mysql_error(mysql));
+			snprintf(errorBuffer, MYSQL_ERRMSG_SIZE, "#%i: %s", mysql_errno(&mysql), mysql_error(&mysql));

-			return MySQLRequestResult(nullptr, 0, 0, 0, 0, (uint32) mysql_errno(mysql), errorBuffer);
+			return MySQLRequestResult(nullptr, 0, 0, 0, 0, (uint32) mysql_errno(&mysql), errorBuffer);
 		}

 		auto errorBuffer = new char[MYSQL_ERRMSG_SIZE];
-		snprintf(errorBuffer, MYSQL_ERRMSG_SIZE, "#%i: %s", mysql_errno(mysql), mysql_error(mysql));
+		snprintf(errorBuffer, MYSQL_ERRMSG_SIZE, "#%i: %s", mysql_errno(&mysql), mysql_error(&mysql));

 		/**
 		 * Error logging
 		 */
-		if (mysql_errno(mysql) > 0 && query[0] != '\0') {
-			LogMySQLError("MySQL Error ({}) [{}] Query [{}]", mysql_errno(mysql), mysql_error(mysql), query);
+		if (mysql_errno(&mysql) > 0 && strlen(query) > 0) {
+			LogMySQLError("[{}] [{}]\n[{}]", mysql_errno(&mysql), mysql_error(&mysql), query);
 		}

-		return MySQLRequestResult(nullptr, 0, 0, 0, 0, mysql_errno(mysql), errorBuffer);
+		return MySQLRequestResult(nullptr, 0, 0, 0, 0, mysql_errno(&mysql), errorBuffer);
 	}

 	// successful query. get results.
-	MYSQL_RES *res     = mysql_store_result(mysql);
+	MYSQL_RES *res     = mysql_store_result(&mysql);
 	uint32    rowCount = 0;

 	if (res != nullptr) {
@@ -153,16 +158,16 @@ MySQLRequestResult DBcore::QueryDatabase(const char *query, uint32 querylen, boo

 	MySQLRequestResult requestResult(
 		res,
-		(uint32) mysql_affected_rows(mysql),
+		(uint32) mysql_affected_rows(&mysql),
 		rowCount,
-		(uint32) mysql_field_count(mysql),
-		(uint32) mysql_insert_id(mysql)
+		(uint32) mysql_field_count(&mysql),
+		(uint32) mysql_insert_id(&mysql)
 	);

 	if (LogSys.log_settings[Logs::MySQLQuery].is_category_enabled == 1) {
 		if ((strncasecmp(query, "select", 6) == 0)) {
 			LogMySQLQuery(
-				"{0} -- ({1} row{2} returned) ({3}s)",
+				"{0} ({1} row{2} returned) ({3}s)",
 				query,
 				requestResult.RowCount(),
 				requestResult.RowCount() == 1 ? "" : "s",
@@ -171,7 +176,7 @@ MySQLRequestResult DBcore::QueryDatabase(const char *query, uint32 querylen, boo
 		}
 		else {
 			LogMySQLQuery(
-				"{0} -- ({1} row{2} affected) ({3}s)",
+				"{0} ({1} row{2} affected) ({3}s)",
 				query,
 				requestResult.RowsAffected(),
 				requestResult.RowsAffected() == 1 ? "" : "s",
@@ -202,7 +207,7 @@ uint32 DBcore::DoEscapeString(char *tobuf, const char *frombuf, uint32 fromlen)
 {
 //	No good reason to lock the DB, we only need it in the first place to check char encoding.
 //	LockMutex lock(&MDatabase);
-	return mysql_real_escape_string(mysql, tobuf, frombuf, fromlen);
+	return mysql_real_escape_string(&mysql, tobuf, frombuf, fromlen);
 }

 bool DBcore::Open(
@@ -217,7 +222,7 @@ bool DBcore::Open(
 	bool iSSL
 )
 {
-	LockMutex lock(m_mutex);
+	LockMutex lock(&MDatabase);
 	safe_delete_array(pHost);
 	safe_delete_array(pUser);
 	safe_delete_array(pPassword);
@@ -237,13 +242,13 @@ bool DBcore::Open(uint32 *errnum, char *errbuf)
 	if (errbuf) {
 		errbuf[0] = 0;
 	}
-	LockMutex lock(m_mutex);
+	LockMutex lock(&MDatabase);
 	if (GetStatus() == Connected) {
 		return true;
 	}
 	if (GetStatus() == Error) {
-		mysql_close(mysql);
-		mysql_init(mysql);        // Initialize structure again
+		mysql_close(&mysql);
+		mysql_init(&mysql);        // Initialize structure again
 	}
 	if (!pHost) {
 		return false;
@@ -260,7 +265,7 @@ bool DBcore::Open(uint32 *errnum, char *errbuf)
 	if (pSSL) {
 		flags |= CLIENT_SSL;
 	}
-	if (mysql_real_connect(mysql, pHost, pUser, pPassword, pDatabase, pPort, 0, flags)) {
+	if (mysql_real_connect(&mysql, pHost, pUser, pPassword, pDatabase, pPort, 0, flags)) {
 		pStatus = Connected;

 		std::string connected_origin_host = pHost;
@@ -270,16 +275,21 @@ bool DBcore::Open(uint32 *errnum, char *errbuf)
 	}
 	else {
 		if (errnum) {
-			*errnum = mysql_errno(mysql);
+			*errnum = mysql_errno(&mysql);
 		}
 		if (errbuf) {
-			snprintf(errbuf, MYSQL_ERRMSG_SIZE, "#%i: %s", mysql_errno(mysql), mysql_error(mysql));
+			snprintf(errbuf, MYSQL_ERRMSG_SIZE, "#%i: %s", mysql_errno(&mysql), mysql_error(&mysql));
 		}
 		pStatus = Error;
 		return false;
 	}
 }

+void DBcore::SetMysql(MYSQL *mysql)
+{
+	DBcore::mysql = *mysql;
+}
+
 const std::string &DBcore::GetOriginHost() const
 {
 	return origin_host;
@@ -289,150 +299,3 @@ void DBcore::SetOriginHost(const std::string &origin_host)
 {
 	DBcore::origin_host = origin_host;
 }
-
-std::string DBcore::Escape(const std::string& s)
-{
-	const std::size_t s_len = s.length();
-	std::vector<char> temp((s_len * 2) + 1, '\0');
-	mysql_real_escape_string(mysql, temp.data(), s.c_str(), s_len);
-
-	return temp.data();
-}
-
-void DBcore::SetMutex(Mutex *mutex)
-{
-	safe_delete(m_mutex);
-
-	DBcore::m_mutex = mutex;
-}
-
-// executes multiple statements in one query
-// do not use this in application logic
-// this was built and maintained for database migrations only
-MySQLRequestResult DBcore::QueryDatabaseMulti(const std::string &query)
-{
-	SetMultiStatementsOn();
-
-	BenchTimer timer;
-	timer.reset();
-
-	LockMutex lock(m_mutex);
-
-	// Reconnect if we are not connected before hand.
-	if (pStatus != Connected) {
-		Open();
-	}
-	auto r = MySQLRequestResult{};
-
-	int status = mysql_real_query(mysql, query.c_str(), query.length());
-
-	// process single result
-	if (status != 0) {
-		unsigned int error_number = mysql_errno(mysql);
-
-		if (error_number == CR_SERVER_GONE_ERROR) {
-			pStatus = Error;
-		}
-
-		// error logging
-		if (mysql_errno(mysql) > 0 && query.length() > 0 && mysql_errno(mysql) != 1065) {
-			std::string error_raw   = fmt::format("{}", mysql_error(mysql));
-			std::string mysql_err   = Strings::Trim(error_raw);
-			std::string clean_query = Strings::Replace(query, "\n", "");
-			LogMySQLError("[{}] ({}) query [{}]", mysql_err, mysql_errno(mysql), clean_query);
-
-			MYSQL_RES *res = mysql_store_result(mysql);
-
-			uint32 row_count = 0;
-			if (res) {
-				row_count = (uint32) mysql_num_rows(res);
-			}
-
-			r = MySQLRequestResult(
-				res,
-				(uint32) mysql_affected_rows(mysql),
-				row_count,
-				(uint32) mysql_field_count(mysql),
-				(uint32) mysql_insert_id(mysql)
-			);
-
-			std::string error_message = mysql_error(mysql);
-			r.SetErrorMessage(error_message);
-			r.SetErrorNumber(mysql_errno(mysql));
-
-			if (res) {
-				mysql_free_result(res);
-			}
-
-			SetMultiStatementsOff();
-
-			return r;
-		}
-	}
-
-
-	int index = 0;
-
-	// there could be a query with a semicolon in the actual data, this is best effort for
-	// logging / display purposes
-	// rare that we see this when this is only used in DDL statements
-	auto pieces = Strings::Split(query, ";");
-
-	// process each statement result
-	do {
-		uint32    row_count = 0;
-		MYSQL_RES *res      = mysql_store_result(mysql);
-
-		r = MySQLRequestResult(
-			res,
-			(uint32) mysql_affected_rows(mysql),
-			row_count,
-			(uint32) mysql_field_count(mysql),
-			(uint32) mysql_insert_id(mysql)
-		);
-
-		if (pieces.size() >= index) {
-			auto piece = pieces[index];
-			LogMySQLQuery(
-				"{} -- ({} row{} affected) ({}s)",
-				piece,
-				r.RowsAffected(),
-				r.RowsAffected() == 1 ? "" : "s",
-				std::to_string(timer.elapsed())
-			);
-		}
-
-		if (res) {
-			row_count = (uint32) mysql_num_rows(res);
-		}
-
-		// more results? -1 = no, >0 = error, 0 = yes (keep looping)
-		if ((status = mysql_next_result(mysql)) > 0) {
-			if (mysql_errno(mysql) > 0) {
-				LogMySQLError("[{}] [{}]", mysql_errno(mysql), mysql_error(mysql));
-			}
-
-			mysql_free_result(res);
-
-			// error logging
-			std::string error_message = mysql_error(mysql);
-			r.SetErrorMessage(error_message);
-			r.SetErrorNumber(mysql_errno(mysql));
-
-			SetMultiStatementsOff();
-
-			// we handle errors elsewhere
-			return r;
-		}
-
-		if (res) {
-			mysql_free_result(res);
-		}
-
-		index++;
-	} while (status == 0);
-
-	SetMultiStatementsOff();
-
-	return r;
-}
@@ -12,10 +12,6 @@

 #include <mysql.h>
 #include <string.h>
-#include <mutex>
-
-#define CR_SERVER_GONE_ERROR    2006
-#define CR_SERVER_LOST          2013

 class DBcore {
 public:
@@ -27,26 +23,19 @@ public:
 	~DBcore();
 	eStatus GetStatus() { return pStatus; }
 	MySQLRequestResult QueryDatabase(const char *query, uint32 querylen, bool retryOnFailureOnce = true);
-	MySQLRequestResult QueryDatabase(const std::string& query, bool retryOnFailureOnce = true);
-	MySQLRequestResult QueryDatabaseMulti(const std::string &query);
+	MySQLRequestResult QueryDatabase(std::string query, bool retryOnFailureOnce = true);
 	void TransactionBegin();
 	void TransactionCommit();
 	void TransactionRollback();
-	std::string Escape(const std::string& s);
 	uint32 DoEscapeString(char *tobuf, const char *frombuf, uint32 fromlen);
 	void ping();
+	MYSQL *getMySQL() { return &mysql; }
+	void SetMysql(MYSQL *mysql);

 	const std::string &GetOriginHost() const;
 	void SetOriginHost(const std::string &origin_host);

-	bool DoesTableExist(const std::string& table_name);
-
-	void SetMySQL(const DBcore &o)
-	{
-		mysql      = o.mysql;
-		mysqlOwner = false;
-	}
-	void SetMutex(Mutex *mutex);
+	bool DoesTableExist(std::string table_name);

 protected:
 	bool Open(
@@ -64,13 +53,10 @@ protected:
 private:
 	bool Open(uint32 *errnum = nullptr, char *errbuf = nullptr);

-	MYSQL*  mysql;
-	bool    mysqlOwner;
-	Mutex   *m_mutex;
+	MYSQL   mysql;
+	Mutex   MDatabase;
 	eStatus pStatus;

-	std::mutex m_query_lock{};
-
 	std::string origin_host;

 	char   *pHost;
@@ -81,20 +67,8 @@ private:
 	uint32 pPort;
 	bool   pSSL;

-	// allows multiple queries to be executed within the same query
-	// do not use this under normal operation
-	// we use this during database migrations only currently
-	void SetMultiStatementsOn()
-	{
-		mysql_set_server_option(mysql, MYSQL_OPTION_MULTI_STATEMENTS_ON);
-	}
-
-	// disables multiple statements to be executed in one query
-	void SetMultiStatementsOff()
-	{
-		mysql_set_server_option(mysql, MYSQL_OPTION_MULTI_STATEMENTS_OFF);
-	}
 };


 #endif
+
@@ -11,7 +11,7 @@
 	are required to give you total support for your newly bought product;
 	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
 	A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-
+	
 	You should have received a copy of the GNU General Public License
 	along with this program; if not, write to the Free Software
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
@@ -19,81 +19,131 @@

 #include "deity.h"

-EQ::deity::DeityTypeBit EQ::deity::GetDeityBitmask(DeityType deity_type)
+
+EQ::deity::DeityTypeBit EQ::deity::ConvertDeityTypeToDeityTypeBit(DeityType deity_type)
 {
 	switch (deity_type) {
-		case DeityBertoxxulous:
-			return bit_DeityBertoxxulous;
-		case DeityBrellSirilis:
-			return bit_DeityBrellSirilis;
-		case DeityCazicThule:
-			return bit_DeityCazicThule;
-		case DeityErollisiMarr:
-			return bit_DeityErollisiMarr;
-		case DeityBristlebane:
-			return bit_DeityBristlebane;
-		case DeityInnoruuk:
-			return bit_DeityInnoruuk;
-		case DeityKarana:
-			return bit_DeityKarana;
-		case DeityMithanielMarr:
-			return bit_DeityMithanielMarr;
-		case DeityPrexus:
-			return bit_DeityPrexus;
-		case DeityQuellious:
-			return bit_DeityQuellious;
-		case DeityRallosZek:
-			return bit_DeityRallosZek;
-		case DeityRodcetNife:
-			return bit_DeityRodcetNife;
-		case DeitySolusekRo:
-			return bit_DeitySolusekRo;
-		case DeityTheTribunal:
-			return bit_DeityTheTribunal;
-		case DeityTunare:
-			return bit_DeityTunare;
-		case DeityVeeshan:
-			return bit_DeityVeeshan;
-		case DeityAgnostic_LB:
-		case DeityAgnostic:
-			return bit_DeityAgnostic;
-		default:
-			return bit_DeityAll;
-	}
-}
-
-const std::map<EQ::deity::DeityType, std::string>& EQ::deity::GetDeityMap()
-{
-	static const std::map<EQ::deity::DeityType, std::string> deity_map = {
-		{ DeityAgnostic, "Agnostic" },
-		{ DeityAgnostic_LB, "Agnostic" },
-		{ DeityBertoxxulous, "Bertoxxulous" },
-		{ DeityBrellSirilis, "Brell Serilis" },
-		{ DeityBristlebane, "Bristlebane" },
-		{ DeityCazicThule, "Cazic-Thule" },
-		{ DeityErollisiMarr, "Erollisi Marr" },
-		{ DeityInnoruuk, "Innoruuk" },
-		{ DeityKarana, "Karana" },
-		{ DeityMithanielMarr, "Mithaniel Marr" },
-		{ DeityPrexus, "Prexus" },
-		{ DeityQuellious, "Quellious" },
-		{ DeityRallosZek, "Rallos Zek" },
-		{ DeityRodcetNife, "Rodcet Nife" },
-		{ DeitySolusekRo, "Solusek Ro" },
-		{ DeityTheTribunal, "The Tribunal" },
-		{ DeityTunare, "Tunare" },
-		{ DeityVeeshan, "Veeshan" }
+	case DeityBertoxxulous:
+		return bit_DeityBertoxxulous;
+	case DeityBrellSirilis:
+		return bit_DeityBrellSirilis;
+	case DeityCazicThule:
+		return bit_DeityCazicThule;
+	case DeityErollisiMarr:
+		return bit_DeityErollisiMarr;
+	case DeityBristlebane:
+		return bit_DeityBristlebane;
+	case DeityInnoruuk:
+		return bit_DeityInnoruuk;
+	case DeityKarana:
+		return bit_DeityKarana;
+	case DeityMithanielMarr:
+		return bit_DeityMithanielMarr;
+	case DeityPrexus:
+		return bit_DeityPrexus;
+	case DeityQuellious:
+		return bit_DeityQuellious;
+	case DeityRallosZek:
+		return bit_DeityRallosZek;
+	case DeityRodcetNife:
+		return bit_DeityRodcetNife;
+	case DeitySolusekRo:
+		return bit_DeitySolusekRo;
+	case DeityTheTribunal:
+		return bit_DeityTheTribunal;
+	case DeityTunare:
+		return bit_DeityTunare;
+	case DeityVeeshan:
+		return bit_DeityVeeshan;
+	case DeityAgnostic_LB:
+	case DeityAgnostic:
+		return bit_DeityAgnostic;
+	default:
+		return bit_DeityAll;
 	};
-
-	return deity_map;
 }

-std::string EQ::deity::GetDeityName(DeityType deity_type)
+EQ::deity::DeityType EQ::deity::ConvertDeityTypeBitToDeityType(DeityTypeBit deity_type_bit)
 {
-
-	if (EQ::deity::GetDeityMap().find(deity_type) != EQ::deity::GetDeityMap().end()) {
-		return EQ::deity::GetDeityMap().find(deity_type)->second;
-	}
-
-	return std::string();
+	switch (deity_type_bit) {
+	case bit_DeityAgnostic:
+		return DeityAgnostic;
+	case bit_DeityBertoxxulous:
+		return DeityBertoxxulous;
+	case bit_DeityBrellSirilis:
+		return DeityBrellSirilis;
+	case bit_DeityCazicThule:
+		return DeityCazicThule;
+	case bit_DeityErollisiMarr:
+		return DeityErollisiMarr;
+	case bit_DeityBristlebane:
+		return DeityBristlebane;
+	case bit_DeityInnoruuk:
+		return DeityInnoruuk;
+	case bit_DeityKarana:
+		return DeityKarana;
+	case bit_DeityMithanielMarr:
+		return DeityMithanielMarr;
+	case bit_DeityPrexus:
+		return DeityPrexus;
+	case bit_DeityQuellious:
+		return DeityQuellious;
+	case bit_DeityRallosZek:
+		return DeityRallosZek;
+	case bit_DeityRodcetNife:
+		return DeityRodcetNife;
+	case bit_DeitySolusekRo:
+		return DeitySolusekRo;
+	case bit_DeityTheTribunal:
+		return DeityTheTribunal;
+	case bit_DeityTunare:
+		return DeityTunare;
+	case bit_DeityVeeshan:
+		return DeityVeeshan;
+	default:
+		return DeityUnknown;
+	};
+}
+
+const char* EQ::deity::DeityName(DeityType deity_type)
+{
+	switch (deity_type) {
+	case DeityBertoxxulous:
+		return "Bertoxxulous";
+	case DeityBrellSirilis:
+		return "Brell Serilis";
+	case DeityCazicThule:
+		return "Cazic-Thule";
+	case DeityErollisiMarr:
+		return "Erollisi Marr";
+	case DeityBristlebane:
+		return "Bristlebane";
+	case DeityInnoruuk:
+		return "Innoruuk";
+	case DeityKarana:
+		return "Karana";
+	case DeityMithanielMarr:
+		return "Mithaniel Marr";
+	case DeityPrexus:
+		return "Prexus";
+	case DeityQuellious:
+		return "Quellious";
+	case DeityRallosZek:
+		return "Rallos Zek";
+	case DeityRodcetNife:
+		return "Rodcet Nife";
+	case DeitySolusekRo:
+		return "Solusek Ro";
+	case DeityTheTribunal:
+		return "The Tribunal";
+	case DeityTunare:
+		return "Tunare";
+	case DeityVeeshan:
+		return "Veeshan";
+	case DeityAgnostic_LB:
+	case DeityAgnostic:
+		return "Agnostic";
+	default:
+		return "Unknown";
+	};
 }
@@ -21,8 +21,6 @@
 #define COMMON_DEITY_H

 #include "types.h"
-#include <map>
-#include <string>


 namespace EQ
@@ -51,31 +49,30 @@ namespace EQ
 		};

 		enum DeityTypeBit : uint32 {
-			bit_DeityAgnostic      = 0x00000001,
-			bit_DeityBertoxxulous  = 0x00000002,
-			bit_DeityBrellSirilis  = 0x00000004,
-			bit_DeityCazicThule    = 0x00000008,
-			bit_DeityErollisiMarr  = 0x00000010,
-			bit_DeityBristlebane   = 0x00000020,
-			bit_DeityInnoruuk      = 0x00000040,
-			bit_DeityKarana        = 0x00000080,
+			bit_DeityNone = 0x00000000,
+			bit_DeityAgnostic = 0x00000001,
+			bit_DeityBertoxxulous = 0x00000002,
+			bit_DeityBrellSirilis = 0x00000004,
+			bit_DeityCazicThule = 0x00000008,
+			bit_DeityErollisiMarr = 0x00000010,
+			bit_DeityBristlebane = 0x00000020,
+			bit_DeityInnoruuk = 0x00000040,
+			bit_DeityKarana = 0x00000080,
 			bit_DeityMithanielMarr = 0x00000100,
-			bit_DeityPrexus        = 0x00000200,
-			bit_DeityQuellious     = 0x00000400,
-			bit_DeityRallosZek     = 0x00000800,
-			bit_DeityRodcetNife    = 0x00001000,
-			bit_DeitySolusekRo     = 0x00002000,
-			bit_DeityTheTribunal   = 0x00004000,
-			bit_DeityTunare        = 0x00008000,
-			bit_DeityVeeshan       = 0x00010000,
-			bit_DeityAll           = UINT32_MAX
+			bit_DeityPrexus = 0x00000200,
+			bit_DeityQuellious = 0x00000400,
+			bit_DeityRallosZek = 0x00000800,
+			bit_DeityRodcetNife = 0x00001000,
+			bit_DeitySolusekRo = 0x00002000,
+			bit_DeityTheTribunal = 0x00004000,
+			bit_DeityTunare = 0x00008000,
+			bit_DeityVeeshan = 0x00010000,
+			bit_DeityAll = 0xFFFFFFFF
 		};

-		constexpr int format_as(DeityType type) { return static_cast<int>(type); }
-
-		extern DeityTypeBit GetDeityBitmask(DeityType deity_type);
-		extern std::string GetDeityName(DeityType deity_type);
-		extern const std::map<DeityType, std::string>& GetDeityMap();
+		extern DeityTypeBit ConvertDeityTypeToDeityTypeBit(DeityType deity_type);
+		extern DeityType ConvertDeityTypeBitToDeityType(DeityTypeBit deity_type_bit);
+		extern const char* DeityName(DeityType deity_type);

 	} /*deity*/

@@ -1,165 +0,0 @@
-#include <cereal/archives/json.hpp>
-#include <cereal/archives/binary.hpp>
-#include "discord.h"
-#include "../http/httplib.h"
-#include "../json/json.h"
-#include "../strings.h"
-#include "../eqemu_logsys.h"
-#include "../events/player_event_logs.h"
-
-constexpr int MAX_RETRIES = 10;
-
-void Discord::SendWebhookMessage(const std::string &message, const std::string &webhook_url)
-{
-	if (!ValidateWebhookUrl(webhook_url)) {
-		return;
-	}
-
-	// split
-	auto s = Strings::Split(webhook_url, '/');
-
-	// url
-	std::string base_url = fmt::format("{}//{}", s[0], s[2]);
-	std::string endpoint = Strings::Replace(webhook_url, base_url, "");
-
-	// client
-	httplib::Client cli(base_url);
-	cli.set_connection_timeout(0, 15000000); // 15 sec
-	cli.set_read_timeout(15, 0); // 15 seconds
-	cli.set_write_timeout(15, 0); // 15 seconds
-
-	// payload
-	Json::Value p;
-	p["content"] = message;
-	std::stringstream payload;
-	payload << p;
-
-	bool retry       = true;
-	int  retries     = 0;
-	int  retry_timer = 1000;
-	while (retry) {
-		if (auto res = cli.Post(endpoint, payload.str(), "application/json")) {
-			if (res->status != 200 && res->status != 204) {
-				LogError("[Discord Client] Code [{}] Error [{}]", res->status, res->body);
-			}
-			if (res->status == 429) {
-				if (!res->body.empty()) {
-					std::stringstream ss(res->body);
-					Json::Value       response;
-
-					try {
-						ss >> response;
-					}
-					catch (std::exception const &ex) {
-						LogDiscord("JSON serialization failure [{}] via [{}]", ex.what(), res->body);
-					}
-
-					retry_timer = Strings::ToInt(response["retry_after"].asString()) + 500;
-				}
-
-				LogDiscord("Rate limited... retrying message in [{}ms]", retry_timer);
-				std::this_thread::sleep_for(std::chrono::milliseconds(retry_timer + 500));
-			}
-			if (res->status == 204) {
-				retry = false;
-			}
-			if (retries > MAX_RETRIES) {
-				LogDiscord("Retries exceeded for message [{}]", message);
-				retry = false;
-			}
-
-			retries++;
-		}
-	}
-}
-
-void Discord::SendPlayerEventMessage(
-	const PlayerEvent::PlayerEventContainer &e,
-	const std::string &webhook_url
-)
-{
-	if (!ValidateWebhookUrl(webhook_url)) {
-		return;
-	}
-
-	auto s = Strings::Split(webhook_url, '/');
-
-	// url
-	std::string base_url = fmt::format("{}//{}", s[0], s[2]);
-	std::string endpoint = Strings::Replace(webhook_url, base_url, "");
-
-	// client
-	httplib::Client cli(base_url);
-	cli.set_connection_timeout(0, 15000000); // 15 sec
-	cli.set_read_timeout(15, 0); // 15 seconds
-	cli.set_write_timeout(15, 0); // 15 seconds
-
-	std::string payload = PlayerEventLogs::GetDiscordPayloadFromEvent(e);
-	if (payload.empty()) {
-		return;
-	}
-
-	bool retry       = true;
-	int  retries     = 0;
-	int  retry_timer = 1000;
-	while (retry) {
-		if (auto res = cli.Post(endpoint, payload, "application/json")) {
-			if (res->status != 200 && res->status != 204) {
-				LogError("Code [{}] Error [{}]", res->status, res->body);
-			}
-			if (res->status == 429) {
-				if (!res->body.empty()) {
-					std::stringstream ss(res->body);
-					Json::Value       response;
-
-					try {
-						ss >> response;
-					}
-					catch (std::exception const &ex) {
-						LogDiscord("JSON serialization failure [{}] via [{}]", ex.what(), res->body);
-					}
-
-					retry_timer = Strings::ToInt(response["retry_after"].asString()) + 500;
-				}
-
-				LogDiscord("Rate limited... retrying message in [{}ms]", retry_timer);
-				std::this_thread::sleep_for(std::chrono::milliseconds(retry_timer + 500));
-			}
-			if (res->status == 204) {
-				retry = false;
-			}
-			if (retries > MAX_RETRIES) {
-				LogDiscord("Retries exceeded for player event message");
-				retry = false;
-			}
-
-			retries++;
-		}
-	}
-}
-
-std::string Discord::FormatDiscordMessage(uint16 category_id, const std::string &message)
-{
-	if (category_id == Logs::LogCategory::MySQLQuery) {
-		return fmt::format("```sql\n{}\n```", message);
-	}
-
-	return message + "\n";
-}
-
-bool Discord::ValidateWebhookUrl(const std::string &webhook_url)
-{
-	// validate
-	if (webhook_url.empty()) {
-		LogDiscord("[webhook_url] is empty");
-		return false;
-	}
-
-	// validate
-	if (!Strings::Contains(webhook_url, "http://") && !Strings::Contains(webhook_url, "https://")) {
-		LogDiscord("[webhook_url] [{}] does not contain a valid http/s prefix.", webhook_url);
-		return false;
-	}
-
-	return true;
-}
@@ -1,20 +0,0 @@
-#ifndef EQEMU_DISCORD_H
-#define EQEMU_DISCORD_H
-
-
-#include <string>
-#include "../types.h"
-#include "../http/httplib.h"
-#include "../repositories/player_event_logs_repository.h"
-#include "../events/player_events.h"
-
-class Discord {
-public:
-	static void SendWebhookMessage(const std::string& message, const std::string& webhook_url);
-	static std::string FormatDiscordMessage(uint16 category_id, const std::string& message);
-	static void SendPlayerEventMessage(const PlayerEvent::PlayerEventContainer& e, const std::string &webhook_url);
-	static bool ValidateWebhookUrl(const std::string &webhook_url);
-};
-
-
-#endif //EQEMU_DISCORD_H
@@ -1,75 +0,0 @@
-#include "discord_manager.h"
-#include "../../common/discord/discord.h"
-#include "../events/player_event_logs.h"
-
-void DiscordManager::QueueWebhookMessage(uint32 webhook_id, const std::string &message)
-{
-	webhook_queue_lock.lock();
-	webhook_message_queue[webhook_id].emplace_back(message);
-	webhook_queue_lock.unlock();
-}
-
-constexpr int MAX_MESSAGE_LENGTH = 1900;
-
-void DiscordManager::ProcessMessageQueue()
-{
-	if (webhook_message_queue.empty()) {
-		return;
-	}
-
-	webhook_queue_lock.lock();
-	for (auto &q: webhook_message_queue) {
-		LogDiscord("Processing [{}] messages in queue for webhook ID [{}]...", q.second.size(), q.first);
-
-		if (q.first >= MAX_DISCORD_WEBHOOK_ID) {
-			LogDiscord("Out of bounds webhook ID [{}] max [{}]", q.first, MAX_DISCORD_WEBHOOK_ID);
-			continue;
-		}
-
-		auto        webhook  = LogSys.GetDiscordWebhooks()[q.first];
-		std::string message;
-
-		for (auto &m: q.second) {
-			// next message would become too large
-			bool next_message_too_large = ((int) m.length() + (int) message.length()) > MAX_MESSAGE_LENGTH;
-			if (next_message_too_large) {
-				Discord::SendWebhookMessage(
-					message,
-					webhook.webhook_url
-				);
-				message.clear();
-			}
-
-			message += m;
-
-			// one single message was too large
-			// this should rarely happen but the message will need to be split
-			if ((int) message.length() > MAX_MESSAGE_LENGTH) {
-				for (unsigned mi = 0; mi < message.length(); mi += MAX_MESSAGE_LENGTH) {
-					Discord::SendWebhookMessage(
-						message.substr(mi, MAX_MESSAGE_LENGTH),
-						webhook.webhook_url
-					);
-				}
-				message.clear();
-			}
-		}
-		// final flush
-		if (!message.empty()) {
-			Discord::SendWebhookMessage(
-				message,
-				webhook.webhook_url
-			);
-		}
-	}
-	webhook_message_queue.clear();
-	webhook_queue_lock.unlock();
-}
-
-void DiscordManager::QueuePlayerEventMessage(const PlayerEvent::PlayerEventContainer& e)
-{
-	auto w = player_event_logs.GetDiscordWebhookUrlFromEventType(e.player_event_log.event_type_id);
-	if (!w.empty()) {
-		Discord::SendPlayerEventMessage(e, w);
-	}
-}
@@ -1,22 +0,0 @@
-#ifndef EQEMU_DISCORD_MANAGER_H
-#define EQEMU_DISCORD_MANAGER_H
-
-#include <mutex>
-#include <map>
-#include <vector>
-#include "../../common/types.h"
-#include "../repositories/player_event_logs_repository.h"
-#include "../events/player_events.h"
-
-class DiscordManager {
-public:
-	void QueueWebhookMessage(uint32 webhook_id, const std::string& message);
-	void ProcessMessageQueue();
-	void QueuePlayerEventMessage(const PlayerEvent::PlayerEventContainer& e);
-private:
-	std::mutex webhook_queue_lock{};
-	std::map<uint32, std::vector<std::string>> webhook_message_queue{};
-};
-
-
-#endif
@@ -5,7 +5,6 @@
 #include "repositories/instance_list_player_repository.h"
 #include "rulesys.h"
 #include "servertalk.h"
-#include "util/uuid.h"

 DynamicZoneBase::DynamicZoneBase(DynamicZonesRepository::DynamicZoneInstance&& entry)
 {
@@ -14,12 +13,16 @@ DynamicZoneBase::DynamicZoneBase(DynamicZonesRepository::DynamicZoneInstance&& e

 uint32_t DynamicZoneBase::Create()
 {
+	if (m_id != 0)
+	{
+		return m_id;
+	}
+
 	if (GetInstanceID() == 0)
 	{
 		CreateInstance();
 	}

-	m_uuid = EQ::Util::UUID::Generate().ToString();
 	m_id = SaveToDatabase();

 	return m_id;
@@ -72,14 +75,8 @@ uint32_t DynamicZoneBase::CreateInstance()
 void DynamicZoneBase::LoadRepositoryResult(DynamicZonesRepository::DynamicZoneInstance&& dz_entry)
 {
 	m_id                 = dz_entry.id;
-	m_uuid               = std::move(dz_entry.uuid);
-	m_name               = std::move(dz_entry.name);
-	m_leader.id          = dz_entry.leader_id;
-	m_min_players        = dz_entry.min_players;
-	m_max_players        = dz_entry.max_players;
 	m_instance_id        = dz_entry.instance_id;
 	m_type               = static_cast<DynamicZoneType>(dz_entry.type);
-	m_dz_switch_id       = dz_entry.dz_switch_id;
 	m_compass.zone_id    = dz_entry.compass_zone_id;
 	m_compass.x          = dz_entry.compass_x;
 	m_compass.y          = dz_entry.compass_y;
@@ -107,12 +104,6 @@ void DynamicZoneBase::AddMemberFromRepositoryResult(
 	DynamicZoneMembersRepository::MemberWithName&& entry)
 {
 	auto status = DynamicZoneMemberStatus::Unknown;
-
-	if (m_leader.id == entry.character_id)
-	{
-		m_leader.name = entry.character_name;
-	}
-
 	AddInternalMember({ entry.character_id, std::move(entry.character_name), status });
 }

@@ -123,14 +114,8 @@ uint32_t DynamicZoneBase::SaveToDatabase()
 	if (m_instance_id != 0)
 	{
 		auto insert_dz = DynamicZonesRepository::NewEntity();
-		insert_dz.uuid                = m_uuid;
-		insert_dz.name                = m_name;
-		insert_dz.leader_id           = m_leader.id;
-		insert_dz.min_players         = m_min_players;
-		insert_dz.max_players         = m_max_players;
 		insert_dz.instance_id         = m_instance_id,
 		insert_dz.type                = static_cast<int>(m_type);
-		insert_dz.dz_switch_id        = m_dz_switch_id;
 		insert_dz.compass_zone_id     = m_compass.zone_id;
 		insert_dz.compass_x           = m_compass.x;
 		insert_dz.compass_y           = m_compass.y;
@@ -152,80 +137,34 @@ uint32_t DynamicZoneBase::SaveToDatabase()
 	return 0;
 }

-bool DynamicZoneBase::AddMember(const DynamicZoneMember& add_member)
+void DynamicZoneBase::AddCharacter(uint32_t character_id)
 {
-	if (HasMember(add_member.id))
+	DynamicZoneMembersRepository::AddMember(GetDatabase(), m_id, character_id);
+	GetDatabase().AddClientToInstance(m_instance_id, character_id);
+	SendInstanceAddRemoveCharacter(character_id, false); // stops client kick timer
+}
+
+void DynamicZoneBase::RemoveCharacter(uint32_t character_id)
+{
+	DynamicZoneMembersRepository::RemoveMember(GetDatabase(), m_id, character_id);
+	GetDatabase().RemoveClientFromInstance(m_instance_id, character_id);
+	SendInstanceAddRemoveCharacter(character_id, true); // start client kick timer
+}
+
+void DynamicZoneBase::RemoveAllCharacters(bool enable_removal_timers)
+{
+	if (GetInstanceID() == 0)
 	{
-		return false;
+		return;
 	}

-	DynamicZoneMembersRepository::AddMember(GetDatabase(), m_id, add_member.id);
-	GetDatabase().AddClientToInstance(m_instance_id, add_member.id);
-
-	ProcessMemberAddRemove(add_member, false);
-	SendServerPacket(CreateServerMemberAddRemovePacket(add_member, false).get());
-
-	return true;
-}
-
-bool DynamicZoneBase::RemoveMember(uint32_t character_id)
-{
-	auto remove_member = GetMemberData(character_id);
-	return RemoveMember(remove_member);
-}
-
-bool DynamicZoneBase::RemoveMember(const std::string& character_name)
-{
-	auto remove_member = GetMemberData(character_name);
-	return RemoveMember(remove_member);
-}
-
-bool DynamicZoneBase::RemoveMember(const DynamicZoneMember& remove_member)
-{
-	if (remove_member.id == 0)
+	if (enable_removal_timers)
 	{
-		return false;
+		SendInstanceRemoveAllCharacters();
 	}

-	DynamicZoneMembersRepository::RemoveMember(GetDatabase(), m_id, remove_member.id);
-	GetDatabase().RemoveClientFromInstance(m_instance_id, remove_member.id);
-
-	ProcessMemberAddRemove(remove_member, true);
-	SendServerPacket(CreateServerMemberAddRemovePacket(remove_member, true).get());
-
-	return true;
-}
-
-bool DynamicZoneBase::SwapMember(
-	const DynamicZoneMember& add_member, const std::string& remove_char_name)
-{
-	auto remove_member = GetMemberData(remove_char_name);
-	if (!add_member.IsValid() || !remove_member.IsValid())
-	{
-		return false;
-	}
-
-	// make remove and add atomic to avoid racing with separate world messages
-	DynamicZoneMembersRepository::RemoveMember(GetDatabase(), m_id, remove_member.id);
-	GetDatabase().RemoveClientFromInstance(m_instance_id, remove_member.id);
-
-	DynamicZoneMembersRepository::AddMember(GetDatabase(), m_id, add_member.id);
-	GetDatabase().AddClientToInstance(m_instance_id, add_member.id);
-
-	ProcessMemberAddRemove(remove_member, true);
-	ProcessMemberAddRemove(add_member, false);
-	SendServerPacket(CreateServerMemberSwapPacket(remove_member, add_member).get());
-
-	return true;
-}
-
-void DynamicZoneBase::RemoveAllMembers()
-{
 	DynamicZoneMembersRepository::RemoveAllMembers(GetDatabase(), m_id);
 	GetDatabase().RemoveClientsFromInstance(GetInstanceID());
-
-	ProcessRemoveAllMembers();
-	SendServerPacket(CreateServerRemoveAllMembersPacket().get());
 }

 void DynamicZoneBase::SaveMembers(const std::vector<DynamicZoneMember>& members)
@@ -242,6 +181,7 @@ void DynamicZoneBase::SaveMembers(const std::vector<DynamicZoneMember>& members)
 		DynamicZoneMembersRepository::DynamicZoneMembers member_entry{};
 		member_entry.dynamic_zone_id = m_id;
 		member_entry.character_id = member.id;
+		member_entry.is_current_member = true;
 		insert_members.emplace_back(member_entry);

 		InstanceListPlayerRepository::InstanceListPlayer player_entry;
@@ -266,7 +206,7 @@ void DynamicZoneBase::SetCompass(const DynamicZoneLocation& location, bool updat
 		DynamicZonesRepository::UpdateCompass(GetDatabase(),
 			m_id, m_compass.zone_id, m_compass.x, m_compass.y, m_compass.z);

-		SendServerPacket(CreateServerDzLocationPacket(ServerOP_DzSetCompass, location).get());
+		SendGlobalLocationChange(ServerOP_DzSetCompass, location);
 	}
 }

@@ -287,7 +227,7 @@ void DynamicZoneBase::SetSafeReturn(const DynamicZoneLocation& location, bool up
 		DynamicZonesRepository::UpdateSafeReturn(GetDatabase(), m_id, m_safereturn.zone_id,
 			m_safereturn.x, m_safereturn.y, m_safereturn.z, m_safereturn.heading);

-		SendServerPacket(CreateServerDzLocationPacket(ServerOP_DzSetSafeReturn, location).get());
+		SendGlobalLocationChange(ServerOP_DzSetSafeReturn, location);
 	}
 }

@@ -309,7 +249,7 @@ void DynamicZoneBase::SetZoneInLocation(const DynamicZoneLocation& location, boo
 		DynamicZonesRepository::UpdateZoneIn(GetDatabase(), m_id, m_zone_id,
 			m_zonein.x, m_zonein.y, m_zonein.z, m_zonein.heading, m_has_zonein);

-		SendServerPacket(CreateServerDzLocationPacket(ServerOP_DzSetZoneIn, location).get());
+		SendGlobalLocationChange(ServerOP_DzSetZoneIn, location);
 	}
 }

@@ -318,82 +258,35 @@ void DynamicZoneBase::SetZoneInLocation(float x, float y, float z, float heading
 	SetZoneInLocation({ 0, x, y, z, heading }, update_db);
 }

-void DynamicZoneBase::SetSwitchID(int dz_switch_id, bool update_db)
-{
-	m_dz_switch_id = dz_switch_id;
-
-	if (update_db)
-	{
-		DynamicZonesRepository::UpdateSwitchID(GetDatabase(), m_id, dz_switch_id);
-		SendServerPacket(CreateServerDzSwitchIDPacket().get());
-	}
-}
-
-void DynamicZoneBase::SetLeader(const DynamicZoneMember& new_leader, bool update_db)
-{
-	m_leader = new_leader;
-
-	if (update_db)
-	{
-		DynamicZonesRepository::UpdateLeaderID(GetDatabase(), m_id, new_leader.id);
-	}
-}
-
 uint32_t DynamicZoneBase::GetSecondsRemaining() const
 {
 	auto remaining = std::chrono::duration_cast<std::chrono::seconds>(GetDurationRemaining()).count();
 	return std::max(0, static_cast<int>(remaining));
 }

-std::unique_ptr<ServerPacket> DynamicZoneBase::CreateServerMemberAddRemovePacket(
-	const DynamicZoneMember& member, bool removed)
+std::unique_ptr<ServerPacket> DynamicZoneBase::CreateServerAddRemoveCharacterPacket(
+	uint32_t character_id, bool removed)
 {
-	constexpr uint32_t pack_size = sizeof(ServerDzMember_Struct);
-	auto pack = std::make_unique<ServerPacket>(ServerOP_DzAddRemoveMember, pack_size);
-	auto buf = reinterpret_cast<ServerDzMember_Struct*>(pack->pBuffer);
-	buf->dz_id = GetID();
-	buf->dz_zone_id = GetZoneID();
-	buf->dz_instance_id = GetInstanceID();
-	buf->sender_zone_id = GetCurrentZoneID();
-	buf->sender_instance_id = GetCurrentInstanceID();
-	buf->removed = removed;
-	buf->character_id = member.id;
-	buf->character_status = static_cast<uint8_t>(member.status);
-	strn0cpy(buf->character_name, member.name.c_str(), sizeof(buf->character_name));
+	constexpr uint32_t pack_size = sizeof(ServerDzCharacter_Struct);
+	auto pack = std::make_unique<ServerPacket>(ServerOP_DzAddRemoveCharacter, pack_size);
+	auto buf = reinterpret_cast<ServerDzCharacter_Struct*>(pack->pBuffer);
+	buf->zone_id = GetZoneID();
+	buf->instance_id = GetInstanceID();
+	buf->remove = removed;
+	buf->character_id = character_id;

 	return pack;
 }

-std::unique_ptr<ServerPacket> DynamicZoneBase::CreateServerMemberSwapPacket(
-	const DynamicZoneMember& remove_member, const DynamicZoneMember& add_member)
+std::unique_ptr<ServerPacket> DynamicZoneBase::CreateServerRemoveAllCharactersPacket()
 {
-	constexpr uint32_t pack_size = sizeof(ServerDzMemberSwap_Struct);
-	auto pack = std::make_unique<ServerPacket>(ServerOP_DzSwapMembers, pack_size);
-	auto buf = reinterpret_cast<ServerDzMemberSwap_Struct*>(pack->pBuffer);
-	buf->dz_id = GetID();
-	buf->dz_zone_id = GetZoneID();
-	buf->dz_instance_id = GetInstanceID();
-	buf->sender_zone_id = GetCurrentZoneID();
-	buf->sender_instance_id = GetCurrentInstanceID();
-	buf->add_character_status = static_cast<uint8_t>(add_member.status);
-	buf->add_character_id = add_member.id;
-	buf->remove_character_id = remove_member.id;
-	strn0cpy(buf->add_character_name, add_member.name.c_str(), sizeof(buf->add_character_name));
-	strn0cpy(buf->remove_character_name, remove_member.name.c_str(), sizeof(buf->remove_character_name));
-
-	return pack;
-}
-
-std::unique_ptr<ServerPacket> DynamicZoneBase::CreateServerRemoveAllMembersPacket()
-{
-	constexpr uint32_t pack_size = sizeof(ServerDzID_Struct);
-	auto pack = std::make_unique<ServerPacket>(ServerOP_DzRemoveAllMembers, pack_size);
-	auto buf = reinterpret_cast<ServerDzID_Struct*>(pack->pBuffer);
-	buf->dz_id = GetID();
-	buf->dz_zone_id = GetZoneID();
-	buf->dz_instance_id = GetInstanceID();
-	buf->sender_zone_id = GetCurrentZoneID();
-	buf->sender_instance_id = GetCurrentInstanceID();
+	constexpr uint32_t pack_size = sizeof(ServerDzCharacter_Struct);
+	auto pack = std::make_unique<ServerPacket>(ServerOP_DzRemoveAllCharacters, pack_size);
+	auto buf = reinterpret_cast<ServerDzCharacter_Struct*>(pack->pBuffer);
+	buf->zone_id = GetZoneID();
+	buf->instance_id = GetInstanceID();
+	buf->remove = true;
+	buf->character_id = 0;

 	return pack;
 }
@@ -416,36 +309,10 @@ std::unique_ptr<ServerPacket> DynamicZoneBase::CreateServerDzLocationPacket(
 	return pack;
 }

-std::unique_ptr<ServerPacket> DynamicZoneBase::CreateServerDzSwitchIDPacket()
-{
-	constexpr uint32_t pack_size = sizeof(ServerDzSwitchID_Struct);
-	auto pack = std::make_unique<ServerPacket>(ServerOP_DzSetSwitchID, pack_size);
-	auto buf = reinterpret_cast<ServerDzSwitchID_Struct*>(pack->pBuffer);
-	buf->dz_id = GetID();
-	buf->dz_switch_id = GetSwitchID();
-
-	return pack;
-}
-
-std::unique_ptr<ServerPacket> DynamicZoneBase::CreateServerMemberStatusPacket(
-	uint32_t character_id, DynamicZoneMemberStatus status)
-{
-	constexpr uint32_t pack_size = sizeof(ServerDzMemberStatus_Struct);
-	auto pack = std::make_unique<ServerPacket>(ServerOP_DzUpdateMemberStatus, pack_size);
-	auto buf = reinterpret_cast<ServerDzMemberStatus_Struct*>(pack->pBuffer);
-	buf->dz_id = GetID();
-	buf->sender_zone_id = GetCurrentZoneID();
-	buf->sender_instance_id = GetCurrentInstanceID();
-	buf->status = static_cast<uint8_t>(status);
-	buf->character_id = character_id;
-
-	return pack;
-}
-
 uint32_t DynamicZoneBase::GetDatabaseMemberCount()
 {
 	return DynamicZoneMembersRepository::GetCountWhere(GetDatabase(),
-		fmt::format("dynamic_zone_id = {}", m_id));
+		fmt::format("dynamic_zone_id = {} AND is_current_member = TRUE", m_id));
 }

 bool DynamicZoneBase::HasDatabaseMember(uint32_t character_id)
@@ -456,7 +323,7 @@ bool DynamicZoneBase::HasDatabaseMember(uint32_t character_id)
 	}

 	auto entries = DynamicZoneMembersRepository::GetWhere(GetDatabase(), fmt::format(
-		"dynamic_zone_id = {} AND character_id = {}",
+		"dynamic_zone_id = {} AND character_id = {} AND is_current_member = TRUE",
 		m_id, character_id
 	));

@@ -544,33 +411,6 @@ bool DynamicZoneBase::SetInternalMemberStatus(uint32_t character_id, DynamicZone
 	return false;
 }

-void DynamicZoneBase::SetMemberStatus(uint32_t character_id, DynamicZoneMemberStatus status)
-{
-	auto update_member = GetMemberData(character_id);
-	if (update_member.IsValid())
-	{
-		ProcessMemberStatusChange(character_id, status);
-		SendServerPacket(CreateServerMemberStatusPacket(character_id, status).get());
-	}
-}
-
-void DynamicZoneBase::ProcessMemberAddRemove(const DynamicZoneMember& member, bool removed)
-{
-	if (!removed)
-	{
-		AddInternalMember(member);
-	}
-	else
-	{
-		RemoveInternalMember(member.id);
-	}
-}
-
-bool DynamicZoneBase::ProcessMemberStatusChange(uint32_t character_id, DynamicZoneMemberStatus status)
-{
-	return SetInternalMemberStatus(character_id, status);
-}
-
 std::string DynamicZoneBase::GetDynamicZoneTypeName(DynamicZoneType dz_type)
 {
 	switch (dz_type)
@@ -585,65 +425,6 @@ std::string DynamicZoneBase::GetDynamicZoneTypeName(DynamicZoneType dz_type)
 			return "Mission";
 		case DynamicZoneType::Quest:
 			return "Quest";
-		default:
-			return "Unknown";
 	}
-}
-
-EQ::Net::DynamicPacket DynamicZoneBase::GetSerializedDzPacket()
-{
-	EQ::Net::DynamicPacket dyn_pack;
-	dyn_pack.PutSerialize(0, *this);
-
-	LogDynamicZonesDetail("Serialized server dz size [{}]", dyn_pack.Length());
-	return dyn_pack;
-}
-
-std::unique_ptr<ServerPacket> DynamicZoneBase::CreateServerDzCreatePacket(
-	uint16_t origin_zone_id, uint16_t origin_instance_id)
-{
-	EQ::Net::DynamicPacket dyn_pack = GetSerializedDzPacket();
-
-	auto pack_size = sizeof(ServerDzCreateSerialized_Struct) + dyn_pack.Length();
-	auto pack = std::make_unique<ServerPacket>(ServerOP_DzCreated, static_cast<uint32_t>(pack_size));
-	auto buf = reinterpret_cast<ServerDzCreateSerialized_Struct*>(pack->pBuffer);
-	buf->origin_zone_id = origin_zone_id;
-	buf->origin_instance_id = origin_instance_id;
-	buf->cereal_size = static_cast<uint32_t>(dyn_pack.Length());
-	memcpy(buf->cereal_data, dyn_pack.Data(), dyn_pack.Length());
-
-	return pack;
-}
-
-void DynamicZoneBase::LoadSerializedDzPacket(char* cereal_data, uint32_t cereal_size)
-{
-	LogDynamicZonesDetail("Deserializing server dz size [{}]", cereal_size);
-	EQ::Util::MemoryStreamReader ss(cereal_data, cereal_size);
-	cereal::BinaryInputArchive archive(ss);
-	archive(*this);
-}
-
-void DynamicZoneBase::LoadTemplate(const DynamicZoneTemplatesRepository::DynamicZoneTemplates& dz_template)
-{
-	m_zone_id            = dz_template.zone_id;
-	m_zone_version       = dz_template.zone_version;
-	m_name               = dz_template.name;
-	m_min_players        = dz_template.min_players;
-	m_max_players        = dz_template.max_players;
-	m_duration           = std::chrono::seconds(dz_template.duration_seconds);
-	m_dz_switch_id       = dz_template.dz_switch_id;
-	m_compass.zone_id    = dz_template.compass_zone_id;
-	m_compass.x          = dz_template.compass_x;
-	m_compass.y          = dz_template.compass_y;
-	m_compass.z          = dz_template.compass_z;
-	m_safereturn.zone_id = dz_template.return_zone_id;
-	m_safereturn.x       = dz_template.return_x;
-	m_safereturn.y       = dz_template.return_y;
-	m_safereturn.z       = dz_template.return_z;
-	m_safereturn.heading = dz_template.return_h;
-	m_has_zonein         = dz_template.override_zone_in;
-	m_zonein.x           = dz_template.zone_in_x;
-	m_zonein.y           = dz_template.zone_in_y;
-	m_zonein.z           = dz_template.zone_in_z;
-	m_zonein.heading     = dz_template.zone_in_h;
+	return "Unknown";
 }
@@ -2,10 +2,8 @@
 #define COMMON_DYNAMIC_ZONE_BASE_H

 #include "eq_constants.h"
-#include "net/packet.h"
 #include "repositories/dynamic_zones_repository.h"
 #include "repositories/dynamic_zone_members_repository.h"
-#include "repositories/dynamic_zone_templates_repository.h"
 #include <algorithm>
 #include <chrono>
 #include <cstdint>
@@ -20,7 +18,7 @@ struct DynamicZoneMember
 {
 	uint32_t id = 0;
 	std::string name;
-	DynamicZoneMemberStatus status = DynamicZoneMemberStatus::Unknown;
+	DynamicZoneMemberStatus status = DynamicZoneMemberStatus::Online;

 	DynamicZoneMember() = default;
 	DynamicZoneMember(uint32_t id, std::string name_)
@@ -31,12 +29,6 @@ struct DynamicZoneMember
 	bool IsOnline() const { return status == DynamicZoneMemberStatus::Online ||
 	                               status == DynamicZoneMemberStatus::InDynamicZone; }
 	bool IsValid() const { return id != 0 && !name.empty(); }
-
-	template<class Archive>
-	void serialize(Archive& archive)
-	{
-		archive(id, name, status);
-	}
 };

 struct DynamicZoneLocation
@@ -50,12 +42,6 @@ struct DynamicZoneLocation
 	DynamicZoneLocation() = default;
 	DynamicZoneLocation(uint32_t zone_id_, float x_, float y_, float z_, float heading_)
 		: zone_id(zone_id_), x(x_), y(y_), z(z_), heading(heading_) {}
-
-	template<class Archive>
-	void serialize(Archive& archive)
-	{
-		archive(zone_id, x, y, z, heading);
-	}
 };

 class DynamicZoneBase
@@ -75,11 +61,9 @@ public:

 	virtual void SetSecondsRemaining(uint32_t seconds_remaining) = 0;

-	int GetDuration() const { return static_cast<int>(m_duration.count()); }
 	uint64_t GetExpireTime() const { return std::chrono::system_clock::to_time_t(m_expire_time); }
 	uint32_t GetID() const { return m_id; }
 	uint16_t GetInstanceID() const { return static_cast<uint16_t>(m_instance_id); }
-	uint32_t GetLeaderID() const { return m_leader.id; }
 	uint32_t GetMaxPlayers() const { return m_max_players; }
 	uint32_t GetMemberCount() const { return static_cast<uint32_t>(m_members.size()); }
 	uint32_t GetMinPlayers() const { return m_min_players; }
@@ -87,11 +71,9 @@ public:
 	uint16_t GetZoneID() const { return static_cast<uint16_t>(m_zone_id); }
 	uint32_t GetZoneIndex() const { return (m_instance_id << 16) | (m_zone_id & 0xffff); }
 	uint32_t GetZoneVersion() const { return m_zone_version; }
-	int GetSwitchID() const { return m_dz_switch_id; }
 	DynamicZoneType GetType() const { return m_type; }
 	const std::string& GetLeaderName() const { return m_leader.name; }
 	const std::string& GetName() const { return m_name; }
-	const std::string& GetUUID() const { return m_uuid; }
 	const DynamicZoneMember& GetLeader() const { return m_leader; }
 	const std::vector<DynamicZoneMember>& GetMembers() const { return m_members; }
 	const DynamicZoneLocation& GetCompassLocation() const { return m_compass; }
@@ -99,12 +81,14 @@ public:
 	const DynamicZoneLocation& GetZoneInLocation() const { return m_zonein; }
 	std::chrono::system_clock::duration GetDurationRemaining() const { return m_expire_time - std::chrono::system_clock::now(); }

-	bool AddMember(const DynamicZoneMember& add_member);
+	void AddCharacter(uint32_t character_id);
+	void AddInternalMember(const DynamicZoneMember& member);
 	void AddMemberFromRepositoryResult(DynamicZoneMembersRepository::MemberWithName&& entry);
+	void ClearInternalMembers() { m_members.clear(); }
+	uint32_t Create();
 	uint32_t GetDatabaseMemberCount();
 	DynamicZoneMember GetMemberData(uint32_t character_id);
 	DynamicZoneMember GetMemberData(const std::string& character_name);
-	EQ::Net::DynamicPacket GetSerializedDzPacket();
 	bool HasDatabaseMember(uint32_t character_id);
 	bool HasMember(uint32_t character_id);
 	bool HasMember(const std::string& character_name);
@@ -114,56 +98,38 @@ public:
 	bool IsInstanceID(uint32_t instance_id) const { return (m_instance_id != 0 && m_instance_id == instance_id); }
 	bool IsValid() const { return m_instance_id != 0; }
 	bool IsSameDz(uint32_t zone_id, uint32_t instance_id) const { return zone_id == m_zone_id && instance_id == m_instance_id; }
-	void LoadSerializedDzPacket(char* cereal_data, uint32_t cereal_size);
-	void LoadTemplate(const DynamicZoneTemplatesRepository::DynamicZoneTemplates& dz_template);
-	void RemoveAllMembers();
-	bool RemoveMember(uint32_t character_id);
-	bool RemoveMember(const std::string& character_name);
-	bool RemoveMember(const DynamicZoneMember& remove_member);
+	void RemoveAllCharacters(bool enable_removal_timers = true);
+	void RemoveCharacter(uint32_t character_id);
+	void RemoveInternalMember(uint32_t character_id);
 	void SaveMembers(const std::vector<DynamicZoneMember>& members);
 	void SetCompass(const DynamicZoneLocation& location, bool update_db = false);
 	void SetCompass(uint32_t zone_id, float x, float y, float z, bool update_db = false);
-	void SetDuration(uint32_t seconds) { m_duration = std::chrono::seconds(seconds); }
-	void SetLeader(const DynamicZoneMember& leader, bool update_db = false);
+	bool SetInternalMemberStatus(uint32_t character_id, DynamicZoneMemberStatus status);
+	void SetLeader(const DynamicZoneMember& leader) { m_leader = leader; }
 	void SetMaxPlayers(uint32_t max_players) { m_max_players = max_players; }
-	void SetMemberStatus(uint32_t character_id, DynamicZoneMemberStatus status);
 	void SetMinPlayers(uint32_t min_players) { m_min_players = min_players; }
 	void SetName(const std::string& name) { m_name = name; }
 	void SetSafeReturn(const DynamicZoneLocation& location, bool update_db = false);
 	void SetSafeReturn(uint32_t zone_id, float x, float y, float z, float heading, bool update_db = false);
-	void SetSwitchID(int dz_switch_id, bool update_db = false);
-	void SetType(DynamicZoneType type) { m_type = type; }
-	void SetUUID(std::string uuid) { m_uuid = std::move(uuid); }
 	void SetZoneInLocation(const DynamicZoneLocation& location, bool update_db = false);
 	void SetZoneInLocation(float x, float y, float z, float heading, bool update_db = false);
-	bool SwapMember(const DynamicZoneMember& add_member, const std::string& remove_char_name);

 protected:
 	virtual uint16_t GetCurrentInstanceID() { return 0; }
 	virtual uint16_t GetCurrentZoneID() { return 0; }
 	virtual Database& GetDatabase() = 0;
 	virtual void ProcessCompassChange(const DynamicZoneLocation& location) { m_compass = location; }
-	virtual void ProcessMemberAddRemove(const DynamicZoneMember& member, bool removed);
-	virtual bool ProcessMemberStatusChange(uint32_t member_id, DynamicZoneMemberStatus status);
-	virtual void ProcessRemoveAllMembers(bool silent = false) { m_members.clear(); }
-	virtual void ProcessSetSwitchID(int dz_switch_id) { m_dz_switch_id = dz_switch_id; }
-	virtual bool SendServerPacket(ServerPacket* packet) = 0;
+	virtual void SendInstanceAddRemoveCharacter(uint32_t character_id, bool remove) = 0;
+	virtual void SendInstanceRemoveAllCharacters() = 0;
+	virtual void SendGlobalLocationChange(uint16_t server_opcode, const DynamicZoneLocation& location) = 0;

-	void AddInternalMember(const DynamicZoneMember& member);
-	uint32_t Create();
 	uint32_t CreateInstance();
 	void LoadRepositoryResult(DynamicZonesRepository::DynamicZoneInstance&& dz_entry);
-	void RemoveInternalMember(uint32_t character_id);
 	uint32_t SaveToDatabase();
-	bool SetInternalMemberStatus(uint32_t character_id, DynamicZoneMemberStatus status);

-	std::unique_ptr<ServerPacket> CreateServerDzCreatePacket(uint16_t origin_zone_id, uint16_t origin_instance_id);
+	std::unique_ptr<ServerPacket> CreateServerAddRemoveCharacterPacket(uint32_t character_id, bool removed);
+	std::unique_ptr<ServerPacket> CreateServerRemoveAllCharactersPacket();
 	std::unique_ptr<ServerPacket> CreateServerDzLocationPacket(uint16_t server_opcode, const DynamicZoneLocation& location);
-	std::unique_ptr<ServerPacket> CreateServerDzSwitchIDPacket();
-	std::unique_ptr<ServerPacket> CreateServerMemberAddRemovePacket(const DynamicZoneMember& member, bool removed);
-	std::unique_ptr<ServerPacket> CreateServerMemberStatusPacket(uint32_t character_id, DynamicZoneMemberStatus status);
-	std::unique_ptr<ServerPacket> CreateServerMemberSwapPacket(const DynamicZoneMember& remove_member, const DynamicZoneMember& add_member);
-	std::unique_ptr<ServerPacket> CreateServerRemoveAllMembersPacket();

 	uint32_t m_id = 0;
 	uint32_t m_zone_id = 0;
@@ -171,12 +137,9 @@ protected:
 	uint32_t m_zone_version = 0;
 	uint32_t m_min_players = 0;
 	uint32_t m_max_players = 0;
-	int m_dz_switch_id = 0;
 	bool m_never_expires = false;
 	bool m_has_zonein = false;
-	bool m_has_member_statuses = false;
 	std::string m_name;
-	std::string m_uuid;
 	DynamicZoneMember m_leader;
 	DynamicZoneType m_type{ DynamicZoneType::None };
 	DynamicZoneLocation m_compass;
@@ -186,35 +149,6 @@ protected:
 	std::chrono::time_point<std::chrono::system_clock> m_start_time;
 	std::chrono::time_point<std::chrono::system_clock> m_expire_time;
 	std::vector<DynamicZoneMember> m_members;
-
-public:
-	template<class Archive>
-	void serialize(Archive& archive)
-	{
-		archive(
-			m_id,
-			m_zone_id,
-			m_instance_id,
-			m_zone_version,
-			m_min_players,
-			m_max_players,
-			m_dz_switch_id,
-			m_never_expires,
-			m_has_zonein,
-			m_has_member_statuses,
-			m_name,
-			m_uuid,
-			m_leader,
-			m_type,
-			m_compass,
-			m_safereturn,
-			m_zonein,
-			m_duration,
-			m_start_time,
-			m_expire_time,
-			m_members
-		);
-	}
 };

 #endif
@@ -1,5 +1,5 @@
 /*	EQEMu:  Everquest Server Emulator
-
+	
 	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)

 	This program is free software; you can redistribute it and/or modify
@@ -18,11 +18,7 @@
 */

 #include "emu_constants.h"
-#include "bodytypes.h"
-#include "data_verification.h"
-#include "eqemu_logsys.h"
-#include "eqemu_logsys_log_aliases.h"
-#include "rulesys.h"
+

 int16 EQ::invtype::GetInvTypeSize(int16 inv_type) {
 	static const int16 local_array[] = {
@@ -119,7 +115,7 @@ EQ::bug::CategoryID EQ::bug::CategoryNameToCategoryID(const char* category_name)
 		return catLoNTCG;
 	if (!strcmp(category_name, "Mercenaries"))
 		return catMercenaries;
-
+	
 	return catOther;
 }

@@ -151,566 +147,8 @@ const char *EQ::constants::GetStanceName(StanceType stance_type) {
 }

 int EQ::constants::ConvertStanceTypeToIndex(StanceType stance_type) {
-	if (EQ::ValueWithin(stance_type, EQ::constants::stancePassive, EQ::constants::stanceBurnAE)) {
+	if (stance_type >= EQ::constants::stancePassive && stance_type <= EQ::constants::stanceBurnAE)
 		return (stance_type - EQ::constants::stancePassive);
-	}

 	return 0;
 }
-
-const std::map<uint8, std::string>& EQ::constants::GetLanguageMap()
-{
-	static const std::map<uint8, std::string> language_map = {
-		{ Language::CommonTongue,  "Common Tongue" },
-		{ Language::Barbarian,     "Barbarian" },
-		{ Language::Erudian,       "Erudian" },
-		{ Language::Elvish,        "Elvish" },
-		{ Language::DarkElvish,    "Dark Elvish" },
-		{ Language::Dwarvish,      "Dwarvish" },
-		{ Language::Troll,         "Troll" },
-		{ Language::Ogre,          "Ogre" },
-		{ Language::Gnomish,       "Gnomish" },
-		{ Language::Halfling,      "Halfling" },
-		{ Language::ThievesCant,   "Thieves Cant" },
-		{ Language::OldErudian,    "Old Erudian" },
-		{ Language::ElderElvish,   "Elder Elvish" },
-		{ Language::Froglok,       "Froglok" },
-		{ Language::Goblin,        "Goblin" },
-		{ Language::Gnoll,         "Gnoll" },
-		{ Language::CombineTongue, "Combine Tongue" },
-		{ Language::ElderTeirDal,  "Elder Teir'Dal" },
-		{ Language::Lizardman,     "Lizardman" },
-		{ Language::Orcish,        "Orcish" },
-		{ Language::Faerie,        "Faerie" },
-		{ Language::Dragon,        "Dragon" },
-		{ Language::ElderDragon,   "Elder Dragon" },
-		{ Language::DarkSpeech,    "Dark Speech" },
-		{ Language::VahShir,       "Vah Shir" },
-		{ Language::Alaran,        "Alaran" },
-		{ Language::Hadal,         "Hadal" },
-		{ Language::Unknown27,     "Unknown" }
-	};
-
-	return language_map;
-}
-
-std::string EQ::constants::GetLanguageName(uint8 language_id)
-{
-	if (!EQ::ValueWithin(language_id, Language::CommonTongue, Language::Unknown27)) {
-		return std::string();
-	}
-
-	return EQ::constants::GetLanguageMap().find(language_id)->second;
-}
-
-const std::map<uint32, std::string>& EQ::constants::GetLDoNThemeMap()
-{
-	static const std::map<uint32, std::string> ldon_theme_map = {
-		{ LDoNThemes::Unused, "Unused" },
-		{ LDoNThemes::GUK, "Deepest Guk" },
-		{ LDoNThemes::MIR, "Miragul's Menagerie" },
-		{ LDoNThemes::MMC, "Mistmoore Catacombs" },
-		{ LDoNThemes::RUJ, "Rujarkian Hills" },
-		{ LDoNThemes::TAK, "Takish-Hiz" },
-	};
-
-	return ldon_theme_map;
-}
-
-std::string EQ::constants::GetLDoNThemeName(uint32 theme_id)
-{
-	if (!EQ::ValueWithin(theme_id, LDoNThemes::Unused, LDoNThemes::TAK)) {
-		return std::string();
-	}
-
-	return EQ::constants::GetLDoNThemeMap().find(theme_id)->second;
-}
-
-const std::map<int8, std::string>& EQ::constants::GetFlyModeMap()
-{
-	static const std::map<int8, std::string> flymode_map = {
-		{ GravityBehavior::Ground, "Ground" },
-		{ GravityBehavior::Flying, "Flying" },
-		{ GravityBehavior::Levitating, "Levitating" },
-		{ GravityBehavior::Water, "Water" },
-		{ GravityBehavior::Floating, "Floating" },
-		{ GravityBehavior::LevitateWhileRunning, "Levitating While Running" },
-	};
-
-	return flymode_map;
-}
-
-std::string EQ::constants::GetFlyModeName(int8 flymode_id)
-{
-	if (!EQ::ValueWithin(flymode_id, GravityBehavior::Ground, GravityBehavior::LevitateWhileRunning)) {
-		return std::string();
-	}
-
-	return EQ::constants::GetFlyModeMap().find(flymode_id)->second;
-}
-
-const std::map<bodyType, std::string>& EQ::constants::GetBodyTypeMap()
-{
-	static const std::map<bodyType, std::string> bodytype_map = {
-		{ BT_Humanoid, "Humanoid" },
-		{ BT_Lycanthrope, "Lycanthrope" },
-		{ BT_Undead, "Undead" },
-		{ BT_Giant, "Giant" },
-		{ BT_Construct, "Construct" },
-		{ BT_Extraplanar, "Extraplanar" },
-		{ BT_Magical, "Magical" },
-		{ BT_SummonedUndead, "Summoned Undead" },
-		{ BT_RaidGiant, "Raid Giant" },
-		{ BT_RaidColdain, "Raid Coldain" },
-		{ BT_NoTarget, "Untargetable" },
-		{ BT_Vampire, "Vampire" },
-		{ BT_Atenha_Ra, "Aten Ha Ra" },
-		{ BT_Greater_Akheva, "Greater Akheva" },
-		{ BT_Khati_Sha, "Khati Sha" },
-		{ BT_Seru, "Seru" },
-		{ BT_Grieg_Veneficus, "Grieg Veneficus" },
-		{ BT_Draz_Nurakk, "Draz Nurakk" },
-		{ BT_Zek, "Zek" },
-		{ BT_Luggald, "Luggald" },
-		{ BT_Animal, "Animal" },
-		{ BT_Insect, "Insect" },
-		{ BT_Monster, "Monster" },
-		{ BT_Summoned, "Summoned" },
-		{ BT_Plant, "Plant" },
-		{ BT_Dragon, "Dragon" },
-		{ BT_Summoned2, "Summoned 2" },
-		{ BT_Summoned3, "Summoned 3" },
-		{ BT_Dragon2, "Dragon 2" },
-		{ BT_VeliousDragon, "Velious Dragon" },
-		{ BT_Familiar, "Familiar" },
-		{ BT_Dragon3, "Dragon 3" },
-		{ BT_Boxes, "Boxes" },
-		{ BT_Muramite, "Muramite" },
-		{ BT_NoTarget2, "Untargetable 2" },
-		{ BT_SwarmPet, "Swarm Pet" },
-		{ BT_MonsterSummon, "Monster Summon" },
-		{ BT_InvisMan, "Invisible Man" },
-		{ BT_Special, "Special" },
-	};
-
-	return bodytype_map;
-}
-
-std::string EQ::constants::GetBodyTypeName(bodyType bodytype_id)
-{
-	if (EQ::constants::GetBodyTypeMap().find(bodytype_id) != EQ::constants::GetBodyTypeMap().end()) {
-		return EQ::constants::GetBodyTypeMap().find(bodytype_id)->second;
-	}
-
-	return std::string();
-}
-
-const std::map<uint8, std::string>& EQ::constants::GetAccountStatusMap()
-{
-	static const std::map<uint8, std::string> account_status_map = {
-		{ AccountStatus::Player, "Player" },
-		{ AccountStatus::Steward, "Steward" },
-		{ AccountStatus::ApprenticeGuide, "Apprentice Guide" },
-		{ AccountStatus::Guide, "Guide" },
-		{ AccountStatus::QuestTroupe, "Quest Troupe" },
-		{ AccountStatus::SeniorGuide, "Senior Guide" },
-		{ AccountStatus::GMTester, "GM Tester" },
-		{ AccountStatus::EQSupport, "EQ Support" },
-		{ AccountStatus::GMStaff, "GM Staff" },
-		{ AccountStatus::GMAdmin, "GM Admin" },
-		{ AccountStatus::GMLeadAdmin, "GM Lead Admin" },
-		{ AccountStatus::QuestMaster, "Quest Master" },
-		{ AccountStatus::GMAreas, "GM Areas" },
-		{ AccountStatus::GMCoder, "GM Coder" },
-		{ AccountStatus::GMMgmt, "GM Mgmt" },
-		{ AccountStatus::GMImpossible, "GM Impossible" },
-		{ AccountStatus::Max, "GM Max" }
-	};
-
-	return account_status_map;
-}
-
-std::string EQ::constants::GetAccountStatusName(uint8 account_status)
-{
-	for (
-		auto status_level = EQ::constants::GetAccountStatusMap().rbegin();
-		status_level != EQ::constants::GetAccountStatusMap().rend();
-		++status_level
-	) {
-		if (account_status >= status_level->first) {
-			return status_level->second;
-		}
-	}
-
-	return std::string();
-}
-
-const std::map<uint8, std::string>& EQ::constants::GetConsiderLevelMap()
-{
-	static const std::map<uint8, std::string> consider_level_map = {
-		{ ConsiderLevel::Ally, "Ally" },
-		{ ConsiderLevel::Warmly, "Warmly" },
-		{ ConsiderLevel::Kindly, "Kindly" },
-		{ ConsiderLevel::Amiably, "Amiably" },
-		{ ConsiderLevel::Indifferently, "Indifferently" },
-		{ ConsiderLevel::Apprehensively, "Apprehensively" },
-		{ ConsiderLevel::Dubiously, "Dubiously" },
-		{ ConsiderLevel::Threateningly, "Threateningly" },
-		{ ConsiderLevel::Scowls, "Scowls" }
-	};
-
-	return consider_level_map;
-}
-
-std::string EQ::constants::GetConsiderLevelName(uint8 faction_consider_level)
-{
-	if (!EQ::ValueWithin(faction_consider_level, ConsiderLevel::Ally, ConsiderLevel::Scowls)) {
-		return std::string();;
-	}
-
-	return EQ::constants::GetConsiderLevelMap().find(faction_consider_level)->second;
-}
-
-const std::map<uint8, std::string>& EQ::constants::GetEnvironmentalDamageMap()
-{
-	static const std::map<uint8, std::string> damage_type_map = {
-		{ EnvironmentalDamage::Lava, "Lava" },
-		{ EnvironmentalDamage::Drowning, "Drowning" },
-		{ EnvironmentalDamage::Falling, "Falling" },
-		{ EnvironmentalDamage::Trap, "Trap" }
-	};
-
-	return damage_type_map;
-}
-
-std::string EQ::constants::GetEnvironmentalDamageName(uint8 damage_type)
-{
-	if (!EQ::ValueWithin(damage_type, EnvironmentalDamage::Lava, EnvironmentalDamage::Trap)) {
-		return std::string();
-	}
-
-	return EQ::constants::GetEnvironmentalDamageMap().find(damage_type)->second;
-}
-
-const std::map<uint8, std::string>& EQ::constants::GetStuckBehaviorMap()
-{
-	static const std::map<uint8, std::string> stuck_behavior_map = {
-		{ StuckBehavior::RunToTarget, "Run To Target" },
-		{ StuckBehavior::WarpToTarget, "Warp To Target" },
-		{ StuckBehavior::TakeNoAction, "Take No Action" },
-		{ StuckBehavior::EvadeCombat, "Evade Combat" }
-	};
-
-	return stuck_behavior_map;
-}
-
-std::string EQ::constants::GetStuckBehaviorName(uint8 behavior_id)
-{
-	if (!EQ::ValueWithin(behavior_id, StuckBehavior::RunToTarget, StuckBehavior::EvadeCombat)) {
-		return std::string();
-	}
-
-	return EQ::constants::GetStuckBehaviorMap().find(behavior_id)->second;
-}
-
-const std::map<uint8, std::string>& EQ::constants::GetSpawnAnimationMap()
-{
-	static const std::map<uint8, std::string> spawn_animation_map = {
-		{ SpawnAnimations::Standing, "Standing" },
-		{ SpawnAnimations::Sitting, "Sitting" },
-		{ SpawnAnimations::Crouching, "Crouching" },
-		{ SpawnAnimations::Laying, "Laying" },
-		{ SpawnAnimations::Looting, "Looting" }
-	};
-
-	return spawn_animation_map;
-}
-
-std::string EQ::constants::GetSpawnAnimationName(uint8 animation_id)
-{
-	if (!EQ::ValueWithin(animation_id, SpawnAnimations::Standing, SpawnAnimations::Looting)) {
-		return std::string();
-	}
-
-	return EQ::constants::GetSpawnAnimationMap().find(animation_id)->second;
-}
-
-const std::map<int, std::string>& EQ::constants::GetObjectTypeMap()
-{
-	static const std::map<int, std::string> object_type_map = {
-		{ ObjectTypes::SmallBag, "Small Bag" },
-		{ ObjectTypes::LargeBag, "Large Bag" },
-		{ ObjectTypes::Quiver, "Quiver" },
-		{ ObjectTypes::BeltPouch, "Belt Pouch" },
-		{ ObjectTypes::WristPouch, "Wrist Pouch" },
-		{ ObjectTypes::Backpack, "Backpack" },
-		{ ObjectTypes::SmallChest, "Small Chest" },
-		{ ObjectTypes::LargeChest, "Large Chest" },
-		{ ObjectTypes::Bandolier, "Bandolier" },
-		{ ObjectTypes::Medicine, "Medicine" },
-		{ ObjectTypes::Tinkering, "Tinkering" },
-		{ ObjectTypes::Lexicon, "Lexicon" },
-		{ ObjectTypes::PoisonMaking, "Mortar and Pestle" },
-		{ ObjectTypes::Quest, "Quest" },
-		{ ObjectTypes::MixingBowl, "Mixing Bowl" },
-		{ ObjectTypes::Baking, "Baking" },
-		{ ObjectTypes::Tailoring, "Tailoring" },
-		{ ObjectTypes::Blacksmithing, "Blacksmithing" },
-		{ ObjectTypes::Fletching, "Fletching" },
-		{ ObjectTypes::Brewing, "Brewing" },
-		{ ObjectTypes::JewelryMaking, "Jewelry Making" },
-		{ ObjectTypes::Pottery, "Pottery" },
-		{ ObjectTypes::Kiln, "Kiln" },
-		{ ObjectTypes::KeyMaker, "Key Maker" },
-		{ ObjectTypes::ResearchWIZ, "Lexicon" },
-		{ ObjectTypes::ResearchMAG, "Lexicon" },
-		{ ObjectTypes::ResearchNEC, "Lexicon" },
-		{ ObjectTypes::ResearchENC, "Lexicon" },
-		{ ObjectTypes::Unknown, "Unknown" },
-		{ ObjectTypes::ResearchPractice, "Lexicon" },
-		{ ObjectTypes::Alchemy, "Alchemy" },
-		{ ObjectTypes::HighElfForge, "High Elf Forge" },
-		{ ObjectTypes::DarkElfForge, "Dark Elf Forge" },
-		{ ObjectTypes::OgreForge, "Ogre Forge" },
-		{ ObjectTypes::DwarfForge, "Dwarf Forge" },
-		{ ObjectTypes::GnomeForge, "Gnome Forge" },
-		{ ObjectTypes::BarbarianForge, "Barbarian Forge" },
-		{ ObjectTypes::IksarForge, "Iksar Forge" },
-		{ ObjectTypes::HumanForgeOne, "Human Forge" },
-		{ ObjectTypes::HumanForgeTwo, "Human Forge" },
-		{ ObjectTypes::HalflingTailoringOne, "Halfling Tailoring" },
-		{ ObjectTypes::HalflingTailoringTwo, "Halfling Tailoring" },
-		{ ObjectTypes::EruditeTailoring, "Erudite Tailoring" },
-		{ ObjectTypes::WoodElfTailoring, "Wood Elf Tailoring" },
-		{ ObjectTypes::WoodElfFletching, "Wood Elf Fletching" },
-		{ ObjectTypes::IksarPottery, "Iksar Pottery" },
-		{ ObjectTypes::Fishing, "Fishing" },
-		{ ObjectTypes::TrollForge, "Troll Forge" },
-		{ ObjectTypes::WoodElfForge, "Wood Elf Forge" },
-		{ ObjectTypes::HalflingForge, "Halfling Forge" },
-		{ ObjectTypes::EruditeForge, "Erudite Forge" },
-		{ ObjectTypes::Merchant, "Merchant" },
-		{ ObjectTypes::FroglokForge, "Froglok Forge" },
-		{ ObjectTypes::Augmenter, "Augmenter" },
-		{ ObjectTypes::Churn, "Churn" },
-		{ ObjectTypes::TransformationMold, "Transformation Mold" },
-		{ ObjectTypes::DetransformationMold, "Detransformation Mold" },
-		{ ObjectTypes::Unattuner, "Unattuner" },
-		{ ObjectTypes::TradeskillBag, "Tradeskill Bag" },
-		{ ObjectTypes::CollectibleBag, "Collectible Bag" },
-		{ ObjectTypes::NoDeposit, "No Deposit" }
-	};
-
-	return object_type_map;
-}
-
-std::string EQ::constants::GetObjectTypeName(int object_type)
-{
-	if (!EQ::ValueWithin(object_type, ObjectTypes::SmallBag, ObjectTypes::NoDeposit)) {
-		return std::string();
-	}
-
-	return EQ::constants::GetObjectTypeMap().find(object_type)->second;
-}
-
-const std::map<uint8, std::string> &EQ::constants::GetWeatherTypeMap()
-{
-	static const std::map<uint8, std::string> weather_type_map = {
-		{WeatherTypes::None,    "None"},
-		{WeatherTypes::Raining, "Raining"},
-		{WeatherTypes::Snowing, "Snowing"}
-	};
-
-	return weather_type_map;
-}
-
-std::string EQ::constants::GetWeatherTypeName(uint8 weather_type)
-{
-	if (!EQ::ValueWithin(weather_type, WeatherTypes::None, WeatherTypes::Snowing)) {
-		return std::string();
-	}
-
-	return EQ::constants::GetWeatherTypeMap().find(weather_type)->second;
-}
-
-const std::map<uint8, std::string> &EQ::constants::GetEmoteEventTypeMap()
-{
-	static const std::map<uint8, std::string> emote_event_type_map = {
-		{ EmoteEventTypes::LeaveCombat, "Leave Combat" },
-		{ EmoteEventTypes::EnterCombat, "Enter Combat" },
-		{ EmoteEventTypes::OnDeath, "On Death" },
-		{ EmoteEventTypes::AfterDeath, "After Death" },
-		{ EmoteEventTypes::Hailed, "Hailed" },
-		{ EmoteEventTypes::KilledPC, "Killed PC" },
-		{ EmoteEventTypes::KilledNPC, "Killed NPC" },
-		{ EmoteEventTypes::OnSpawn, "On Spawn" },
-		{ EmoteEventTypes::OnDespawn, "On Despawn" }
-	};
-
-	return emote_event_type_map;
-}
-
-std::string EQ::constants::GetEmoteEventTypeName(uint8 emote_event_type)
-{
-	if (!EQ::ValueWithin(emote_event_type, EmoteEventTypes::LeaveCombat, EmoteEventTypes::OnDespawn)) {
-		return std::string();
-	}
-
-	return EQ::constants::GetEmoteEventTypeMap().find(emote_event_type)->second;
-}
-
-const std::map<uint8, std::string> &EQ::constants::GetEmoteTypeMap()
-{
-	static const std::map<uint8, std::string> emote_type_map = {
-		{ EmoteTypes::Say, "Say" },
-		{ EmoteTypes::Emote, "Emote" },
-		{ EmoteTypes::Shout, "Shout" },
-		{ EmoteTypes::Proximity, "Proximity" }
-	};
-
-	return emote_type_map;
-}
-
-std::string EQ::constants::GetEmoteTypeName(uint8 emote_type)
-{
-	if (!EQ::ValueWithin(emote_type, EmoteTypes::Say, EmoteTypes::Proximity)) {
-		return std::string();
-	}
-
-	return EQ::constants::GetEmoteTypeMap().find(emote_type)->second;
-}
-
-const std::map<uint32, std::string>& EQ::constants::GetAppearanceTypeMap()
-{
-	static const std::map<uint32, std::string> appearance_type_map = {
-		{ AppearanceType::Die, "Die" },
-		{ AppearanceType::WhoLevel, "Who Level" },
-		{ AppearanceType::MaxHealth, "Max Health" },
-		{ AppearanceType::Invisibility, "Invisibility" },
-		{ AppearanceType::PVP, "PVP" },
-		{ AppearanceType::Light, "Light" },
-		{ AppearanceType::Animation, "Animation" },
-		{ AppearanceType::Sneak, "Sneak" },
-		{ AppearanceType::SpawnID, "Spawn ID" },
-		{ AppearanceType::Health, "Health" },
-		{ AppearanceType::Linkdead, "Linkdead" },
-		{ AppearanceType::FlyMode, "Fly Mode" },
-		{ AppearanceType::GM, "GM" },
-		{ AppearanceType::Anonymous, "Anonymous" },
-		{ AppearanceType::GuildID, "Guild ID" },
-		{ AppearanceType::GuildRank, "Guild Rank" },
-		{ AppearanceType::AFK, "AFK" },
-		{ AppearanceType::Pet, "Pet" },
-		{ AppearanceType::Summoned, "Summoned" },
-		{ AppearanceType::Split, "Split" },
-		{ AppearanceType::Size, "Size" },
-		{ AppearanceType::SetType, "Set Type" },
-		{ AppearanceType::NPCName, "NPCName" },
-		{ AppearanceType::AARank, "AARank" },
-		{ AppearanceType::CancelSneakHide, "Cancel Sneak Hide" },
-		{ AppearanceType::AreaHealthRegen, "Area Health Regeneration" },
-		{ AppearanceType::AreaManaRegen, "Area Mana Regeneration" },
-		{ AppearanceType::AreaEnduranceRegen, "Area Endurance Regeneration" },
-		{ AppearanceType::FreezeBeneficialBuffs, "Freeze Beneficial Buffs" },
-		{ AppearanceType::NPCTintIndex, "NPC Tint Index" },
-		{ AppearanceType::GroupAutoConsent, "Group Auto Consent" },
-		{ AppearanceType::RaidAutoConsent, "Raid Auto Consent" },
-		{ AppearanceType::GuildAutoConsent, "Guild Auto Consent" },
-		{ AppearanceType::ShowHelm, "Show Helm" },
-		{ AppearanceType::DamageState, "Damage State" },
-		{ AppearanceType::EQPlayers, "EQ Players" },
-		{ AppearanceType::FindBits, "Find Bits" },
-		{ AppearanceType::TextureType, "Texture Type" },
-		{ AppearanceType::FacePick, "Face Pick" },
-		{ AppearanceType::AntiCheat, "Anti Cheat" },
-		{ AppearanceType::GuildShow, "Guild Show" },
-		{ AppearanceType::OfflineMode, "Offline Mode" }
-	};
-
-	return appearance_type_map;
-}
-
-std::string EQ::constants::GetAppearanceTypeName(uint32 appearance_type)
-{
-	const auto& a = EQ::constants::GetAppearanceTypeMap().find(appearance_type);
-	if (a != EQ::constants::GetAppearanceTypeMap().end()) {
-		return a->second;
-	}
-
-	return std::string();
-}
-
-const std::map<uint32, std::string>& EQ::constants::GetSpecialAbilityMap()
-{
-	static const std::map<uint32, std::string> special_ability_map = {
-		{ SPECATK_SUMMON,            "Summon" },
-		{ SPECATK_ENRAGE,            "Enrage" },
-		{ SPECATK_RAMPAGE,           "Rampage" },
-		{ SPECATK_AREA_RAMPAGE,      "Area Rampage" },
-		{ SPECATK_FLURRY,            "Flurry" },
-		{ SPECATK_TRIPLE,            "Triple Attack" },
-		{ SPECATK_QUAD,              "Quadruple Attack" },
-		{ SPECATK_INNATE_DW,         "Dual Wield" },
-		{ SPECATK_BANE,              "Bane Attack" },
-		{ SPECATK_MAGICAL,           "Magical Attack" },
-		{ SPECATK_RANGED_ATK,        "Ranged Attack" },
-		{ UNSLOWABLE,                "Immune to Slow" },
-		{ UNMEZABLE,                 "Immune to Mesmerize" },
-		{ UNCHARMABLE,               "Immune to Charm" },
-		{ UNSTUNABLE,                "Immune to Stun" },
-		{ UNSNAREABLE,               "Immune to Snare" },
-		{ UNFEARABLE,                "Immune to Fear" },
-		{ UNDISPELLABLE,             "Immune to Dispell" },
-		{ IMMUNE_MELEE,              "Immune to Melee" },
-		{ IMMUNE_MAGIC,              "Immune to Magic" },
-		{ IMMUNE_FLEEING,            "Immune to Fleeing" },
-		{ IMMUNE_MELEE_EXCEPT_BANE,  "Immune to Melee except Bane" },
-		{ IMMUNE_MELEE_NONMAGICAL,   "Immune to Non-Magical Melee" },
-		{ IMMUNE_AGGRO,              "Immune to Aggro" },
-		{ IMMUNE_AGGRO_ON,           "Immune to Being Aggro" },
-		{ IMMUNE_CASTING_FROM_RANGE, "Immune to Ranged Spells" },
-		{ IMMUNE_FEIGN_DEATH,        "Immune to Feign Death" },
-		{ IMMUNE_TAUNT,              "Immune to Taunt" },
-		{ NPC_TUNNELVISION,          "Tunnel Vision" },
-		{ NPC_NO_BUFFHEAL_FRIENDS,   "Does Not Heal of Buff Allies" },
-		{ IMMUNE_PACIFY,             "Immune to Pacify" },
-		{ LEASH,                     "Leashed" },
-		{ TETHER,                    "Tethered" },
-		{ DESTRUCTIBLE_OBJECT,       "Destructible Object" },
-		{ NO_HARM_FROM_CLIENT,       "Immune to Harm from Client" },
-		{ ALWAYS_FLEE,               "Always Flees" },
-		{ FLEE_PERCENT,              "Flee Percentage" },
-		{ ALLOW_BENEFICIAL,          "Allows Beneficial Spells" },
-		{ DISABLE_MELEE,             "Melee is Disabled" },
-		{ NPC_CHASE_DISTANCE,        "Chase Distance" },
-		{ ALLOW_TO_TANK,             "Allowed to Tank" },
-		{ IGNORE_ROOT_AGGRO_RULES,   "Ignores Root Aggro" },
-		{ CASTING_RESIST_DIFF,       "Casting Resist Difficulty" },
-		{ COUNTER_AVOID_DAMAGE,      "Counter Damage Avoidance" },
-		{ PROX_AGGRO,                "Proximity Aggro" },
-		{ IMMUNE_RANGED_ATTACKS,     "Immune to Ranged Attacks" },
-		{ IMMUNE_DAMAGE_CLIENT,      "Immune to Client Damage" },
-		{ IMMUNE_DAMAGE_NPC,         "Immune to NPC Damage" },
-		{ IMMUNE_AGGRO_CLIENT,       "Immune to Client Aggro" },
-		{ IMMUNE_AGGRO_NPC,          "Immune to NPC Aggro" },
-		{ MODIFY_AVOID_DAMAGE,       "Modify Damage Avoidance" },
-		{ IMMUNE_FADING_MEMORIES,    "Immune to Memory Fades" },
-		{ IMMUNE_OPEN,               "Immune to Open" },
-		{ IMMUNE_ASSASSINATE,        "Immune to Assassinate" },
-		{ IMMUNE_HEADSHOT,           "Immune to Headshot" },
-		{ IMMUNE_AGGRO_BOT,          "Immune to Bot Aggro" },
-		{ IMMUNE_DAMAGE_BOT,         "Immune to Bot Damage" },
-	};
-
-	return special_ability_map;
-}
-
-std::string EQ::constants::GetSpecialAbilityName(uint32 ability_id)
-{
-	const auto& a = EQ::constants::GetSpecialAbilityMap().find(ability_id);
-	if (a != EQ::constants::GetSpecialAbilityMap().end()) {
-		return a->second;
-	}
-
-	return std::string();
-}
@@ -1,5 +1,5 @@
 /*	EQEMu: Everquest Server Emulator
-
+	
 	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)

 	This program is free software; you can redistribute it and/or modify
@@ -22,7 +22,6 @@

 #include "eq_limits.h"
 #include "emu_versions.h"
-#include "bodytypes.h"

 #include <string.h>

@@ -32,6 +31,10 @@ namespace EQ
 {
 	using RoF2::IINVALID;
 	using RoF2::INULL;
+	
+	namespace inventory {
+		
+	} /*inventory*/

 	namespace invtype {
 		using namespace RoF2::invtype::enum_;
@@ -197,7 +200,7 @@ namespace EQ
 		using RoF2::constants::EXPANSIONS_MASK;

 		using RoF2::constants::CHARACTER_CREATION_LIMIT;
-
+		
 		const size_t SAY_LINK_OPENER_SIZE = 1;
 		using RoF2::constants::SAY_LINK_BODY_SIZE;
 		const size_t SAY_LINK_TEXT_SIZE = 256; // this may be varied until it breaks something (tested:374) - the others are constant
@@ -217,193 +220,9 @@ namespace EQ
 			stanceBurnAE
 		};

-		enum BotSpellIDs : int {
-			Warrior = 3001,
-			Cleric,
-			Paladin,
-			Ranger,
-			Shadowknight,
-			Druid,
-			Monk,
-			Bard,
-			Rogue,
-			Shaman,
-			Necromancer,
-			Wizard,
-			Magician,
-			Enchanter,
-			Beastlord,
-			Berserker
-		};
-
-		enum GravityBehavior : int8 {
-			Ground,
-			Flying,
-			Levitating,
-			Water,
-			Floating,
-			LevitateWhileRunning
-		};
-
-		enum EnvironmentalDamage : uint8 {
-			Lava = 250,
-			Drowning,
-			Falling,
-			Trap
-		};
-
-		enum StuckBehavior : uint8 {
-			RunToTarget,
-			WarpToTarget,
-			TakeNoAction,
-			EvadeCombat
-		};
-
-		enum SpawnAnimations : uint8 {
-			Standing,
-			Sitting,
-			Crouching,
-			Laying,
-			Looting
-		};
-
-		enum ObjectTypes : int {
-			SmallBag,
-			LargeBag,
-			Quiver,
-			BeltPouch,
-			WristPouch,
-			Backpack,
-			SmallChest,
-			LargeChest,
-			Bandolier,
-			Medicine,
-			Tinkering,
-			Lexicon,
-			PoisonMaking,
-			Quest,
-			MixingBowl,
-			Baking,
-			Tailoring,
-			Blacksmithing,
-			Fletching,
-			Brewing,
-			JewelryMaking,
-			Pottery,
-			Kiln,
-			KeyMaker,
-			ResearchWIZ,
-			ResearchMAG,
-			ResearchNEC,
-			ResearchENC,
-			Unknown,
-			ResearchPractice,
-			Alchemy,
-			HighElfForge,
-			DarkElfForge,
-			OgreForge,
-			DwarfForge,
-			GnomeForge,
-			BarbarianForge,
-			IksarForge,
-			HumanForgeOne,
-			HumanForgeTwo,
-			HalflingTailoringOne,
-			HalflingTailoringTwo,
-			EruditeTailoring,
-			WoodElfTailoring,
-			WoodElfFletching,
-			IksarPottery,
-			Fishing,
-			TrollForge,
-			WoodElfForge,
-			HalflingForge,
-			EruditeForge,
-			Merchant,
-			FroglokForge,
-			Augmenter,
-			Churn,
-			TransformationMold,
-			DetransformationMold,
-			Unattuner,
-			TradeskillBag,
-			CollectibleBag,
-			NoDeposit
-		};
-
-		enum WeatherTypes : uint8 {
-			None,
-			Raining,
-			Snowing
-		};
-
-		enum EmoteEventTypes : uint8 {
-			LeaveCombat,
-			EnterCombat,
-			OnDeath,
-			AfterDeath,
-			Hailed,
-			KilledPC,
-			KilledNPC,
-			OnSpawn,
-			OnDespawn
-		};
-
-		enum EmoteTypes : uint8 {
-			Say,
-			Emote,
-			Shout,
-			Proximity
-		};
-
 		const char *GetStanceName(StanceType stance_type);
 		int ConvertStanceTypeToIndex(StanceType stance_type);

-		extern const std::map<uint8, std::string>& GetLanguageMap();
-		std::string GetLanguageName(uint8 language_id);
-
-		extern const std::map<uint32, std::string>& GetLDoNThemeMap();
-		std::string GetLDoNThemeName(uint32 theme_id);
-
-		extern const std::map<int8, std::string>& GetFlyModeMap();
-		std::string GetFlyModeName(int8 flymode_id);
-
-		extern const std::map<bodyType, std::string>& GetBodyTypeMap();
-		std::string GetBodyTypeName(bodyType bodytype_id);
-
-		extern const std::map<uint8, std::string>& GetAccountStatusMap();
-		std::string GetAccountStatusName(uint8 account_status);
-
-		extern const std::map<uint8, std::string>& GetConsiderLevelMap();
-		std::string GetConsiderLevelName(uint8 consider_level);
-
-		extern const std::map<uint8, std::string>& GetEnvironmentalDamageMap();
-		std::string GetEnvironmentalDamageName(uint8 damage_type);
-
-		extern const std::map<uint8, std::string>& GetStuckBehaviorMap();
-		std::string GetStuckBehaviorName(uint8 behavior_id);
-
-		extern const std::map<uint8, std::string>& GetSpawnAnimationMap();
-		std::string GetSpawnAnimationName(uint8 animation_id);
-
-		extern const std::map<int, std::string>& GetObjectTypeMap();
-		std::string GetObjectTypeName(int object_type);
-
-		extern const std::map<uint8, std::string>& GetWeatherTypeMap();
-		std::string GetWeatherTypeName(uint8 weather_type);
-
-		extern const std::map<uint8, std::string>& GetEmoteEventTypeMap();
-		std::string GetEmoteEventTypeName(uint8 emote_event_type);
-
-		extern const std::map<uint8, std::string>& GetEmoteTypeMap();
-		std::string GetEmoteTypeName(uint8 emote_type);
-
-		extern const std::map<uint32, std::string>& GetAppearanceTypeMap();
-		std::string GetAppearanceTypeName(uint32 animation_type);
-
-		extern const std::map<uint32, std::string>& GetSpecialAbilityMap();
-		std::string GetSpecialAbilityName(uint32 ability_id);
-
 		const int STANCE_TYPE_FIRST = stancePassive;
 		const int STANCE_TYPE_LAST = stanceBurnAE;
 		const int STANCE_TYPE_COUNT = stanceBurnAE;
@@ -413,7 +232,7 @@ namespace EQ
 	namespace profile {
 		using RoF2::profile::BANDOLIERS_SIZE;
 		using RoF2::profile::BANDOLIER_ITEM_COUNT;
-
+		
 		using RoF2::profile::POTION_BELT_SIZE;

 		using RoF2::profile::SKILL_ARRAY_SIZE;
@@ -506,184 +325,13 @@ namespace EQ
 			Guild
 		};
 	}; // namespace consent
+
 } /*EQEmu*/

-enum ServerLockType : int {
-	List,
-	Lock,
-	Unlock
-};
-
-enum AccountStatus : uint8 {
-	Player = 0,
-	Steward = 10,
-	ApprenticeGuide = 20,
-	Guide = 50,
-	QuestTroupe = 80,
-	SeniorGuide = 81,
-	GMTester = 85,
-	EQSupport = 90,
-	GMStaff = 95,
-	GMAdmin = 100,
-	GMLeadAdmin = 150,
-	QuestMaster = 160,
-	GMAreas = 170,
-	GMCoder = 180,
-	GMMgmt = 200,
-	GMImpossible = 250,
-	Max = 255
-};
-
-enum Invisibility : uint8 {
-	Visible,
-	Invisible,
-	Special = 255
-};
-
-enum AugmentActions : int {
-	Insert,
-	Remove,
-	Swap,
-	Destroy
-};
-
-enum ConsiderLevel : uint8 {
-	Ally = 1,
-	Warmly,
-	Kindly,
-	Amiably,
-	Indifferently,
-	Apprehensively,
-	Dubiously,
-	Threateningly,
-	Scowls
-};
-
-enum TargetDescriptionType : uint8 {
-	LCSelf,
-	UCSelf,
-	LCYou,
-	UCYou,
-	LCYour,
-	UCYour
-};
-
-enum ReloadWorld : uint8 {
-	NoRepop = 0,
-	Repop,
-	ForceRepop
-};
-
-enum BucketComparison : uint8 {
-	BucketEqualTo = 0,
-	BucketNotEqualTo,
-	BucketGreaterThanOrEqualTo,
-	BucketLesserThanOrEqualTo,
-	BucketGreaterThan,
-	BucketLesserThan,
-	BucketIsAny,
-	BucketIsNotAny,
-	BucketIsBetween,
-	BucketIsNotBetween
-};
-
-enum class EntityFilterType {
-	All,
-	Bots,
-	Clients,
-	NPCs
-};
-
-enum class ApplySpellType {
-	Solo,
-	Group,
-	Raid
-};
-
-enum {
-	SPECATK_SUMMON            = 1,
-	SPECATK_ENRAGE            = 2,
-	SPECATK_RAMPAGE           = 3,
-	SPECATK_AREA_RAMPAGE      = 4,
-	SPECATK_FLURRY            = 5,
-	SPECATK_TRIPLE            = 6,
-	SPECATK_QUAD              = 7,
-	SPECATK_INNATE_DW         = 8,
-	SPECATK_BANE              = 9,
-	SPECATK_MAGICAL           = 10,
-	SPECATK_RANGED_ATK        = 11,
-	UNSLOWABLE                = 12,
-	UNMEZABLE                 = 13,
-	UNCHARMABLE               = 14,
-	UNSTUNABLE                = 15,
-	UNSNAREABLE               = 16,
-	UNFEARABLE                = 17,
-	UNDISPELLABLE             = 18,
-	IMMUNE_MELEE              = 19,
-	IMMUNE_MAGIC              = 20,
-	IMMUNE_FLEEING            = 21,
-	IMMUNE_MELEE_EXCEPT_BANE  = 22,
-	IMMUNE_MELEE_NONMAGICAL   = 23,
-	IMMUNE_AGGRO              = 24,
-	IMMUNE_AGGRO_ON           = 25,
-	IMMUNE_CASTING_FROM_RANGE = 26,
-	IMMUNE_FEIGN_DEATH        = 27,
-	IMMUNE_TAUNT              = 28,
-	NPC_TUNNELVISION          = 29,
-	NPC_NO_BUFFHEAL_FRIENDS   = 30,
-	IMMUNE_PACIFY             = 31,
-	LEASH                     = 32,
-	TETHER                    = 33,
-	DESTRUCTIBLE_OBJECT       = 34,
-	NO_HARM_FROM_CLIENT       = 35,
-	ALWAYS_FLEE               = 36,
-	FLEE_PERCENT              = 37,
-	ALLOW_BENEFICIAL          = 38,
-	DISABLE_MELEE             = 39,
-	NPC_CHASE_DISTANCE        = 40,
-	ALLOW_TO_TANK             = 41,
-	IGNORE_ROOT_AGGRO_RULES   = 42,
-	CASTING_RESIST_DIFF       = 43,
-	COUNTER_AVOID_DAMAGE      = 44, // Modify by percent NPC's opponents chance to riposte, block, parry or dodge individually, or for all skills
-	PROX_AGGRO                = 45,
-	IMMUNE_RANGED_ATTACKS     = 46,
-	IMMUNE_DAMAGE_CLIENT      = 47,
-	IMMUNE_DAMAGE_NPC         = 48,
-	IMMUNE_AGGRO_CLIENT       = 49,
-	IMMUNE_AGGRO_NPC          = 50,
-	MODIFY_AVOID_DAMAGE       = 51, // Modify by percent the NPCs chance to riposte, block, parry or dodge individually, or for all skills
-	IMMUNE_FADING_MEMORIES    = 52,
-	IMMUNE_OPEN               = 53,
-	IMMUNE_ASSASSINATE        = 54,
-	IMMUNE_HEADSHOT           = 55,
-	IMMUNE_AGGRO_BOT          = 56,
-	IMMUNE_DAMAGE_BOT         = 57,
-	MAX_SPECIAL_ATTACK        = 58
-};
-
-
-namespace HeroicBonusBucket
-{
-	const std::string WisMaxMana 			= "HWIS-MaxMana";
-	const std::string WisManaRegen			= "HWIS-ManaRegen";
-	const std::string WisHealAmt			= "HWIS-HealAmt";
-	const std::string IntMaxMana			= "HINT-MaxMana";
-	const std::string IntManaRegen			= "HINT-ManaRegen";
-	const std::string IntSpellDmg			= "HINT-SpellDmg";
-	const std::string StrMeleeDamage		= "HSTR-MeleeDamage";
-	const std::string StrShieldAC			= "HSTR-ShieldAC";
-	const std::string StrMaxEndurance		= "HSTR-MaxEndurance";
-	const std::string StrEnduranceRegen		= "HSTR-EnduranceRegen";
-	const std::string StaMaxHP			= "HSTA-MaxHP";
-	const std::string StaHPRegen			= "HSTA-HPRegen";
-	const std::string StaMaxEndurance		= "HSTA-MaxEndurance";
-	const std::string StaEnduranceRegen		= "HSTA-EnduranceRegen";
-	const std::string AgiAvoidance			= "HAGI-Avoidance";
-	const std::string AgiMaxEndurance		= "HAGI-MaxEndurance";
-	const std::string AgiEnduranceRegen		= "HAGI-EnduranceRegen";
-	const std::string DexRangedDamage		= "HDEX-RangedDamage";
-	const std::string DexMaxEndurance		= "HDEX-MaxEndurance";
-	const std::string DexEnduranceRegen		= "HDEX-EnduranceRegen";
-}
-
 #endif /*COMMON_EMU_CONSTANTS_H*/
+
+/*	hack list to prevent circular references
+	
+	eq_limits.h:EQ::inventory::LookupEntry::InventoryTypeSize[n];
+
+*/
@@ -45,7 +45,6 @@ typedef enum { //EQEmu internal opcodes list
 	_maxEmuOpcode
 } EmuOpcode;

-constexpr int format_as(EmuOpcode opcode) { return static_cast<int>(opcode); }
 extern const char *OpcodeNames[_maxEmuOpcode+1];

 #endif
@@ -35,7 +35,7 @@ N(OP_AltCurrencyMerchantRequest),
 N(OP_AltCurrencyPurchase),
 N(OP_AltCurrencyReclaim),
 N(OP_AltCurrencySell),
-N(OP_AltCurrencySellSelection), 		// Used by eqstr_us.txt 8066, 8068, 8069 		
+N(OP_AltCurrencySellSelection),
 N(OP_Animation),
 N(OP_AnnoyingZoneUnknown),
 N(OP_ApplyPoison),
@@ -62,7 +62,6 @@ N(OP_BeginCast),
 N(OP_Bind_Wound),
 N(OP_BlockedBuffs),
 N(OP_BoardBoat),
-N(OP_BookButton),
 N(OP_Buff),
 N(OP_BuffCreate),
 N(OP_BuffRemoveRequest),
@@ -72,7 +71,6 @@ N(OP_Camp),
 N(OP_CancelSneakHide),
 N(OP_CancelTask),
 N(OP_CancelTrade),
-N(OP_CashReward),
 N(OP_CastSpell),
 N(OP_ChangeSize),
 N(OP_ChannelMessage),
@@ -131,8 +129,8 @@ N(OP_DisciplineTimer),
 N(OP_DisciplineUpdate),
 N(OP_DiscordMerchantInventory),
 N(OP_DoGroupLeadershipAbility),
-N(OP_DuelDecline),
-N(OP_DuelAccept),
+N(OP_DuelResponse),
+N(OP_DuelResponse2),
 N(OP_DumpName),
 N(OP_Dye),
 N(OP_DynamicWall),
@@ -228,7 +226,6 @@ N(OP_GuildBank),
 N(OP_GuildBankItemList),
 N(OP_GuildCreate),
 N(OP_GuildDelete),
-N(OP_GuildDeleteGuild),
 N(OP_GuildDemote),
 N(OP_GuildInvite),
 N(OP_GuildInviteAccept),
@@ -240,33 +237,15 @@ N(OP_GuildManageStatus),
 N(OP_GuildMemberLevelUpdate),
 N(OP_GuildMemberList),
 N(OP_GuildMemberUpdate),
-N(OP_GuildMemberLevel),
-N(OP_GuildMemberRankAltBanker),
-N(OP_GuildMemberPublicNote),
-N(OP_GuildMemberAdd),
-N(OP_GuildMemberRename),
-N(OP_GuildMemberDelete),
-N(OP_GuildMemberDetails),
-N(OP_GuildRenameGuild),
 N(OP_GuildMOTD),
 N(OP_GuildPeace),
 N(OP_GuildPromote),
 N(OP_GuildPublicNote),
 N(OP_GuildRemove),
-N(OP_GuildSelectTribute),
-N(OP_GuildModifyBenefits),
-N(OP_GuildTributeToggleReq),
-N(OP_GuildTributeToggleReply),
-N(OP_GuildOptInOut),
-N(OP_GuildSaveActiveTributes),
-N(OP_GuildSendActiveTributes),
-N(OP_GuildTributeFavorAndTimer),
 N(OP_GuildsList),
 N(OP_GuildStatus),
 N(OP_GuildTributeInfo),
-N(OP_GuildUpdate),
-N(OP_GuildTributeDonateItem),
-N(OP_GuildTributeDonatePlat),
+N(OP_GuildUpdateURLAndChannel),
 N(OP_GuildWar),
 N(OP_Heartbeat),
 N(OP_Hide),
@@ -324,7 +303,6 @@ N(OP_LockoutTimerInfo),
 N(OP_Login),
 N(OP_LoginAccepted),
 N(OP_LoginComplete),
-N(OP_LoginExpansionPacketData), //added for Rof2 client to send expansion data packet.  Requires login_opcodes_sod.conf to be updated.
 N(OP_LoginUnknown1),
 N(OP_LoginUnknown2),
 N(OP_Logout),
@@ -336,7 +314,6 @@ N(OP_LootRequest),
 N(OP_ManaChange),
 N(OP_ManaUpdate),
 N(OP_MarkNPC),
-N(OP_MarkRaidNPC),
 N(OP_Marquee),
 N(OP_MemorizeSpell),
 N(OP_Mend),
@@ -378,6 +355,7 @@ N(OP_OpenContainer),
 N(OP_OpenDiscordMerchant),
 N(OP_OpenGuildTributeMaster),
 N(OP_OpenInventory),
+N(OP_OpenNewTasksWindow),
 N(OP_OpenTributeMaster),
 N(OP_PDeletePetition),
 N(OP_PetBuffWindow),
@@ -419,8 +397,6 @@ N(OP_PVPLeaderBoardRequest),
 N(OP_PVPStats),
 N(OP_QueryResponseThing),
 N(OP_QueryUCSServerStatus),
-N(OP_RaidDelegateAbility),
-N(OP_RaidClearNPCMarks),
 N(OP_RaidInvite),
 N(OP_RaidJoin),
 N(OP_RaidUpdate),
@@ -444,7 +420,6 @@ N(OP_ReqClientSpawn),
 N(OP_ReqNewZone),
 N(OP_RequestClientZoneChange),
 N(OP_RequestDuel),
-N(OP_RequestGuildTributes),
 N(OP_RequestKnowledgeBase),
 N(OP_RequestTitles),
 N(OP_RespawnWindow),
@@ -481,7 +456,6 @@ N(OP_ServerListResponse),
 N(OP_SessionReady),
 N(OP_SetChatServer),
 N(OP_SetChatServer2),
-N(OP_SetFace),
 N(OP_SetGroupTarget),
 N(OP_SetGuildMOTD),
 N(OP_SetGuildRank),
@@ -490,19 +464,6 @@ N(OP_SetServerFilter),
 N(OP_SetStartCity),
 N(OP_SetTitle),
 N(OP_SetTitleReply),
-N(OP_SharedTaskMemberList),
-N(OP_SharedTaskAddPlayer),
-N(OP_SharedTaskRemovePlayer),
-N(OP_SharedTaskMakeLeader),
-N(OP_SharedTaskMemberInvite),
-N(OP_SharedTaskInvite),
-N(OP_SharedTaskInviteResponse),
-N(OP_SharedTaskAcceptNew),
-N(OP_SharedTaskMemberChange),
-N(OP_SharedTaskPlayerList),
-N(OP_SharedTaskSelectWindow),
-N(OP_SharedTaskQuit),
-N(OP_TaskTimers),
 N(OP_Shielding),
 N(OP_ShopDelItem),
 N(OP_ShopEnd),
@@ -538,8 +499,7 @@ N(OP_TaskActivityComplete),
 N(OP_TaskDescription),
 N(OP_TaskHistoryReply),
 N(OP_TaskHistoryRequest),
-N(OP_TaskRequestTimer),
-N(OP_TaskSelectWindow),
+N(OP_TaskMemberList),
 N(OP_Taunt),
 N(OP_TestBuff),
 N(OP_TGB),
@@ -585,7 +545,6 @@ N(OP_WhoAllRequest),
 N(OP_WhoAllResponse),
 N(OP_World_Client_CRC1),
 N(OP_World_Client_CRC2),
-N(OP_World_Client_CRC3),
 N(OP_WorldClientReady),
 N(OP_WorldComplete),
 N(OP_WorldLogout),
@@ -608,5 +567,4 @@ N(OP_ZoneServerReady),
 N(OP_ZoneSpawns),
 N(OP_ZoneUnavail),
 N(OP_ResetAA),
-N(OP_UnderWorld),
 // mail and chat opcodes located in ../mail_oplist.h
@@ -23,61 +23,60 @@
 #include "skills.h"
 #include "types.h"

-namespace AppearanceType {
-	constexpr uint32 Die                   = 0; // Causes the client to keel over and zone to bind point (default action)
-	constexpr uint32 WhoLevel              = 1; // Level that shows up on /who
-	constexpr uint32 MaxHealth             = 2;
-	constexpr uint32 Invisibility          = 3; // 0 = Visible, 1 = Invisible
-	constexpr uint32 PVP                   = 4; // 0 = Non-PVP, 1 = PVP
-	constexpr uint32 Light                 = 5; // Light type emitted by player (lightstone, shiny shield)
-	constexpr uint32 Animation             = 14; // 100 = Standing, 102 = Freeze, 105 = Looting, 110 = Sitting, 111 = Crouching, 115 = Lying
-	constexpr uint32 Sneak                 = 15; // 0 = Normal, 1 = Sneaking
-	constexpr uint32 SpawnID               = 16; // Server -> Client, sets player spawn ID
-	constexpr uint32 Health                = 17; // Client->Server, my HP has changed (like regen tic)
-	constexpr uint32 Linkdead              = 18; // 0 = Normal, 1 = Linkdead
-	constexpr uint32 FlyMode               = 19; // 0 = Off, 1 = Flying, 2 = Levitating, 3 = Water, 4 = Floating, 5 = Levitating while Running
-	constexpr uint32 GM                    = 20; // 0 = Non-GM, 1 = GM
-	constexpr uint32 Anonymous             = 21; // 0 = Non-Anonymous, 1 = Anonymous, 2 = Roleplaying
-	constexpr uint32 GuildID               = 22;
-	constexpr uint32 GuildRank             = 23;
-	constexpr uint32 AFK                   = 24; // 0 = Non-AFK, 1 = AFK
-	constexpr uint32 Pet                   = 25; // Parameter is Entity ID of owner, or 0 for when charm breaks
-	constexpr uint32 Summoned              = 27;
-	constexpr uint32 Split                 = 28; // 0 = No Split, 1 = Auto Split
-	constexpr uint32 Size                  = 29; // Spawn's Size
-	constexpr uint32 SetType               = 30; // 0 = PC, 1 = NPC, 2 = Corpse
-	constexpr uint32 NPCName               = 31; // Change PC name color to NPC name color
-	constexpr uint32 AARank                = 32; // AA Rank Title ID, title in /who?
-	constexpr uint32 CancelSneakHide       = 33; // Turns off Hide and Sneak
-	constexpr uint32 AreaHealthRegen       = 35; // Guild Hall Regeneration Pool sets to value * 0.001
-	constexpr uint32 AreaManaRegen         = 36; // Guild Hall Regeneration Pool sets to value * 0.001
-	constexpr uint32 AreaEnduranceRegen    = 37; // Guild Hall Regeneration Pool sets to value * 0.001
-	constexpr uint32 FreezeBeneficialBuffs = 38; // Freezes beneficial buff timers for PCs
-	constexpr uint32 NPCTintIndex          = 39;
-	constexpr uint32 GroupAutoConsent      = 40; // Auto Consent Group
-	constexpr uint32 RaidAutoConsent       = 41; // Auto Consent Raid
-	constexpr uint32 GuildAutoConsent      = 42; // Auto Consent Guild
-	constexpr uint32 ShowHelm              = 43; // 0 = Hide, 1 = Show
-	constexpr uint32 DamageState           = 44; // The damage state of a destructible object (0 through 10) plays sound IDs, most only have 2 or 4 states though
-	constexpr uint32 EQPlayers             = 45; // EQ Players Update
-	constexpr uint32 FindBits              = 46; // Set Find Bits?
-	constexpr uint32 TextureType           = 48; // Texture Type?
-	constexpr uint32 FacePick              = 49; // Turns off face pick window?
-	constexpr uint32 AntiCheat             = 51; // Sent by the client randomly telling the server how long since last action has occurred
-	constexpr uint32 GuildShow             = 52;
-	constexpr uint32 OfflineMode           = 53; // Offline Mode
-}

-namespace Animation {
-	constexpr uint32 Standing  = 100;
-	constexpr uint32 Freeze    = 102;
-	constexpr uint32 Looting   = 105;
-	constexpr uint32 Sitting   = 110;
-	constexpr uint32 Crouching = 111;
-	constexpr uint32 Lying     = 115;
-}
+//SpawnAppearance types: (compared two clients for server-originating types: SoF & RoF2)
+#define AT_Die 0			// this causes the client to keel over and zone to bind point (default action)
+#define AT_WhoLevel 1		// the level that shows up on /who
+#define AT_HPMax 2			// idk
+#define AT_Invis 3			// 0 = visible, 1 = invisible
+#define AT_PVP 4			// 0 = blue, 1 = pvp (red)
+#define AT_Light 5			// light type emitted by player (lightstone, shiny shield)
+#define AT_Anim 14			// 100=standing, 110=sitting, 111=ducking, 115=feigned, 105=looting
+#define AT_Sneak 15			// 0 = normal, 1 = sneaking
+#define AT_SpawnID 16		// server to client, sets player spawn id
+#define AT_HP 17			// Client->Server, my HP has changed (like regen tic)
+#define AT_Linkdead 18		// 0 = normal, 1 = linkdead
+#define AT_Levitate 19		// 0=off, 1=flymode, 2=levitate max 5, see GravityBehavior enum
+#define AT_GM 20			// 0 = normal, 1 = GM - all odd numbers seem to make it GM
+#define AT_Anon 21			// 0 = normal, 1 = anon, 2 = roleplay
+#define AT_GuildID 22
+#define AT_GuildRank 23		// 0=member, 1=officer, 2=leader
+#define AT_AFK 24			// 0 = normal, 1 = afk
+#define AT_Pet 25			// Param is EntityID of owner, or 0 for when charm breaks
+#define AT_Summoned 27		// Unsure
+#define AT_Split 28			// 0 = normal, 1 = autosplit on (not showing in SoF+) (client-to-server only)
+#define AT_Size 29			// spawn's size (present: SoF, absent: RoF2)
+#define AT_SetType 30		// 0 = PC, 1 = NPC, 2 <= = corpse
+#define AT_NPCName 31		// change PC's name's color to NPC color 0 = normal, 1 = npc name, Trader on RoF2?
+#define AT_AARank 32		// AA Rank Title ID thingy, does is this the title in /who?
+#define AT_CancelSneakHide 33	// Turns off Hide and Sneak
+//#define AT_34 34			// unknown (present: SoF, absent: RoF2)
+#define AT_AreaHPRegen 35	// guild hall regen pool sets to value * 0.001
+#define AT_AreaManaRegen 36	// guild hall regen pool sets to value * 0.001
+#define AT_AreaEndRegen 37	// guild hall regen pool sets to value * 0.001
+#define AT_FreezeBuffs 38	// Freezes beneficial buff timers
+#define AT_NpcTintIndex 39	// not 100% sure
+#define AT_GroupConsent 40	// auto consent group
+#define AT_RaidConsent 41	// auto consent raid
+#define AT_GuildConsent 42	// auto consent guild
+#define AT_ShowHelm 43		// 0 = hide graphic, 1 = show graphic
+#define AT_DamageState 44	// The damage state of a destructible object (0 through 10) plays soundids most only have 2 or 4 states though
+#define AT_EQPlayers 45		// /eqplayersupdate
+#define AT_FindBits 46		// set FindBits, whatever those are!
+#define AT_TextureType 48	// TextureType
+#define AT_FacePick 49		// Turns off face pick window? maybe ...
+#define AT_GuildShow 52		// this is what MQ2 call sit, not sure
+#define AT_Offline 53		// Offline mode

-constexpr int16 RECAST_TYPE_UNLINKED_ITEM = -1;
+//#define AT_Trader 300		// Bazaar Trader Mode (not present in SoF or RoF2)
+
+// animations for AT_Anim
+#define ANIM_FREEZE	    102
+#define	ANIM_STAND		0x64
+#define	ANIM_SIT		0x6e
+#define	ANIM_CROUCH		0x6f
+#define	ANIM_DEATH		0x73
+#define ANIM_LOOT		0x69

 typedef enum {
 	eaStanding = 0,
@@ -198,539 +197,14 @@ namespace Chat {
 	const uint16 Stun             = 340;
 };

-// generation SQL:
-// SELECT CONCAT('    constexpr uint16 ', UPPER(short_name), ' = ' , zoneidnumber, '; // ', long_name) from zone group by zoneidnumber ORDER BY zoneidnumber;
-namespace Zones {
-	constexpr uint16 QEYNOS = 1; // South Qeynos
-	constexpr uint16 QEYNOS2 = 2; // North Qeynos
-	constexpr uint16 QRG = 3; // The Surefall Glade
-	constexpr uint16 QEYTOQRG = 4; // The Qeynos Hills
-	constexpr uint16 HIGHPASS = 5; // Highpass Hold
-	constexpr uint16 HIGHKEEP = 6; // High Keep
-	constexpr uint16 FREPORTN = 8; // North Freeport
-	constexpr uint16 FREPORTW = 9; // West Freeport
-	constexpr uint16 FREPORTE = 10; // East Freeport
-	constexpr uint16 RUNNYEYE = 11; // The Liberated Citadel of Runnyeye
-	constexpr uint16 QEY2HH1 = 12; // The Western Plains of Karana
-	constexpr uint16 NORTHKARANA = 13; // The Northern Plains of Karana
-	constexpr uint16 SOUTHKARANA = 14; // The Southern Plains of Karana
-	constexpr uint16 EASTKARANA = 15; // Eastern Plains of Karana
-	constexpr uint16 BEHOLDER = 16; // Gorge of King Xorbb
-	constexpr uint16 BLACKBURROW = 17; // Blackburrow
-	constexpr uint16 PAW = 18; // The Lair of the Splitpaw
-	constexpr uint16 RIVERVALE = 19; // Rivervale
-	constexpr uint16 KITHICOR = 20; // Kithicor Forest
-	constexpr uint16 COMMONS = 21; // West Commonlands
-	constexpr uint16 ECOMMONS = 22; // East Commonlands
-	constexpr uint16 ERUDNINT = 23; // The Erudin Palace
-	constexpr uint16 ERUDNEXT = 24; // Erudin
-	constexpr uint16 NEKTULOS = 25; // The Nektulos Forest
-	constexpr uint16 CSHOME = 26; // Sunset Home
-	constexpr uint16 LAVASTORM = 27; // The Lavastorm Mountains
-	constexpr uint16 NEKTROPOS = 28; // Nektropos
-	constexpr uint16 HALAS = 29; // Halas
-	constexpr uint16 EVERFROST = 30; // Everfrost Peaks
-	constexpr uint16 SOLDUNGA = 31; // Solusek's Eye
-	constexpr uint16 SOLDUNGB = 32; // Nagafen's Lair
-	constexpr uint16 MISTY = 33; // Misty Thicket
-	constexpr uint16 NRO = 34; // Northern Desert of Ro
-	constexpr uint16 SRO = 35; // Southern Desert of Ro
-	constexpr uint16 BEFALLEN = 36; // Befallen
-	constexpr uint16 OASIS = 37; // Oasis of Marr
-	constexpr uint16 TOX = 38; // Toxxulia Forest
-	constexpr uint16 HOLE = 39; // The Hole
-	constexpr uint16 NERIAKA = 40; // Neriak - Foreign Quarter
-	constexpr uint16 NERIAKB = 41; // Neriak - Commons
-	constexpr uint16 NERIAKC = 42; // Neriak - 3rd Gate
-	constexpr uint16 NERIAKD = 43; // Neriak Palace
-	constexpr uint16 NAJENA = 44; // Najena
-	constexpr uint16 QCAT = 45; // The Qeynos Aqueduct System
-	constexpr uint16 INNOTHULE = 46; // Innothule Swamp
-	constexpr uint16 FEERROTT = 47; // The Feerrott
-	constexpr uint16 CAZICTHULE = 48; // Accursed Temple of CazicThule
-	constexpr uint16 OGGOK = 49; // Oggok
-	constexpr uint16 RATHEMTN = 50; // The Rathe Mountains
-	constexpr uint16 LAKERATHE = 51; // Lake Rathetear
-	constexpr uint16 GROBB = 52; // Grobb
-	constexpr uint16 AVIAK = 53; // Aviak Village
-	constexpr uint16 GFAYDARK = 54; // The Greater Faydark
-	constexpr uint16 AKANON = 55; // Ak'Anon
-	constexpr uint16 STEAMFONT = 56; // Steamfont Mountains
-	constexpr uint16 LFAYDARK = 57; // The Lesser Faydark
-	constexpr uint16 CRUSHBONE = 58; // Crushbone
-	constexpr uint16 MISTMOORE = 59; // The Castle of Mistmoore
-	constexpr uint16 KALADIMA = 60; // South Kaladim
-	constexpr uint16 FELWITHEA = 61; // Northern Felwithe
-	constexpr uint16 FELWITHEB = 62; // Southern Felwithe
-	constexpr uint16 UNREST = 63; // The Estate of Unrest
-	constexpr uint16 KEDGE = 64; // Kedge Keep
-	constexpr uint16 GUKTOP = 65; // The City of Guk
-	constexpr uint16 GUKBOTTOM = 66; // The Ruins of Old Guk
-	constexpr uint16 KALADIMB = 67; // North Kaladim
-	constexpr uint16 BUTCHER = 68; // Butcherblock Mountains
-	constexpr uint16 OOT = 69; // Ocean of Tears
-	constexpr uint16 CAULDRON = 70; // Dagnor's Cauldron
-	constexpr uint16 AIRPLANE = 71; // The Plane of Sky
-	constexpr uint16 FEARPLANE = 72; // The Plane of Fear
-	constexpr uint16 PERMAFROST = 73; // The Permafrost Caverns
-	constexpr uint16 KERRARIDGE = 74; // Kerra Isle
-	constexpr uint16 PAINEEL = 75; // Paineel
-	constexpr uint16 HATEPLANE = 76; // Plane of Hate
-	constexpr uint16 ARENA = 77; // The Arena
-	constexpr uint16 FIELDOFBONE = 78; // The Field of Bone
-	constexpr uint16 WARSLIKSWOOD = 79; // The Warsliks Woods
-	constexpr uint16 SOLTEMPLE = 80; // The Temple of Solusek Ro
-	constexpr uint16 DROGA = 81; // The Temple of Droga
-	constexpr uint16 CABWEST = 82; // Cabilis West
-	constexpr uint16 SWAMPOFNOHOPE = 83; // The Swamp of No Hope
-	constexpr uint16 FIRIONA = 84; // Firiona Vie
-	constexpr uint16 LAKEOFILLOMEN = 85; // Lake of Ill Omen
-	constexpr uint16 DREADLANDS = 86; // The Dreadlands
-	constexpr uint16 BURNINGWOOD = 87; // The Burning Wood
-	constexpr uint16 KAESORA = 88; // Kaesora
-	constexpr uint16 SEBILIS = 89; // The Ruins of Sebilis
-	constexpr uint16 CITYMIST = 90; // The City of Mist
-	constexpr uint16 SKYFIRE = 91; // The Skyfire Mountains
-	constexpr uint16 FRONTIERMTNS = 92; // Frontier Mountains
-	constexpr uint16 OVERTHERE = 93; // The Overthere
-	constexpr uint16 EMERALDJUNGLE = 94; // The Emerald Jungle
-	constexpr uint16 TRAKANON = 95; // Trakanon's Teeth
-	constexpr uint16 TIMOROUS = 96; // Timorous Deep
-	constexpr uint16 KURN = 97; // Kurn's Tower
-	constexpr uint16 ERUDSXING = 98; // Erud's Crossing
-	constexpr uint16 STONEBRUNT = 100; // The Stonebrunt Mountains
-	constexpr uint16 WARRENS = 101; // The Warrens
-	constexpr uint16 KARNOR = 102; // Karnor's Castle
-	constexpr uint16 CHARDOK = 103; // Chardok
-	constexpr uint16 DALNIR = 104; // The Crypt of Dalnir
-	constexpr uint16 CHARASIS = 105; // The Howling Stones
-	constexpr uint16 CABEAST = 106; // Cabilis East
-	constexpr uint16 NURGA = 107; // The Mines of Nurga
-	constexpr uint16 VEESHAN = 108; // Veeshan's Peak
-	constexpr uint16 VEKSAR = 109; // Veksar
-	constexpr uint16 ICECLAD = 110; // The Iceclad Ocean
-	constexpr uint16 FROZENSHADOW = 111; // The Tower of Frozen Shadow
-	constexpr uint16 VELKETOR = 112; // Velketor's Labyrinth
-	constexpr uint16 KAEL = 113; // Kael Drakkel
-	constexpr uint16 SKYSHRINE = 114; // Skyshrine
-	constexpr uint16 THURGADINA = 115; // The City of Thurgadin
-	constexpr uint16 EASTWASTES = 116; // Eastern Wastes
-	constexpr uint16 COBALTSCAR = 117; // Cobaltscar
-	constexpr uint16 GREATDIVIDE = 118; // The Great Divide
-	constexpr uint16 WAKENING = 119; // The Wakening Land
-	constexpr uint16 WESTWASTES = 120; // The Western Wastes
-	constexpr uint16 CRYSTAL = 121; // The Crystal Caverns
-	constexpr uint16 NECROPOLIS = 123; // Dragon Necropolis
-	constexpr uint16 TEMPLEVEESHAN = 124; // The Temple of Veeshan
-	constexpr uint16 SIRENS = 125; // Siren's Grotto
-	constexpr uint16 MISCHIEFPLANE = 126; // The Plane of Mischief
-	constexpr uint16 GROWTHPLANE = 127; // The Plane of Growth
-	constexpr uint16 SLEEPER = 128; // The Sleeper's Tomb
-	constexpr uint16 THURGADINB = 129; // Icewell Keep
-	constexpr uint16 ERUDSXING2 = 130; // Marauders Mire
-	constexpr uint16 SHADOWHAVEN = 150; // Shadow Haven
-	constexpr uint16 BAZAAR = 151; // The Bazaar
-	constexpr uint16 NEXUS = 152; // Nexus
-	constexpr uint16 ECHO_ = 153; // The Echo Caverns
-	constexpr uint16 ACRYLIA = 154; // The Acrylia Caverns
-	constexpr uint16 SHARVAHL = 155; // The City of Shar Vahl
-	constexpr uint16 PALUDAL = 156; // The Paludal Caverns
-	constexpr uint16 FUNGUSGROVE = 157; // The Fungus Grove
-	constexpr uint16 VEXTHAL = 158; // Vex Thal
-	constexpr uint16 SSERU = 159; // Sanctus Seru
-	constexpr uint16 KATTA = 160; // Katta Castellum
-	constexpr uint16 NETHERBIAN = 161; // Netherbian Lair
-	constexpr uint16 SSRATEMPLE = 162; // Ssraeshza Temple
-	constexpr uint16 GRIEGSEND = 163; // Grieg's End
-	constexpr uint16 THEDEEP = 164; // The Deep
-	constexpr uint16 SHADEWEAVER = 165; // Shadeweaver's Thicket
-	constexpr uint16 HOLLOWSHADE = 166; // Hollowshade Moor
-	constexpr uint16 GRIMLING = 167; // Grimling Forest
-	constexpr uint16 MSERU = 168; // Marus Seru
-	constexpr uint16 LETALIS = 169; // Mons Letalis
-	constexpr uint16 TWILIGHT = 170; // The Twilight Sea
-	constexpr uint16 THEGREY = 171; // The Grey
-	constexpr uint16 TENEBROUS = 172; // The Tenebrous Mountains
-	constexpr uint16 MAIDEN = 173; // The Maiden's Eye
-	constexpr uint16 DAWNSHROUD = 174; // The Dawnshroud Peaks
-	constexpr uint16 SCARLET = 175; // The Scarlet Desert
-	constexpr uint16 UMBRAL = 176; // The Umbral Plains
-	constexpr uint16 AKHEVA = 179; // The Akheva Ruins
-	constexpr uint16 ARENA2 = 180; // The Arena Two
-	constexpr uint16 JAGGEDPINE = 181; // The Jaggedpine Forest
-	constexpr uint16 NEDARIA = 182; // Nedaria's Landing
-	constexpr uint16 TUTORIAL = 183; // EverQuest Tutorial
-	constexpr uint16 LOAD = 184; // Loading Zone
-	constexpr uint16 LOAD2 = 185; // New Loading Zone
-	constexpr uint16 HATEPLANEB = 186; // The Plane of Hate
-	constexpr uint16 SHADOWREST = 187; // Shadowrest
-	constexpr uint16 TUTORIALA = 188; // The Mines of Gloomingdeep
-	constexpr uint16 TUTORIALB = 189; // The Mines of Gloomingdeep
-	constexpr uint16 CLZ = 190; // Loading
-	constexpr uint16 CODECAY = 200; // The Crypt of Decay
-	constexpr uint16 POJUSTICE = 201; // The Plane of Justice
-	constexpr uint16 POKNOWLEDGE = 202; // The Plane of Knowledge
-	constexpr uint16 POTRANQUILITY = 203; // The Plane of Tranquility
-	constexpr uint16 PONIGHTMARE = 204; // The Plane of Nightmares
-	constexpr uint16 PODISEASE = 205; // The Plane of Disease
-	constexpr uint16 POINNOVATION = 206; // The Plane of Innovation
-	constexpr uint16 POTORMENT = 207; // Torment, the Plane of Pain
-	constexpr uint16 POVALOR = 208; // The Plane of Valor
-	constexpr uint16 BOTHUNDER = 209; // Bastion of Thunder
-	constexpr uint16 POSTORMS = 210; // The Plane of Storms
-	constexpr uint16 HOHONORA = 211; // The Halls of Honor
-	constexpr uint16 SOLROTOWER = 212; // The Tower of Solusek Ro
-	constexpr uint16 POWAR = 213; // Plane of War
-	constexpr uint16 POTACTICS = 214; // Drunder, the Fortress of Zek
-	constexpr uint16 POAIR = 215; // The Plane of Air
-	constexpr uint16 POWATER = 216; // The Plane of Water
-	constexpr uint16 POFIRE = 217; // The Plane of Fire
-	constexpr uint16 POEARTHA = 218; // The Plane of Earth
-	constexpr uint16 POTIMEA = 219; // The Plane of Time
-	constexpr uint16 HOHONORB = 220; // The Temple of Marr
-	constexpr uint16 NIGHTMAREB = 221; // The Lair of Terris Thule
-	constexpr uint16 POEARTHB = 222; // The Plane of Earth
-	constexpr uint16 POTIMEB = 223; // The Plane of Time
-	constexpr uint16 GUNTHAK = 224; // The Gulf of Gunthak
-	constexpr uint16 DULAK = 225; // Dulak's Harbor
-	constexpr uint16 TORGIRAN = 226; // The Torgiran Mines
-	constexpr uint16 NADOX = 227; // The Crypt of Nadox
-	constexpr uint16 HATESFURY = 228; // Hate's Fury
-	constexpr uint16 GUKA = 229; // Deepest Guk: Cauldron of Lost Souls
-	constexpr uint16 RUJA = 230; // The Rujarkian Hills: Bloodied Quarries
-	constexpr uint16 TAKA = 231; // Takish-Hiz: Sunken Library
-	constexpr uint16 MIRA = 232; // Miragul's Menagerie: Silent Gallery
-	constexpr uint16 MMCA = 233; // Mistmoore's Catacombs: Forlorn Caverns
-	constexpr uint16 GUKB = 234; // The Drowning Crypt
-	constexpr uint16 RUJB = 235; // The Rujarkian Hills: Halls of War
-	constexpr uint16 TAKB = 236; // Takish-Hiz: Shifting Tower
-	constexpr uint16 MIRB = 237; // Miragul's Menagerie: Frozen Nightmare
-	constexpr uint16 MMCB = 238; // Mistmoore's Catacombs: Dreary Grotto
-	constexpr uint16 GUKC = 239; // Deepest Guk: Ancient Aqueducts
-	constexpr uint16 RUJC = 240; // The Rujarkian Hills: Wind Bridges
-	constexpr uint16 TAKC = 241; // Takish-Hiz: Within the Compact
-	constexpr uint16 MIRC = 242; // The Spider Den
-	constexpr uint16 MMCC = 243; // Mistmoore's Catacombs: Struggles within the Progeny
-	constexpr uint16 GUKD = 244; // The Mushroom Grove
-	constexpr uint16 RUJD = 245; // The Rujarkian Hills: Prison Break
-	constexpr uint16 TAKD = 246; // Takish-Hiz: Royal Observatory
-	constexpr uint16 MIRD = 247; // Miragul's Menagerie: Hushed Banquet
-	constexpr uint16 MMCD = 248; // Mistmoore's Catacombs: Chambers of Eternal Affliction
-	constexpr uint16 GUKE = 249; // Deepest Guk: The Curse Reborn
-	constexpr uint16 RUJE = 250; // The Rujarkian Hills: Drudge Hollows
-	constexpr uint16 TAKE = 251; // Takish-Hiz: River of Recollection
-	constexpr uint16 MIRE = 252; // The Frosted Halls
-	constexpr uint16 MMCE = 253; // Mistmoore's Catacombs: Sepulcher of the Damned
-	constexpr uint16 GUKF = 254; // Deepest Guk: Chapel of the Witnesses
-	constexpr uint16 RUJF = 255; // The Rujarkian Hills: Fortified Lair of the Taskmasters
-	constexpr uint16 TAKF = 256; // Takish-Hiz: Sandfall Corridors
-	constexpr uint16 MIRF = 257; // The Forgotten Wastes
-	constexpr uint16 MMCF = 258; // Mistmoore's Catacombs: Scion Lair of Fury
-	constexpr uint16 GUKG = 259; // The Root Garden
-	constexpr uint16 RUJG = 260; // The Rujarkian Hills: Hidden Vale of Deceit
-	constexpr uint16 TAKG = 261; // Takish-Hiz: Balancing Chamber
-	constexpr uint16 MIRG = 262; // Miragul's Menagerie: Heart of the Menagerie
-	constexpr uint16 MMCG = 263; // Mistmoore's Catacombs: Cesspits of Putrescence
-	constexpr uint16 GUKH = 264; // Deepest Guk: Accursed Sanctuary
-	constexpr uint16 RUJH = 265; // The Rujarkian Hills: Blazing Forge
-	constexpr uint16 TAKH = 266; // Takish-Hiz: Sweeping Tides
-	constexpr uint16 MIRH = 267; // The Morbid Laboratory
-	constexpr uint16 MMCH = 268; // Mistmoore's Catacombs: Aisles of Blood
-	constexpr uint16 RUJI = 269; // The Rujarkian Hills: Arena of Chance
-	constexpr uint16 TAKI = 270; // Takish-Hiz: Antiquated Palace
-	constexpr uint16 MIRI = 271; // The Theater of Imprisoned Horror
-	constexpr uint16 MMCI = 272; // Mistmoore's Catacombs: Halls of Sanguinary Rites
-	constexpr uint16 RUJJ = 273; // The Rujarkian Hills: Barracks of War
-	constexpr uint16 TAKJ = 274; // Takish-Hiz: Prismatic Corridors
-	constexpr uint16 MIRJ = 275; // Miragul's Menagerie: Grand Library
-	constexpr uint16 MMCJ = 276; // Mistmoore's Catacombs: Infernal Sanctuary
-	constexpr uint16 CHARDOKB = 277; // Chardok: The Halls of Betrayal
-	constexpr uint16 SOLDUNGC = 278; // The Caverns of Exile
-	constexpr uint16 ABYSMAL = 279; // The Abysmal Sea
-	constexpr uint16 NATIMBI = 280; // Natimbi, the Broken Shores
-	constexpr uint16 QINIMI = 281; // Qinimi, Court of Nihilia
-	constexpr uint16 RIWWI = 282; // Riwwi, Coliseum of Games
-	constexpr uint16 BARINDU = 283; // Barindu, Hanging Gardens
-	constexpr uint16 FERUBI = 284; // Ferubi, Forgotten Temple of Taelosia
-	constexpr uint16 SNPOOL = 285; // Sewers of Nihilia, Pool of Sludg
-	constexpr uint16 SNLAIR = 286; // Sewers of Nihilia, Lair of Trapp
-	constexpr uint16 SNPLANT = 287; // Sewers of Nihilia, Purifying Pla
-	constexpr uint16 SNCREMATORY = 288; // Sewers of Nihilia, Emanating Cre
-	constexpr uint16 TIPT = 289; // Tipt, Treacherous Crags
-	constexpr uint16 VXED = 290; // Vxed, the Crumbling Caverns
-	constexpr uint16 YXTTA = 291; // Yxtta, Pulpit of Exiles
-	constexpr uint16 UQUA = 292; // Uqua, the Ocean God Chantry
-	constexpr uint16 KODTAZ = 293; // Kod'Taz, Broken Trial Grounds
-	constexpr uint16 IKKINZ = 294; // Ikkinz, Chambers of Transcendence
-	constexpr uint16 QVIC = 295; // Qvic, Prayer Grounds of Calling
-	constexpr uint16 INKTUTA = 296; // Inktu'Ta, the Unmasked Chapel
-	constexpr uint16 TXEVU = 297; // Txevu, Lair of the Elite
-	constexpr uint16 TACVI = 298; // Tacvi, The Broken Temple
-	constexpr uint16 QVICB = 299; // Qvic, the Hidden Vault
-	constexpr uint16 WALLOFSLAUGHTER = 300; // Wall of Slaughter
-	constexpr uint16 BLOODFIELDS = 301; // The Bloodfields
-	constexpr uint16 DRANIKSSCAR = 302; // Dranik's Scar
-	constexpr uint16 CAUSEWAY = 303; // Nobles' Causeway
-	constexpr uint16 CHAMBERSA = 304; // Muramite Proving Grounds
-	constexpr uint16 CHAMBERSB = 305; // Muramite Proving Grounds
-	constexpr uint16 CHAMBERSC = 306; // Muramite Proving Grounds
-	constexpr uint16 CHAMBERSD = 307; // Muramite Proving Grounds
-	constexpr uint16 CHAMBERSE = 308; // Muramite Proving Grounds
-	constexpr uint16 CHAMBERSF = 309; // Muramite Proving Grounds
-	constexpr uint16 PROVINGGROUNDS = 316; // Muramite Proving Grounds
-	constexpr uint16 ANGUISH = 317; // Anguish, the Fallen Palace
-	constexpr uint16 DRANIKHOLLOWSA = 318; // Dranik's Hollows
-	constexpr uint16 DRANIKHOLLOWSB = 319; // Dranik's Hollows
-	constexpr uint16 DRANIKHOLLOWSC = 320; // Dranik's Hollows
-	constexpr uint16 DRANIKCATACOMBSA = 328; // Catacombs of Dranik
-	constexpr uint16 DRANIKCATACOMBSB = 329; // Catacombs of Dranik
-	constexpr uint16 DRANIKCATACOMBSC = 330; // Catacombs of Dranik
-	constexpr uint16 DRANIKSEWERSA = 331; // Sewers of Dranik
-	constexpr uint16 DRANIKSEWERSB = 332; // Sewers of Dranik
-	constexpr uint16 DRANIKSEWERSC = 333; // Sewers of Dranik
-	constexpr uint16 RIFTSEEKERS = 334; // Riftseekers' Sanctum
-	constexpr uint16 HARBINGERS = 335; // Harbinger's Spire
-	constexpr uint16 DRANIK = 336; // The Ruined City of Dranik
-	constexpr uint16 BROODLANDS = 337; // The Broodlands
-	constexpr uint16 STILLMOONA = 338; // Stillmoon Temple
-	constexpr uint16 STILLMOONB = 339; // The Ascent
-	constexpr uint16 THUNDERCREST = 340; // Thundercrest Isles
-	constexpr uint16 DELVEA = 341; // Lavaspinner's Lair
-	constexpr uint16 DELVEB = 342; // Tirranun's Delve
-	constexpr uint16 THENEST = 343; // The Nest
-	constexpr uint16 GUILDLOBBY = 344; // Guild Lobby
-	constexpr uint16 GUILDHALL = 345; // Guild Hall
-	constexpr uint16 BARTER = 346; // The Barter Hall
-	constexpr uint16 ILLSALIN = 347; // Ruins of Illsalin
-	constexpr uint16 ILLSALINA = 348; // Illsalin Marketplace
-	constexpr uint16 ILLSALINB = 349; // Temple of Korlach
-	constexpr uint16 ILLSALINC = 350; // The Nargil Pits
-	constexpr uint16 DREADSPIRE = 351; // Dreadspire Keep
-	constexpr uint16 DRACHNIDHIVE = 354; // The Hive
-	constexpr uint16 DRACHNIDHIVEA = 355; // The Hatchery
-	constexpr uint16 DRACHNIDHIVEB = 356; // The Cocoons
-	constexpr uint16 DRACHNIDHIVEC = 357; // Queen Sendaii`s Lair
-	constexpr uint16 WESTKORLACH = 358; // Stoneroot Falls
-	constexpr uint16 WESTKORLACHA = 359; // Prince's Manor
-	constexpr uint16 WESTKORLACHB = 360; // Caverns of the Lost
-	constexpr uint16 WESTKORLACHC = 361; // Lair of the Korlach
-	constexpr uint16 EASTKORLACH = 362; // The Undershore
-	constexpr uint16 EASTKORLACHA = 363; // Snarlstone Dens
-	constexpr uint16 SHADOWSPINE = 364; // Shadow Spine
-	constexpr uint16 CORATHUS = 365; // Corathus Creep
-	constexpr uint16 CORATHUSA = 366; // Sporali Caverns
-	constexpr uint16 CORATHUSB = 367; // The Corathus Mines
-	constexpr uint16 NEKTULOSA = 368; // Shadowed Grove
-	constexpr uint16 ARCSTONE = 369; // Arcstone, Isle of Spirits
-	constexpr uint16 RELIC = 370; // Relic, the Artifact City
-	constexpr uint16 SKYLANCE = 371; // Skylance
-	constexpr uint16 DEVASTATION = 372; // The Devastation
-	constexpr uint16 DEVASTATIONA = 373; // The Seething Wall
-	constexpr uint16 RAGE = 374; // Sverag, Stronghold of Rage
-	constexpr uint16 RAGEA = 375; // Razorthorn, Tower of Sullon Zek
-	constexpr uint16 TAKISHRUINS = 376; // Ruins of Takish-Hiz
-	constexpr uint16 TAKISHRUINSA = 377; // The Root of Ro
-	constexpr uint16 ELDDAR = 378; // The Elddar Forest
-	constexpr uint16 ELDDARA = 379; // Tunare's Shrine
-	constexpr uint16 THEATER = 380; // Theater of Blood
-	constexpr uint16 THEATERA = 381; // Deathknell, Tower of Dissonance
-	constexpr uint16 FREEPORTEAST = 382; // East Freeport
-	constexpr uint16 FREEPORTWEST = 383; // West Freeport
-	constexpr uint16 FREEPORTSEWERS = 384; // Freeport Sewers
-	constexpr uint16 FREEPORTACADEMY = 385; // Academy of Arcane Sciences
-	constexpr uint16 FREEPORTTEMPLE = 386; // Temple of Marr
-	constexpr uint16 FREEPORTMILITIA = 387; // Freeport Militia House: My Precious
-	constexpr uint16 FREEPORTARENA = 388; // Arena
-	constexpr uint16 FREEPORTCITYHALL = 389; // City Hall
-	constexpr uint16 FREEPORTTHEATER = 390; // Theater of the Tranquil
-	constexpr uint16 FREEPORTHALL = 391; // Hall of Truth: Bounty
-	constexpr uint16 NORTHRO = 392; // North Desert of Ro
-	constexpr uint16 SOUTHRO = 393; // South Desert of Ro
-	constexpr uint16 CRESCENT = 394; // Crescent Reach
-	constexpr uint16 MOORS = 395; // Blightfire Moors
-	constexpr uint16 STONEHIVE = 396; // Stone Hive
-	constexpr uint16 MESA = 397; // Goru`kar Mesa
-	constexpr uint16 ROOST = 398; // Blackfeather Roost
-	constexpr uint16 STEPPES = 399; // The Steppes
-	constexpr uint16 ICEFALL = 400; // Icefall Glacier
-	constexpr uint16 VALDEHOLM = 401; // Valdeholm
-	constexpr uint16 FROSTCRYPT = 402; // Frostcrypt, Throne of the Shade King
-	constexpr uint16 SUNDEROCK = 403; // Sunderock Springs
-	constexpr uint16 VERGALID = 404; // Vergalid Mines
-	constexpr uint16 DIREWIND = 405; // Direwind Cliffs
-	constexpr uint16 ASHENGATE = 406; // Ashengate, Reliquary of the Scale
-	constexpr uint16 HIGHPASSHOLD = 407; // Highpass Hold
-	constexpr uint16 COMMONLANDS = 408; // The Commonlands
-	constexpr uint16 OCEANOFTEARS = 409; // The Ocean of Tears
-	constexpr uint16 KITHFOREST = 410; // Kithicor Forest
-	constexpr uint16 BEFALLENB = 411; // Befallen
-	constexpr uint16 HIGHPASSKEEP = 412; // HighKeep
-	constexpr uint16 INNOTHULEB = 413; // The Innothule Swamp
-	constexpr uint16 TOXXULIA = 414; // Toxxulia Forest
-	constexpr uint16 MISTYTHICKET = 415; // The Misty Thicket
-	constexpr uint16 KATTACASTRUM = 416; // Katta Castrum
-	constexpr uint16 THALASSIUS = 417; // Thalassius, the Coral Keep
-	constexpr uint16 ATIIKI = 418; // Jewel of Atiiki
-	constexpr uint16 ZHISZA = 419; // Zhisza, the Shissar Sanctuary
-	constexpr uint16 SILYSSAR = 420; // Silyssar, New Chelsith
-	constexpr uint16 SOLTERIS = 421; // Solteris, the Throne of Ro
-	constexpr uint16 BARREN = 422; // Barren Coast
-	constexpr uint16 BURIEDSEA = 423; // The Buried Sea
-	constexpr uint16 JARDELSHOOK = 424; // Jardel's Hook
-	constexpr uint16 MONKEYROCK = 425; // Monkey Rock
-	constexpr uint16 SUNCREST = 426; // Suncrest Isle
-	constexpr uint16 DEADBONE = 427; // Deadbone Reef
-	constexpr uint16 BLACKSAIL = 428; // Blacksail Folly
-	constexpr uint16 MAIDENSGRAVE = 429; // Maiden's Grave
-	constexpr uint16 REDFEATHER = 430; // Redfeather Isle
-	constexpr uint16 SHIPMVP = 431; // The Open Sea
-	constexpr uint16 SHIPMVU = 432; // The Open Sea
-	constexpr uint16 SHIPPVU = 433; // The Open Sea
-	constexpr uint16 SHIPUVU = 434; // The Open Sea
-	constexpr uint16 SHIPMVM = 435; // The Open Sea
-	constexpr uint16 MECHANOTUS = 436; // Fortress Mechanotus
-	constexpr uint16 MANSION = 437; // Meldrath's Majestic Mansion
-	constexpr uint16 STEAMFACTORY = 438; // The Steam Factory
-	constexpr uint16 SHIPWORKSHOP = 439; // S.H.I.P. Workshop
-	constexpr uint16 GYROSPIREB = 440; // Gyrospire Beza
-	constexpr uint16 GYROSPIREZ = 441; // Gyrospire Zeka
-	constexpr uint16 DRAGONSCALE = 442; // Dragonscale Hills
-	constexpr uint16 LOPINGPLAINS = 443; // Loping Plains
-	constexpr uint16 HILLSOFSHADE = 444; // Hills of Shade
-	constexpr uint16 BLOODMOON = 445; // Bloodmoon Keep
-	constexpr uint16 CRYSTALLOS = 446; // Crystallos, Lair of the Awakened
-	constexpr uint16 GUARDIAN = 447; // The Mechamatic Guardian
-	constexpr uint16 STEAMFONTMTS = 448; // The Steamfont Mountains
-	constexpr uint16 CRYPTOFSHADE = 449; // Crypt of Shade
-	constexpr uint16 DRAGONSCALEB = 451; // Deepscar's Den
-	constexpr uint16 OLDFIELDOFBONE = 452; // Field of Scale
-	constexpr uint16 OLDKAESORAA = 453; // Kaesora Library
-	constexpr uint16 OLDKAESORAB = 454; // Kaesora Hatchery
-	constexpr uint16 OLDKURN = 455; // Kurn's Tower
-	constexpr uint16 OLDKITHICOR = 456; // Bloody Kithicor
-	constexpr uint16 OLDCOMMONS = 457; // Old Commonlands
-	constexpr uint16 OLDHIGHPASS = 458; // Highpass Hold
-	constexpr uint16 THEVOIDA = 459; // The Void
-	constexpr uint16 THEVOIDB = 460; // The Void
-	constexpr uint16 THEVOIDC = 461; // The Void
-	constexpr uint16 THEVOIDD = 462; // The Void
-	constexpr uint16 THEVOIDE = 463; // The Void
-	constexpr uint16 THEVOIDF = 464; // The Void
-	constexpr uint16 THEVOIDG = 465; // The Void
-	constexpr uint16 OCEANGREENHILLS = 466; // Oceangreen Hills
-	constexpr uint16 OCEANGREENVILLAGE = 467; // Oceangreen Village
-	constexpr uint16 OLDBLACKBURROW = 468; // BlackBurrow
-	constexpr uint16 BERTOXTEMPLE = 469; // Temple of Bertoxxulous
-	constexpr uint16 DISCORD = 470; // Korafax, Home of the Riders
-	constexpr uint16 DISCORDTOWER = 471; // Citadel of the Worldslayer
-	constexpr uint16 OLDBLOODFIELD = 472; // Old Bloodfields
-	constexpr uint16 PRECIPICEOFWAR = 473; // The Precipice of War
-	constexpr uint16 OLDDRANIK = 474; // City of Dranik
-	constexpr uint16 TOSKIRAKK = 475; // Toskirakk
-	constexpr uint16 KORASCIAN = 476; // Korascian Warrens
-	constexpr uint16 RATHECHAMBER = 477; // Rathe Council Chamber
-	constexpr uint16 BRELLSREST = 480; // Brell's Rest
-	constexpr uint16 FUNGALFOREST = 481; // Fungal Forest
-	constexpr uint16 UNDERQUARRY = 482; // The Underquarry
-	constexpr uint16 COOLINGCHAMBER = 483; // The Cooling Chamber
-	constexpr uint16 SHININGCITY = 484; // Kernagir, the Shining City
-	constexpr uint16 ARTHICREX = 485; // Arthicrex
-	constexpr uint16 FOUNDATION = 486; // The Foundation
-	constexpr uint16 LICHENCREEP = 487; // Lichen Creep
-	constexpr uint16 PELLUCID = 488; // Pellucid Grotto
-	constexpr uint16 STONESNAKE = 489; // Volska's Husk
-	constexpr uint16 BRELLSTEMPLE = 490; // Brell's Temple
-	constexpr uint16 CONVORTEUM = 491; // The Convorteum
-	constexpr uint16 BRELLSARENA = 492; // Brell's Arena
-	constexpr uint16 WEDDINGCHAPEL = 493; // Wedding Chapel
-	constexpr uint16 WEDDINGCHAPELDARK = 494; // Wedding Chapel
-	constexpr uint16 DRAGONCRYPT = 495; // Lair of the Risen
-	constexpr uint16 FEERROTT2 = 700; // The Feerrott
-	constexpr uint16 THULEHOUSE1 = 701; // House of Thule
-	constexpr uint16 THULEHOUSE2 = 702; // House of Thule, Upper Floors
-	constexpr uint16 HOUSEGARDEN = 703; // The Grounds
-	constexpr uint16 THULELIBRARY = 704; // The Library
-	constexpr uint16 WELL = 705; // The Well
-	constexpr uint16 FALLEN = 706; // Erudin Burning
-	constexpr uint16 MORELLCASTLE = 707; // Morell's Castle
-	constexpr uint16 SOMNIUM = 708; // Sanctum Somnium
-	constexpr uint16 ALKABORMARE = 709; // Al'Kabor's Nightmare
-	constexpr uint16 MIRAGULMARE = 710; // Miragul's Nightmare
-	constexpr uint16 THULEDREAM = 711; // Fear Itself
-	constexpr uint16 NEIGHBORHOOD = 712; // Sunrise Hills
-	constexpr uint16 ARGATH = 724; // Argath, Bastion of Illdaera
-	constexpr uint16 ARELIS = 725; // Valley of Lunanyn
-	constexpr uint16 SARITHCITY = 726; // Sarith, City of Tides
-	constexpr uint16 RUBAK = 727; // Rubak Oseka, Temple of the Sea
-	constexpr uint16 BEASTDOMAIN = 728; // Beasts' Domain
-	constexpr uint16 RESPLENDENT = 729; // The Resplendent Temple
-	constexpr uint16 PILLARSALRA = 730; // Pillars of Alra
-	constexpr uint16 WINDSONG = 731; // Windsong Sanctuary
-	constexpr uint16 CITYOFBRONZE = 732; // Erillion, City of Bronze
-	constexpr uint16 SEPULCHER = 733; // Sepulcher of Order
-	constexpr uint16 EASTSEPULCHER = 734; // Sepulcher East
-	constexpr uint16 WESTSEPULCHER = 735; // Sepulcher West
-	constexpr uint16 SHARDSLANDING = 752; // Shard's Landing
-	constexpr uint16 XORBB = 753; // Valley of King Xorbb
-	constexpr uint16 KAELSHARD = 754; // Kael Drakkel: The King's Madness
-	constexpr uint16 EASTWASTESSHARD = 755; // East Wastes: Zeixshi-Kar's Awakening
-	constexpr uint16 CRYSTALSHARD = 756; // The Crystal Caverns: Fragment of Fear
-	constexpr uint16 BREEDINGGROUNDS = 757; // The Breeding Grounds
-	constexpr uint16 EVILTREE = 758; // Evantil, the Vile Oak
-	constexpr uint16 GRELLETH = 759; // Grelleth's Palace, the Chateau of Filth
-	constexpr uint16 CHAPTERHOUSE = 760; // Chapterhouse of the Fallen
-	constexpr uint16 ARTTEST = 996; // Art Testing Domain
-	constexpr uint16 FHALLS = 998; // The Forgotten Halls
-	constexpr uint16 APPRENTICE = 999; // Designer Apprentice
-}
+//ZoneChange_Struct->success values
+#define ZONE_ERROR_NOMSG 0
+#define ZONE_ERROR_NOTREADY -1
+#define ZONE_ERROR_VALIDPC -2
+#define ZONE_ERROR_STORYZONE -3
+#define ZONE_ERROR_NOEXPANSION -6
+#define ZONE_ERROR_NOEXPERIENCE -7

-namespace Language {
-	constexpr uint8 CommonTongue  = 0;
-	constexpr uint8 Barbarian     = 1;
-	constexpr uint8 Erudian       = 2;
-	constexpr uint8 Elvish        = 3;
-	constexpr uint8 DarkElvish    = 4;
-	constexpr uint8 Dwarvish      = 5;
-	constexpr uint8 Troll         = 6;
-	constexpr uint8 Ogre          = 7;
-	constexpr uint8 Gnomish       = 8;
-	constexpr uint8 Halfling      = 9;
-	constexpr uint8 ThievesCant   = 10;
-	constexpr uint8 OldErudian    = 11;
-	constexpr uint8 ElderElvish   = 12;
-	constexpr uint8 Froglok       = 13;
-	constexpr uint8 Goblin        = 14;
-	constexpr uint8 Gnoll         = 15;
-	constexpr uint8 CombineTongue = 16;
-	constexpr uint8 ElderTeirDal  = 17;
-	constexpr uint8 Lizardman     = 18;
-	constexpr uint8 Orcish        = 19;
-	constexpr uint8 Faerie        = 20;
-	constexpr uint8 Dragon        = 21;
-	constexpr uint8 ElderDragon   = 22;
-	constexpr uint8 DarkSpeech    = 23;
-	constexpr uint8 VahShir       = 24;
-	constexpr uint8 Alaran        = 25;
-	constexpr uint8 Hadal         = 26;
-	constexpr uint8 Unknown27     = 27;
-
-	constexpr uint8 MaxValue = 100;
-}
-namespace PetInfoType {
-	constexpr int Current   = 0;
-	constexpr int Suspended = 1;
-}
-
-namespace BuffEffectType {
-	constexpr uint8 None        = 0;
-	constexpr uint8 Buff        = 2;
-	constexpr uint8 InverseBuff = 4;
-}
-
-namespace AlternateCurrencyMode {
-	constexpr uint32 Update   = 7;
-	constexpr uint32 Populate = 8;
-}

 typedef enum {
 	FilterNone = 0,
@@ -757,7 +231,7 @@ typedef enum {
 	FilterPetMisses = 21,		//0=show, 1=hide
 	FilterFocusEffects = 22,	//0=show, 1=hide
 	FilterPetSpells = 23,		//0=show, 1=hide
-	FilterHealOverTime = 24,	//0=show, 1=mine only, 2=hide
+	FilterHealOverTime = 24,	//0=show, 1=hide
 	FilterUnknown25 = 25,
 	FilterUnknown26 = 26,
 	FilterUnknown27 = 27,
@@ -964,9 +438,12 @@ static const uint8 SkillDamageTypes[EQ::skills::HIGHEST_SKILL + 1] = // change t

 static const uint32 MAX_SPELL_DB_ID_VAL = 65535;

-static const uint32 DB_FACTION_GEM_CHOPPERS = 255;
-static const uint32 DB_FACTION_HERETICS = 265;
-static const uint32 DB_FACTION_KING_AKANON = 333;
+static const uint32 DB_SPELL_CAZIC_TOUCH = 982;
+static const uint32 DB_SPELL_TOUCH_OF_VINITRAS = 2859;
+
+static const uint32  DB_FACTION_GEM_CHOPPERS = 255;
+static const uint32  DB_FACTION_HERETICS = 265;
+static const uint32  DB_FACTION_KING_AKANON = 333;

 enum ChatChannelNames : uint16
 {
@@ -1013,122 +490,4 @@ enum class DynamicZoneMemberStatus : uint8_t
 	LinkDead
 };

-enum LDoNThemes {
-	Unused = 0,
-	GUK,
-	MIR,
-	MMC,
-	RUJ,
-	TAK
-};
-
-enum LDoNThemeBits {
-	UnusedBit = 0,
-	GUKBit = 1,
-	MIRBit = 2,
-	MMCBit = 4,
-	RUJBit = 8,
-	TAKBit = 16
-};
-
-enum StartZoneIndex {
-    Odus = 0,
-    Qeynos,
-    Halas,
-    Rivervale,
-    Freeport,
-    Neriak,
-    Grobb,
-    Oggok,
-    Kaladim,
-    GreaterFaydark,
-    Felwithe,
-    Akanon,
-    Cabilis,
-    SharVahl
-};
-
-enum FVNoDropFlagRule
-{
-	Disabled = 0,
-	Enabled = 1,
-	AdminOnly = 2
-};
-
-enum Anonymity : uint8
-{
-	NotAnonymous,
-	Anonymous,
-	Roleplaying
-};
-
-enum ZoningMessage : int8 {
-	ZoneNoMessage    = 0,
-	ZoneSuccess      = 1,
-	ZoneNotReady     = -1,
-	ZoneValidPC      = -2,
-	ZoneStoryZone    = -3,
-	ZoneNoExpansion  = -6,
-	ZoneNoExperience = -7
-};
-
-enum class RecipeCountType : uint8
-{
-	Component,
-	Container,
-	Fail,
-	Salvage,
-	Success
-};
-
-#define ALT_CURRENCY_ID_RADIANT 4
-#define ALT_CURRENCY_ID_EBON 5
-
-enum ResurrectionActions
-{
-	Decline,
-	Accept
-};
-
-enum ScribeSpellActions
-{
-	Scribe,
-	Memorize,
-	Unmemorize
-};
-
-enum SpellTimeRestrictions
-{
-	NoRestriction,
-	Day,
-	Night
-};
-
-enum MoneyTypes
-{
-	Copper,
-	Silver,
-	Gold,
-	Platinum
-};
-
-enum MoneySubtypes
-{
-	Personal,
-	Bank,
-	Cursor,
-	SharedBank // Platinum Only
-};
-
-namespace RaidLootType {
-	constexpr uint32 LeaderOnly                = 1;
-	constexpr uint32 LeaderAndGroupLeadersOnly = 2;
-	constexpr uint32 LeaderSelected            = 3;
-	constexpr uint32 EntireRaid                = 4;
-}
-
-namespace LeadershipAbilitySlot {
-	constexpr uint16 HealthOfTargetsTarget = 14;
-}
-
 #endif /*COMMON_EQ_CONSTANTS_H*/
@@ -1,5 +1,5 @@
 /*	EQEMu: Everquest Server Emulator
-
+	
 	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)

 	This program is free software; you can redistribute it and/or modify
@@ -11,7 +11,7 @@
 	are required to give you total support for your newly bought product;
 	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
 	A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
+	
 	You should have received a copy of the GNU General Public License
 	along with this program; if not, write to the Free Software
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
@@ -26,7 +26,7 @@

 static bool global_dictionary_init = false;
 void EQ::InitializeDynamicLookups() {
-	if (global_dictionary_init)
+	if (global_dictionary_init == true)
 		return;

 	constants::InitializeDynamicLookups();
@@ -167,7 +167,7 @@ static const EQ::inventory::LookupEntry inventory_static_lookup_entries[EQ::vers
 			ClientUnknown::INULL, ClientUnknown::INULL, ClientUnknown::INULL,
 			ClientUnknown::INULL
 		),
-
+		
 		ClientUnknown::INULL,
 		ClientUnknown::INULL,
 		ClientUnknown::INULL,
@@ -175,7 +175,7 @@ static const EQ::inventory::LookupEntry inventory_static_lookup_entries[EQ::vers
 		ClientUnknown::INULL,
 		ClientUnknown::INULL,
 		ClientUnknown::INULL,
-
+		
 		false,
 		false,
 		false,
@@ -194,7 +194,7 @@ static const EQ::inventory::LookupEntry inventory_static_lookup_entries[EQ::vers
 			Client62::INULL, Client62::INULL, Client62::INULL,
 			Client62::INULL
 		),
-
+		
 		Client62::INULL,
 		Client62::INULL,
 		Client62::INULL,
@@ -202,7 +202,7 @@ static const EQ::inventory::LookupEntry inventory_static_lookup_entries[EQ::vers
 		Client62::INULL,
 		Client62::INULL,
 		Client62::INULL,
-
+		
 		false,
 		false,
 		false,
@@ -221,7 +221,7 @@ static const EQ::inventory::LookupEntry inventory_static_lookup_entries[EQ::vers
 			Titanium::INULL,						Titanium::INULL,						Titanium::INULL,
 			Titanium::invtype::OTHER_SIZE
 		),
-
+		
 		Titanium::invslot::EQUIPMENT_BITMASK,
 		Titanium::invslot::GENERAL_BITMASK,
 		Titanium::invslot::CURSOR_BITMASK,
@@ -229,7 +229,7 @@ static const EQ::inventory::LookupEntry inventory_static_lookup_entries[EQ::vers
 		Titanium::invslot::CORPSE_BITMASK,
 		Titanium::invbag::SLOT_COUNT,
 		Titanium::invaug::SOCKET_COUNT,
-
+		
 		Titanium::inventory::AllowEmptyBagInBag,
 		Titanium::inventory::AllowClickCastFromBag,
 		Titanium::inventory::ConcatenateInvTypeLimbo,
@@ -248,7 +248,7 @@ static const EQ::inventory::LookupEntry inventory_static_lookup_entries[EQ::vers
 			SoF::INULL,							SoF::INULL,							SoF::INULL,
 			SoF::invtype::OTHER_SIZE
 		),
-
+		
 		SoF::invslot::EQUIPMENT_BITMASK,
 		SoF::invslot::GENERAL_BITMASK,
 		SoF::invslot::CURSOR_BITMASK,
@@ -256,7 +256,7 @@ static const EQ::inventory::LookupEntry inventory_static_lookup_entries[EQ::vers
 		SoF::invslot::CORPSE_BITMASK,
 		SoF::invbag::SLOT_COUNT,
 		SoF::invaug::SOCKET_COUNT,
-
+		
 		SoF::inventory::AllowEmptyBagInBag,
 		SoF::inventory::AllowClickCastFromBag,
 		SoF::inventory::ConcatenateInvTypeLimbo,
@@ -763,7 +763,7 @@ void EQ::inventory::InitializeDynamicLookups() {
 	// Notes:
 	// - Currently, there are only 3 known expansions that affect inventory-related settings in the clients..
 	//   -- Expansion::PoR "Prophecy of Ro" - toggles between 24 (set) and 16 (clear) bank slots
-	//   -- Expansion::TBS "The Buried Sea" - toggles slotPowerSource activated (set) and deactivated (clear)
+	//   -- Expansion::TBS "The Buried Sea" - toggles slotPowerSource activated (set) and deactivated (clear) 
 	//   -- Expansion::HoT "House of Thule" - toggles slotGeneral9/slotGeneral10 activated (set) and deactivated (clear)
 	// - Corspe size does not appear to reflect loss of active possessions slots
 	// - Inspect size does not appear to reflect loss of active equipment slots
@@ -772,7 +772,7 @@ void EQ::inventory::InitializeDynamicLookups() {
 	// - General9 and General10 slots are activated by GM flag when expansion bit is (clear)
 	// - Obviously, the client must support the expansion to allow any (set) or override condition

-	const uint32 dynamic_check_mask =
+	const uint32 dynamic_check_mask = 
 		(
 			EQ::expansions::bitPoR |
 			EQ::expansions::bitTBS |
@@ -1210,10 +1210,10 @@ void EQ::spells::InitializeDynamicLookups() {
 	if (spells_dictionary_init == true)
 		return;
 	spells_dictionary_init = true;
-
+	
 	if (RuleB(World, UseClientBasedExpansionSettings))
 		return;
-
+	
 	// use static references for now
 }

@@ -1239,7 +1239,7 @@ const EQ::spells::LookupEntry* EQ::spells::DynamicGMLookup(versions::ClientVersi
 	client_version = versions::ValidateClientVersion(client_version);
 	if (spells_dynamic_gm_lookup_entries[static_cast<int>(client_version)])
 		return spells_dynamic_gm_lookup_entries[static_cast<int>(client_version)].get();
-
+	
 	return &spells_static_lookup_entries[static_cast<int>(client_version)];
 }

@@ -129,7 +129,7 @@ namespace EQ

 			LookupEntry(const LookupEntry *lookup_entry) { }
 			LookupEntry(
-				const InventoryTypeSize_Struct& InventoryTypeSize,
+				InventoryTypeSize_Struct InventoryTypeSize,
 				uint64 EquipmentBitmask,
 				uint64 GeneralBitmask,
 				uint64 CursorBitmask,
@@ -236,6 +236,26 @@ uint32 EQApplicationPacket::serialize(uint16 opcode, unsigned char *dest) const
 	return size+OpCodeBytes;
 }

+/*EQProtocolPacket::EQProtocolPacket(uint16 op, const unsigned char *buf, uint32 len)
+:	BasePacket(buf, len),
+	opcode(op)
+{
+
+uint32 offset;
+	opcode=ntohs(*(const uint16 *)buf);
+	offset=2;
+
+	if (len-offset) {
+		pBuffer= new unsigned char[len-offset];
+		memcpy(pBuffer,buf+offset,len-offset);
+		size=len-offset;
+	} else {
+		pBuffer=nullptr;
+		size=0;
+	}
+	OpMgr=&RawOpcodeManager;
+}*/
+
 bool EQProtocolPacket::combine(const EQProtocolPacket *rhs)
 {
 bool result=false;
@@ -267,6 +287,74 @@ bool result=false;

 }

+/*
+this is the code to do app-layer combining, instead of protocol layer.
+this was taken out due to complex interactions with the opcode manager,
+and will require a bit more thinking (likely moving into EQStream) to
+get running again... but might be a good thing some day.
+
+bool EQApplicationPacket::combine(const EQApplicationPacket *rhs)
+{
+uint32 newsize=0, offset=0;
+unsigned char *tmpbuffer=nullptr;
+
+	if (opcode!=OP_AppCombined) {
+		newsize=app_opcode_size+size+(size>254?3:1)+app_opcode_size+rhs->size+(rhs->size>254?3:1);
+		tmpbuffer=new unsigned char [newsize];
+		offset=0;
+		if (size>254) {
+			tmpbuffer[offset++]=0xff;
+			*(uint16 *)(tmpbuffer+offset)=htons(size);
+			offset+=1;
+		} else {
+			tmpbuffer[offset++]=size;
+		}
+		offset+=serialize(tmpbuffer+offset);
+	} else {
+		newsize=size+app_opcode_size+rhs->size+(rhs->size>254?3:1);
+		tmpbuffer=new unsigned char [newsize];
+		memcpy(tmpbuffer,pBuffer,size);
+		offset=size;
+	}
+
+	if (rhs->size>254) {
+		tmpbuffer[offset++]=0xff;
+		*(uint16 *)(tmpbuffer+offset)=htons(rhs->size);
+		offset+=1;
+	} else {
+		tmpbuffer[offset++]=rhs->size;
+	}
+	offset+=rhs->serialize(tmpbuffer+offset);
+
+	size=offset;
+	opcode=OP_AppCombined;
+
+	delete[] pBuffer;
+	pBuffer=tmpbuffer;
+
+	return true;
+}
+*/
+
+bool EQProtocolPacket::ValidateCRC(const unsigned char *buffer, int length, uint32 Key)
+{
+bool valid=false;
+	// OP_SessionRequest, OP_SessionResponse, OP_OutOfSession are not CRC'd
+	if (buffer[0]==0x00 && (buffer[1]==OP_SessionRequest || buffer[1]==OP_SessionResponse || buffer[1]==OP_OutOfSession)) {
+		valid=true;
+	} else {
+		uint16 comp_crc=CRC16(buffer,length-2,Key);
+		uint16 packet_crc=ntohs(*(const uint16 *)(buffer+length-2));
+#ifdef EQN_DEBUG
+		if (packet_crc && comp_crc != packet_crc) {
+			std::cout << "CRC mismatch: comp=" << std::hex << comp_crc << ", packet=" << packet_crc << std::dec << std::endl;
+		}
+#endif
+		valid = (!packet_crc || comp_crc == packet_crc);
+	}
+	return valid;
+}
+
 uint32 EQProtocolPacket::Decompress(const unsigned char *buffer, const uint32 length, unsigned char *newbuf, uint32 newbufsize)
 {
 uint32 newlen=0;
@@ -315,6 +403,55 @@ uint32 flag_offset=1,newlength;
 	return newlength;
 }

+void EQProtocolPacket::ChatDecode(unsigned char *buffer, int size, int DecodeKey)
+{
+	if ((size >= 2) && buffer[1]!=0x01 && buffer[0]!=0x02 && buffer[0]!=0x1d) {
+		int Key=DecodeKey;
+		unsigned char *test=(unsigned char *)malloc(size);
+		buffer+=2;
+		size-=2;
+
+		int i;
+		for (i = 0 ; i+4 <= size ; i+=4)
+		{
+			int pt = (*(int*)&buffer[i])^(Key);
+			Key = (*(int*)&buffer[i]);
+			*(int*)&test[i]=pt;
+		}
+		unsigned char KC=Key&0xFF;
+		for ( ; i < size ; i++)
+		{
+			test[i]=buffer[i]^KC;
+		}
+		memcpy(buffer,test,size);
+		free(test);
+	}
+}
+
+void EQProtocolPacket::ChatEncode(unsigned char *buffer, int size, int EncodeKey)
+{
+	if (buffer[1]!=0x01 && buffer[0]!=0x02 && buffer[0]!=0x1d) {
+		int Key=EncodeKey;
+		char *test=(char*)malloc(size);
+		int i;
+		buffer+=2;
+		size-=2;
+		for ( i = 0 ; i+4 <= size ; i+=4)
+		{
+			int pt = (*(int*)&buffer[i])^(Key);
+			Key = pt;
+			*(int*)&test[i]=pt;
+		}
+		unsigned char KC=Key&0xFF;
+		for ( ; i < size ; i++)
+		{
+			test[i]=buffer[i]^KC;
+		}
+		memcpy(buffer,test,size);
+		free(test);
+	}
+}
+
 EQApplicationPacket *EQApplicationPacket::Copy() const {
 	return(new EQApplicationPacket(*this));
 }
@@ -378,4 +515,4 @@ std::string DumpPacketToString(const EQApplicationPacket* app){
 	std::ostringstream out;
 	out << DumpPacketHexToString(app->pBuffer, app->size);
 	return out.str();
-}
+}
@@ -80,8 +80,11 @@ public:

 protected:

+	static bool ValidateCRC(const unsigned char *buffer, int length, uint32 Key);
 	static uint32 Decompress(const unsigned char *buffer, const uint32 length, unsigned char *newbuf, uint32 newbufsize);
 	static uint32 Compress(const unsigned char *buffer, const uint32 length, unsigned char *newbuf, uint32 newbufsize);
+	static void ChatDecode(unsigned char *buffer, int size, int DecodeKey);
+	static void ChatEncode(unsigned char *buffer, int size, int EncodeKey);

 	uint16 GetRawOpcode() const { return(opcode); }

@@ -29,7 +29,7 @@
 #include "textures.h"


-static const uint32 BUFF_COUNT = 42;
+static const uint32 BUFF_COUNT = 25;
 static const uint32 PET_BUFF_COUNT = 30;
 static const uint32 MAX_MERC = 100;
 static const uint32 MAX_MERC_GRADES = 10;
@@ -124,12 +124,6 @@ struct LDoNTrapTemplate
 	uint8 locked;
 };

-enum CrystalReclaimTypes
-{
-	Ebon = 5,
-	Radiant = 4,
-};
-
 ///////////////////////////////////////////////////////////////////////////////


@@ -314,7 +308,6 @@ union
 	uint32 DestructibleUnk9;
 	bool targetable_with_hotkey;
 	bool show_name;
-	bool guild_show;
 };

 struct PlayerState_Struct {
@@ -381,19 +374,17 @@ struct NewZone_Struct {
 /*0684*/	uint16	zone_id;
 /*0686*/	uint16	zone_instance;
 /*0688*/	uint32	unknown688;
-/*0692*/	uint8  unknown692[8];
+/*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 suspend_buffs;
-/*0708*/	uint32 fast_regen_hp;
-/*0712*/	uint32 fast_regen_mana;
-/*0716*/	uint32 fast_regen_endurance;
-/*0720*/	uint32 npc_aggro_max_dist;
-/*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*/	uint32 lava_damage; // Seen 50
-/*0732*/	uint32 min_lava_damage; // Seen 10
-/*0736*/	float safe_heading;
+/*0700*/	float	fog_density;
+/*0704*/	uint32	SuspendBuffs;
+/*0708*/	uint32	FastRegenHP;
+/*0712*/	uint32	FastRegenMana;
+/*0716*/	uint32	FastRegenEndurance;
+/*0720*/	uint32	NPCAggroMaxDist;
+/*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*/
 };

 /*
@@ -455,7 +446,6 @@ struct ManaChange_Struct
 /*08*/	uint32	spell_id;
 /*12*/	uint8	keepcasting;	// won't stop the cast. Change mana while casting?
 /*13*/	uint8	padding[3];		// client doesn't read it, garbage data seems like
-/*16*/	int32	slot;			// -1 normal, otherwise clear ETA and GCD
 };

 struct SwapSpell_Struct
@@ -632,12 +622,6 @@ struct ConsentResponse_Struct {
 	char zonename[32];
 };

-struct NameApproval_Struct {
-	char name[64];
-	uint32 race_id;
-	uint32 class_id;
-};
-
 /*
 ** Name Generator Struct
 ** Length: 72 bytes
@@ -1678,68 +1662,6 @@ struct GuildUpdate_Struct {
 	GuildsListEntry_Struct entry;
 };

-struct GuildMemberAdd_Struct {
-	/*000*/ uint32 guild_id;
-	/*004*/ uint32 unknown04;
-	/*008*/ uint32 unknown08;
-	/*012*/ uint32 unknown12;
-	/*016*/ uint32 level;
-	/*020*/ uint32 class_;
-	/*024*/ uint32 rank_;
-	/*028*/ uint32 guild_show;
-	/*032*/ uint32 zone_id;
-	/*036*/ uint32 last_on;
-	/*040*/ char   player_name[64];
-};
-
-struct GuildMemberLevel_Struct {
-	/*000*/ uint32 guild_id;
-	/*004*/ char   player_name[64];
-	/*068*/ uint32 level;
-};
-
-struct GuildMemberRank_Struct {
-	/*000*/ uint32 guild_id;
-	/*004*/ uint32 rank_;
-	/*008*/ char   player_name[64];
-	/*072*/ uint32 alt_banker; //Banker/Alt bit 00 - none 10 - Alt 11 - Alt and Banker 01 - Banker.  Banker not functional for RoF2+
-	/*076*/ uint32 offline;
-};
-
-struct GuildMemberPublicNote_Struct {
-	/*000*/ uint32 guild_id;
-	/*004*/ char   player_name[64];
-	/*068*/ char   public_note[256]; //RoF2 256
-};
-
-struct GuildDelete_Struct {
-	/*000*/ uint32 guild_id;
-};
-
-struct GuildRenameGuild_Struct {
-	/*000*/ uint32 guild_id;
-	/*004*/ char   new_guild_name[64];
-};
-
-struct GuildRenameMember_Struct {
-	/*000*/ uint32 guild_id;
-	/*004*/ char   player_name[64];
-	/*068*/ char   new_player_name[64];
-};
-
-struct GuildMemberDetails_Struct {
-	/*000*/ uint32 guild_id;
-	/*004*/ char   player_name[64];
-	/*068*/ uint32 zone_id;
-	/*072*/ uint32 last_on;
-	/*076*/ uint32 offline_mode; //1 Offline
-};
-
-struct GuildMemberDelete_Struct {
-	/*000*/ uint32 guild_id;
-	/*004*/ char   player_name[64];
-};
-
 /*
 ** Money Loot
 ** Length: 22 Bytes
@@ -1788,10 +1710,10 @@ struct GuildJoin_Struct{
 /*092*/
 };
 struct GuildInviteAccept_Struct {
-	char   inviter[64];
-	char   new_member[64];
+	char inviter[64];
+	char newmember[64];
 	uint32 response;
-	uint32 guild_id;
+	uint32 guildeqid;
 };
 struct GuildManageRemove_Struct {
 	uint32 guildeqid;
@@ -1823,14 +1745,6 @@ struct PopupResponse_Struct {
 /*0004*/	uint32	popupid;
 };

-enum GuildInformationActions
-{
-    GuildUpdateURL          = 0,
-    GuildUpdateChannel      = 1,
-    GuildUpdateRanks        = 4,
-    GuildUpdatePermissions  = 5
-};
-
 struct GuildManageBanker_Struct {
 	uint32 unknown0;
 	char myname[64];
@@ -1844,9 +1758,9 @@ struct GuildSetRank_Struct
 {
 /*00*/	uint32	Unknown00;
 /*04*/	uint32	Unknown04;
-/*08*/	uint32	rank;
-/*12*/	char	member_name[64];
-/*76*/	uint32	banker;
+/*08*/	uint32	Rank;
+/*12*/	char	MemberName[64];
+/*76*/	uint32	Banker;
 /*80*/
 };

@@ -1876,17 +1790,6 @@ struct GMSummon_Struct {
 /*104*/	uint32	unknown2; // E0 E0 56 00
 };

-struct GMFind_Struct {
-	char	charname[64];
-	char	gmname[64];
-	uint32	success;
-	uint32	zoneID;
-	float	x;
-	float	y;
-	float	z;
-	uint32	unknown2;
-};
-
 struct GMGoto_Struct { // x,y is swapped as compared to summon and makes sense as own packet
 /*  0*/ char	charname[64];

@@ -2228,31 +2131,31 @@ struct AdventureLeaderboard_Struct
 };*/

 struct Illusion_Struct { //size: 256 - SoF
-/*000*/    uint32          spawnid;
-/*004*/    char            charname[64];        //
-/*068*/    uint16          race;            //
-/*070*/    char            unknown006[2];
-/*072*/    uint8           gender;
-/*073*/    uint8           texture;
-/*074*/    uint8           unknown008;        //
-/*075*/    uint8           unknown009;        //
-/*076*/    uint8           helmtexture;    //
-/*077*/    uint8           unknown010;        //
-/*078*/    uint8           unknown011;        //
-/*079*/    uint8           unknown012;        //
-/*080*/    uint32          face;            //
-/*084*/    uint8           hairstyle;        //
-/*085*/    uint8           haircolor;        //
-/*086*/    uint8           beard;            //
-/*087*/    uint8           beardcolor;        //
-/*088*/    float           size;            //
-/*092*/    uint32          drakkin_heritage;    //
-/*096*/    uint32          drakkin_tattoo;        //
-/*100*/    uint32          drakkin_details;    //
-/*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];    //
+/*000*/	uint32	spawnid;
+/*004*/	char charname[64];		//
+/*068*/	uint16	race;			//
+/*070*/	char	unknown006[2];
+/*072*/	uint8	gender;
+/*073*/	uint8	texture;
+/*074*/	uint8	unknown008;		//
+/*075*/	uint8	unknown009;		//
+/*076*/	uint8	helmtexture;	//
+/*077*/	uint8	unknown010;		//
+/*078*/	uint8	unknown011;		//
+/*079*/	uint8	unknown012;		//
+/*080*/	uint32	face;			//
+/*084*/	uint8	hairstyle;		//
+/*085*/	uint8	haircolor;		//
+/*086*/	uint8	beard;			//
+/*087*/	uint8	beardcolor;		//
+/*088*/	float	size;			//
+/*092*/	uint32	drakkin_heritage;	//
+/*096*/	uint32	drakkin_tattoo;		//
+/*100*/	uint32	drakkin_details;	//
+/*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];	//
 /*256*/
 };

@@ -2286,19 +2189,11 @@ struct QuestReward_Struct
 	/*068*/
 };

-struct CashReward_Struct
-{
-	/*000*/ uint32 copper;
-	/*004*/ uint32 silver;
-	/*008*/ uint32 gold;
-	/*012*/ uint32 platinum;
-};
-
 // Size: 8
 struct Camera_Struct
 {
 	uint32	duration;	// Duration in ms
-	float intensity;
+	uint32	intensity;	// Between 1023410176 and 1090519040
 };

 struct ZonePoint_Entry {
@@ -2418,12 +2313,9 @@ struct FaceChange_Struct {
 /*004*/	uint8	hairstyle;
 /*005*/	uint8	beard;
 /*006*/	uint8	face;
-/*007*/ uint8  unused_padding;
-/*008*/ uint32 drakkin_heritage;
-/*012*/ uint32 drakkin_tattoo;
-/*016*/ uint32 drakkin_details;
-/*020*/ uint32 entity_id;
-/*024*/
+/*007*/ uint32	drakkin_heritage;
+/*011*/ uint32	drakkin_tattoo;
+/*015*/ uint32	drakkin_details;
 //there are only 10 faces for barbs changing woad just
 //increase the face value by ten so if there were 8 woad
 //designs then there would be 80 barb faces
@@ -2642,10 +2534,7 @@ struct GMEmoteZone_Struct {
 struct BookText_Struct {
 	uint8 window;	// where to display the text (0xFF means new window)
 	uint8 type;		//type: 0=scroll, 1=book, 2=item info.. prolly others.
-	int16 invslot;  // Only used in SoF and later clients.
-	int32 target_id;
-	int8 can_cast;
-	int8 can_scribe;
+	uint32 invslot;	// Only used in SoF and later clients.
 	char booktext[1]; // Variable Length
 };
 // This is the request to read a book.
@@ -2654,18 +2543,11 @@ struct BookText_Struct {
 struct BookRequest_Struct {
 	uint8 window;	// where to display the text (0xFF means new window)
 	uint8 type;		//type: 0=scroll, 1=book, 2=item info.. prolly others.
-	int16 invslot;  // Only used in Sof and later clients;
-	int32 target_id;
+	uint32 invslot;	// Only used in Sof and later clients;
+	int16 subslot; // The subslot inside of a bag if it is inside one.
 	char txtfile[20];
 };

-// used by Scribe and CastSpell book buttons
-struct BookButton_Struct
-{
-	int16 invslot;   // server slot
-	int32 target_id;
-};
-
 /*
 ** Object/Ground Spawn struct
 ** Used for Forges, Ovens, ground spawns, items dropped to ground, etc
@@ -2677,11 +2559,11 @@ struct BookButton_Struct
 struct Object_Struct {
 /*00*/	uint32	linked_list_addr[2];// They are, get this, prev and next, ala linked list
 /*08*/	float	size;				//
-/*10*/	uint16	solid_type;			//
+/*10*/	uint16	solidtype;			//
 /*12*/	uint32	drop_id;			// Unique object id for zone
 /*16*/	uint16	zone_id;			// Redudant, but: Zone the object appears in
 /*18*/	uint16	zone_instance;		//
-/*20*/	uint32	incline;			//
+/*20*/	uint32	unknown020;			//
 /*24*/	uint32	unknown024;			//
 /*28*/	float	tilt_x;
 /*32*/	float	tilt_y;
@@ -2877,7 +2759,7 @@ struct EnvDamage2_Struct {
 /*0004*/	uint16 unknown4;
 /*0006*/	uint32 damage;
 /*0010*/	uint8 unknown10[12];
-/*0022*/	uint8 dmgtype; // FA = Lava, FB = Drowning, FC = Falling, FD = Trap
+/*0022*/	uint8 dmgtype; //FA = Lava; FC = Falling
 /*0023*/	uint8 unknown2[4];
 /*0027*/	uint16 constant; //Always FFFF
 /*0029*/	uint16 unknown29;
@@ -3404,7 +3286,6 @@ struct Internal_GuildMemberEntry_Struct {
 //	char	public_note[1];				//variable length.
 	uint16	zoneinstance;				//network byte order
 	uint16	zone_id;					//network byte order
-	uint32  online;
 };

 struct Internal_GuildMembers_Struct {	//just for display purposes, this is not actually used in the message encoding.
@@ -3431,42 +3312,7 @@ struct GuildUpdate_PublicNote{
 	uint32	unknown0;
 	char	name[64];
 	char	target[64];
-	char	note[256];
-};
-
-struct GuildUpdateURLAndChannelStruct {
-	char text[512];
-};
-
-struct GuildUpdatePermissionsStruct {
-	uint32	rank;				// the rank that is being changed
-	uint32	function_id;		// the id of the guild function
-	uint32	value;				// 1 is on, 0 is off
-
-};
-
-struct GuildUpdateRankNamesStruct {
-	uint32	rank;				// the rank that is being updated
-	char	rank_name[76];		// the rank name
-};
-
-struct GuildUpdateUCPStruct {
-	uint32	action;				// 0 and 1 use url and channel payload.  5 uses permissions payload
-	char	unknown[76];
-	union {
-		GuildUpdateURLAndChannelStruct  url_channel;
-		GuildUpdatePermissionsStruct    permissions;
-		GuildUpdateRankNamesStruct      rank_name;
-	}payload;
-};
-
-struct GuildPermission_Struct
-{
-	uint32	Action;				// 5 = Update function permission
-	char	Unknown0004[76];	// not used
-	uint32	rank;				// the rank that is being changed
-	uint32	function_id;		// the id of the guild function
-	uint32	value;				// 1 is on, 0 is off
+	char	note[1]; //variable length.
 };

 struct GuildUpdateURLAndChannel_Struct
@@ -3485,7 +3331,7 @@ struct GuildUpdateURLAndChannel_Struct
 //The client sends this struct on changing a guild rank. The server sends each rank in 32 or less packets upon zonein if you are in a guild.
 struct GuildUpdateRanks_Struct
 {
-/*0000*/	uint32	Action;	// 0 = Update URL, 1 = Update Channel, 4 = Ranks 5 = Permissions
+/*0000*/	uint32	Action;	// 0 = Update URL, 1 = Update Channel, 5 = RoF Ranks
 /*0004*/	uint32	Unknown0004; //Seen 00 00 00 00
 /*0008*/	uint32	Unknown0008; //Seen 96 29 00 00
 /*0008*/	char	Unknown0012[64]; //Seen "CharacterName"
@@ -3507,7 +3353,6 @@ struct GuildStatus_Struct
 struct GuildDemoteStruct{
 	char	name[64];
 	char	target[64];
-	uint32	rank;
 };

 struct GuildRemoveStruct{
@@ -3517,9 +3362,9 @@ struct GuildRemoveStruct{
 	uint32	leaderstatus; //?
 };

-struct GuildMakeLeader_Struct{
-	char	requestor[64];
-	char	new_leader[64];
+struct GuildMakeLeader{
+	char	name[64];
+	char	target[64];
 };

 struct BugReport_Struct {
@@ -3559,23 +3404,20 @@ struct Make_Pet_Struct { //Simple struct for getting pet info
 	uint32 min_dmg;
 	uint32 max_dmg;
 };
-
-struct GroundSpawn {
-	float       max_x         = 0.0f;
-	float       max_y         = 0.0f;
-	float       min_x         = 0.0f;
-	float       min_y         = 0.0f;
-	float       max_z         = 0.0f;
-	float       heading       = 0.0f;
-	std::string name          = std::string();
-	uint32      item_id       = 0;
-	uint32      max_allowed   = 1;
-	uint32      respawn_timer = 1;
-	bool        fix_z         = true;
+struct Ground_Spawn{
+	float max_x;
+	float max_y;
+	float min_x;
+	float min_y;
+	float max_z;
+	float heading;
+	char name[20];
+	uint32 item;
+	uint32 max_allowed;
+	uint32 respawntimer;
 };
-
-struct GroundSpawns {
-	struct GroundSpawn spawn[50]; //Assigned max number to allow
+struct Ground_Spawns {
+	struct Ground_Spawn spawn[50]; //Assigned max number to allow
 };

 //struct PetitionBug_Struct{
@@ -3613,193 +3455,66 @@ struct ZoneInSendName_Struct2 {
 static const uint32 MAX_TRIBUTE_TIERS = 10;

 struct StartTribute_Struct {
-	uint32 client_id;
-	uint32 tribute_master_id;
-	uint32 response;
+	uint32	client_id;
+	uint32	tribute_master_id;
+	uint32	response;
 };

 struct TributeLevel_Struct {
-	uint32 level;              //backwards byte order!
-	uint32 tribute_item_id;    //backwards byte order!
-	uint32 cost;               //backwards byte order!
+	uint32	level;	//backwards byte order!
+	uint32	tribute_item_id;	//backwards byte order!
+	uint32	cost;	//backwards byte order!
 };

 struct TributeAbility_Struct {
-	uint32              tribute_id;    //backwards byte order!
-	uint32              tier_count;    //backwards byte order!
+	uint32	tribute_id;	//backwards byte order!
+	uint32	tier_count;	//backwards byte order!
 	TributeLevel_Struct tiers[MAX_TRIBUTE_TIERS];
-	char                name[0];
-};
-
-struct SelectTributeReq_Struct {
-	uint32 client_id;    //? maybe action ID?
-	uint32 tribute_id;
-	uint32 unknown8;    //seen E3 00 00 00
-};
-
-struct GuildTributeAbilityDetail_Struct {
-	uint32              tribute_id;    //backwards byte order!
-	uint32              tier_count;    //backwards byte order!
-	TributeLevel_Struct tiers[MAX_TRIBUTE_TIERS];
-	uint32              unknown132;
-	char                name[0];
+	char	name[0];
 };

 struct GuildTributeAbility_Struct {
-	uint32                           guild_id;
-	GuildTributeAbilityDetail_Struct ability;
+	uint32	guild_id;
+	TributeAbility_Struct ability;
 };

-struct GuildTributeSelectReq_Struct {
-	uint32 tribute_id;
-	uint32 tier;
-	uint32 tribute_id2;
-	uint32 unknown12;    //seen A7 01 00 00
-};
-
-struct GuildTributeSelectReply_Struct {
-	uint32 tribute_id;
-	uint32 tier;
-	uint32 tribute_id2;
-	char   description;
-};
-
-struct GuildTributeModifyBenefits_Struct {
-/*000*/uint32 command;
-/*004*/uint32 data;
-/*008*/char   unknown8[12];
-/*020*/uint32 tribute_master_id;
-/*024*/uint32 tribute_id_1;
-/*028*/uint32 tribute_id_2;
-/*032*/uint32 tribute_id_1_tier;
-/*036*/uint32 tribute_id_2_tier;
-/*040*/char   unknown[40];
-};
-
-struct GuildTributeOptInOutReq_Struct {
-/*000*/uint32 guild_id;
-/*004*/uint32 tribute_toggle;
-/*008*/char   player[64];
-/*072*/uint32 command;
-/*076*/uint32 tribute_master_id;
-};
-
-struct GuildTributeOptInOutReply_Struct {
-/*000*/uint32 guild_id;
-/*004*/char   player_name[64];
-/*068*/uint32 tribute_toggle;//			0 off 1 on
-/*072*/uint32 tribute_trophy_toggle;// 	0 off 1 on		not yet implemented
-/*076*/uint32 no_donations;
-/*080*/uint32 time;
-/*084*/uint32 command;
-};
-
-struct GuildTributeSaveActive_Struct {
-/*000*/ uint32    command;
-/*004*/ char      unknown04[16];
-/*020*/ uint32    master_tribute_id;
-/*024*/ uint32    tribute_id_1;
-/*028*/ uint32    tribute_id_2;
-/*032*/ uint32    tribute_1_tier;
-/*036*/ uint32    tribute_2_tier;
-/*040*/ char      unknown40[8];
-};
-
-struct GuildTributeFavorTimer_Struct {
-/*000*/ uint32 guild_id;
-/*004*/ uint32 guild_favor;
-/*008*/ uint32 tribute_timer;
-/*012*/ uint32 trophy_timer;
-};
-
-struct GuildTributeSendActive_Struct {
-/*000*/ uint32 not_used;
-/*004*/ uint32 guild_favor;
-/*008*/ uint32 tribute_timer;
-/*012*/ uint32 tribute_enabled;
-/*016*/ char   unknown16[8];
-/*024*/ uint32 tribute_id_1;
-/*028*/ uint32 tribute_id_2;
-/*032*/ uint32 tribute_id_1_tier;
-/*036*/ uint32 tribute_id_2_tier;
-};
-
-struct GuildTributeToggleReq_Struct {
-/*000*/ uint32 command;
-/*004*/ uint32 unknown4;
-/*008*/ uint32 unknown8;
-};
-
-struct GuildTributeDonateItemRequest_Struct {
-/*000*/ uint32    type;
-/*004*/ uint16    slot;
-/*006*/ uint16    sub_index;
-/*008*/ uint16    aug_index;
-/*010*/ uint16    unknown10;
-/*012*/ uint32    quantity;
-/*016*/ uint32    tribute_master_id;
-/*020*/ uint32    unknown20;
-/*024*/ uint32    guild_id;
-/*028*/ uint32    unknown28;
-/*032*/ uint32    unknown32;
-};
-
-struct GuildTributeDonateItemReply_Struct {
-/*000*/ uint32 type;
-/*004*/ uint16 slot;
-/*006*/ uint16 sub_index;
-/*008*/ uint16 aug_index;
-/*010*/ uint16 unknown10;
-/*012*/ uint32 quantity;
-/*016*/ uint32 unknown20;
-/*020*/ uint32 favor;
-};
-
-struct GuildTributeDonatePlatRequest_Struct {
-/*000*/ uint32 quantity;
-/*004*/ uint32 tribute_master_id;
-/*008*/ uint32 unknown08;
-/*012*/ uint32 guild_id;
-/*016*/ uint32 unknown16;
-};
-
-struct GuildTributeDonatePlatReply_Struct {
-	/*000*/ uint32 quantity;
-	/*004*/ uint32 unknown4;
-	/*008*/ uint32 favor;
+struct SelectTributeReq_Struct {
+	uint32	client_id;	//? maybe action ID?
+	uint32	tribute_id;
+	uint32	unknown8;	//seen E3 00 00 00
 };

 struct SelectTributeReply_Struct {
-	uint32 client_id;    //echoed from request.
-	uint32 tribute_id;
-	char   description[0];
+	uint32	client_id;	//echoed from request.
+	uint32	tribute_id;
+	char		desc[0];
 };

 struct TributeInfo_Struct {
-	uint32 active;        //0 == inactive, 1 == active
-	uint32 tributes[EQ::invtype::TRIBUTE_SIZE];    //-1 == NONE
-	uint32 tiers[EQ::invtype::TRIBUTE_SIZE];        //all 00's
-	uint32 tribute_master_id;
+	uint32	active;		//0 == inactive, 1 == active
+	uint32	tributes[EQ::invtype::TRIBUTE_SIZE];	//-1 == NONE
+	uint32	tiers[EQ::invtype::TRIBUTE_SIZE];		//all 00's
+	uint32	tribute_master_id;
 };

 struct TributeItem_Struct {
-	uint32 slot;
-	uint32 quantity;
-	uint32 tribute_master_id;
-	int32  tribute_points;
+	uint32	slot;
+	uint32	quantity;
+	uint32	tribute_master_id;
+	int32	tribute_points;
 };

 struct TributePoint_Struct {
-	int32  tribute_points;
-	uint32 unknown04;
-	int32  career_tribute_points;
-	uint32 unknown12;
+	int32	tribute_points;
+	uint32	unknown04;
+	int32	career_tribute_points;
+	uint32	unknown12;
 };

 struct TributeMoney_Struct {
-	uint32 platinum;
-	uint32 tribute_master_id;
-	int32  tribute_points;
+	uint32	platinum;
+	uint32	tribute_master_id;
+	int32	tribute_points;
 };


@@ -3903,19 +3618,14 @@ struct LevelAppearance_Struct { //Sends a little graphic on level up
 };

 struct MerchantList {
-	uint32      id;
-	uint32      slot;
-	uint32      item;
-	int16       faction_required;
-	int8        level_required;
-	uint8       min_status;
-	uint8       max_status;
-	uint16      alt_currency_cost;
-	uint32      classes_required;
-	uint8       probability;
-	std::string bucket_name;
-	std::string bucket_value;
-	uint8       bucket_comparison;
+	uint32	id;
+	uint32	slot;
+	uint32	item;
+	int16	faction_required;
+	int8	level_required;
+	uint16	alt_currency_cost;
+	uint32	classes_required;
+	uint8	probability;
 };

 struct TempMerchantList {
@@ -4004,66 +3714,17 @@ struct SetTitleReply_Struct {
 	uint32	entity_id;
 };

-struct SharedTaskMemberList_Struct {
-/*00*/ uint32 gopher_id;
-/*04*/ uint32 unknown04;
-/*08*/ uint32 member_count;    //1 less than the number of members
-///*12*/ char   list_pointer[0];
-	char      member_name[1];    //null terminated string
-	uint32    monster_mission; // class chosen
-	uint8     task_leader;    //boolean flag
-
+struct TaskMemberList_Struct {
+/*00*/ uint32	gopher_id;
+/*04*/ uint32	unknown04;
+/*08*/ uint32	member_count;	//1 less than the number of members
+/*12*/ char	list_pointer[0];
 /*	list is of the form:
+	char member_name[1]	//null terminated string
 	uint8	task_leader	//boolean flag
 */
 };

-struct SharedTaskQuit_Struct {
-	int32 field1;
-	int32 field2;
-	int32 field3;
-};
-
-struct SharedTaskAddPlayer_Struct {
-	int32 field1;
-	int32 field2;
-	char  player_name[64];
-};
-
-struct SharedTaskMakeLeader_Struct {
-	int32 field1;
-	int32 field2;
-	char  player_name[64];
-};
-
-struct SharedTaskRemovePlayer_Struct {
-	int32 field1;
-	int32 field2;
-	char  player_name[64];
-};
-
-struct SharedTaskInvite_Struct {
-	int32_t unknown00;      // probably the unique character id sent in some packets
-	int32_t invite_id;      // invite id sent back in response
-	char    task_name[64];
-	char    inviter_name[64];
-};
-
-struct SharedTaskInviteResponse_Struct {
-	int32_t unknown00;  // 0
-	int32_t invite_id;  // same id sent in the invite, probably for server verification
-	int8_t  accepted;   // 0: declined 1: accepted
-	int8_t  padding[3]; // padding garbage probably
-};
-
-struct SharedTaskAccept_Struct {
-	int32_t  unknown00;
-	int32_t  unknown04;
-	uint32_t npc_entity_id;  // npc task giver entity id (sent in selection window)
-	uint32_t task_id;
-	float    reward_multiplier; // added after titanium (sent in selection window)
-};
-
 #if 0

 // Old struct not used by Task System implementation but left for reference
@@ -4156,7 +3817,7 @@ struct TaskHistory_Struct {
 #endif

 struct AcceptNewTask_Struct {
-	uint32	task_type; // type sent in selection window
+	uint32	unknown00;
 	uint32	task_id;		//set to 0 for 'decline'
 	uint32	task_master_id;	//entity ID
 };
@@ -4365,9 +4026,7 @@ struct UpdateLeadershipAA_Struct {

 enum
 {
-	GroupLeadershipAbility_MarkNPC = 0,
-	RaidLeadershipAbility_MarkNPC = 16,
-	RaidLeadershipAbility_MainAssist = 19
+	GroupLeadershipAbility_MarkNPC = 0
 };

 struct DoGroupLeadershipAbility_Struct
@@ -4411,9 +4070,8 @@ struct InspectBuffs_Struct {
 struct RaidGeneral_Struct {
 /*00*/	uint32		action;	//=10
 /*04*/	char		player_name[64];	//should both be the player's name
-/*68*/	uint32		unknown1;
-/*72*/	char		leader_name[64];
-/*136*/	uint32		parameter;
+/*64*/	char		leader_name[64];
+/*132*/	uint32		parameter;
 };

 struct RaidAddMember_Struct {
@@ -4424,14 +4082,9 @@ struct RaidAddMember_Struct {
 /*139*/	uint8 flags[5]; //no idea if these are needed...
 };

-struct RaidNote_Struct {
-/*000*/ RaidGeneral_Struct general;
-/*140*/ char note[64];
-};
-
 struct RaidMOTD_Struct {
-/*000*/ RaidGeneral_Struct general;
-/*140*/ char motd[1024];
+/*000*/ RaidGeneral_Struct general; // leader_name and action only used
+/*136*/ char motd[0]; // max size is 1024, but reply is variable
 };

 struct RaidLeadershipUpdate_Struct {
@@ -4638,8 +4291,8 @@ struct AARankPrereq_Struct
 struct AARankEffect_Struct
 {
 	int32 effect_id;
-	int32 base_value;
-	int32 limit_value;
+	int32 base1;
+	int32 base2;
 	int32 slot;
 };

@@ -4647,8 +4300,8 @@ struct AARankEffect_Struct

 struct AA_Ability {
 /*00*/	uint32 skill_id;
-/*04*/	uint32 base_value;
-/*08*/	uint32 limit_value;
+/*04*/	uint32 base1;
+/*08*/	uint32 base2;
 /*12*/	uint32 slot;
 };

@@ -4826,7 +4479,7 @@ struct ItemVerifyReply_Struct {
 struct ItemRecastDelay_Struct {
 /*000*/	uint32	recast_delay;	// in seconds
 /*004*/	uint32	recast_type;
-/*008*/	bool	ignore_casting_requirement; //Ignores recast times allows items to be reset?
+/*008*/	uint32	unknown008;
 /*012*/
 };

@@ -5287,7 +4940,7 @@ 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 dz_switch_id;
+/*008*/ uint32 unknown008;
 /*012*/ float y;
 /*016*/ float x;
 /*020*/ float z;
@@ -5378,6 +5031,8 @@ struct GroupMakeLeader_Struct
 //ex for a blank crowns window you would send:
 //999999|1|999999|0
 //any items come after in much the same way adventure merchant items do except there is no theme included
+#define ALT_CURRENCY_OP_POPULATE 8
+#define ALT_CURRENCY_OP_UPDATE 7

 //Server -> Client
 //Populates the initial Alternate Currency Window
@@ -5442,10 +5097,10 @@ struct AltCurrencySelectItemReply_Struct {
 /*000*/ uint32	unknown000;
 /*004*/ uint8	unknown004; //0xff
 /*005*/ uint8	unknown005; //0xff
-/*006*/ uint16	unknown006; //0xffff
-/*008*/ uint16	unknown008; //0xffff
-/*010*/ char	item_name[64];
-/*074*/ uint16	unknown074;
+/*006*/ uint8	unknown006; //0xff
+/*007*/ uint8	unknown007; //0xff
+/*008*/ char	item_name[64];
+/*072*/ uint32	unknown074;
 /*076*/ uint32	cost;
 /*080*/ uint32	unknown080;
 /*084*/ uint32	unknown084;
@@ -5788,6 +5443,24 @@ struct MercenaryMerchantResponse_Struct {
 /*0004*/
 };

+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;
+	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:
 //"Got a broadcast message for ... %s ...\n"
 struct ClientMarqueeMessage_Struct {
@@ -5806,6 +5479,9 @@ struct ClientMarqueeMessage_Struct {

 };

+typedef std::list<ServerLootItem_Struct*> ItemList;
+
+
 struct fling_struct {
 /* 00 */ uint32 collision; // 0 collision is off, anything else it's on
 /* 04 */ int32 travel_time; // ms -- UF we need to calc this, RoF+ -1 auto calcs
@@ -5854,28 +5530,6 @@ struct SayLinkBodyFrame_Struct {
 /*056*/
 };

-struct Checksum_Struct {
-    uint64 checksum;
-    uint8  data[2048];
-};
-
-struct UpdateMovementEntry {
-	/* 00 */	float Y;
-	/* 04 */	float X;
-	/* 08 */	float Z;
-	/* 12 */	uint8 type;
-	/* 13 */	unsigned int timestamp;
-	/* 17 */
-};
-
-struct UnderWorld {
-	/* 00 */	int spawn_id;
-	/* 04 */	float y;
-	/* 08 */	float x;
-	/* 12 */	float z;
-	/* 16 */
-};
-
 // Restore structure packing to default
 #pragma pack()

@@ -23,7 +23,7 @@
 #include "op_codes.h"
 #include "crc16.h"
 #include "platform.h"
-#include "strings.h"
+#include "string_util.h"

 #include <string>
 #include <iomanip>
@@ -406,7 +406,7 @@ void EQStream::ProcessPacket(EQProtocolPacket *p)
 			if(uint16(SequencedBase + SequencedQueue.size()) != NextOutSeq) {
 				LogNetcode(_L "Pre-OOA Invalid Sequenced queue: BS [{}] + SQ [{}] != NOS [{}]" __L, SequencedBase, SequencedQueue.size(), NextOutSeq);
 			}
-
+			
 			//if the packet they got out of order is between our last acked packet and the last sent packet, then its valid.
 			if (CompareSequence(SequencedBase,seq) != SeqPast && CompareSequence(NextOutSeq,seq) == SeqPast) {
 				Log(Logs::Detail, Logs::Netcode, _L "Received OP_OutOfOrderAck for sequence %d, starting retransmit at the start of our unacked buffer (seq %d, was %d)." __L,
@@ -453,7 +453,7 @@ void EQStream::ProcessPacket(EQProtocolPacket *p)
 				(unsigned long)ntohl(ClientStats->packets_received), (unsigned long)ntohl(ClientStats->packets_sent), (unsigned long)ntohl(ClientStats->last_local_delta),
 				(unsigned long)ntohl(ClientStats->low_delta), (unsigned long)ntohl(ClientStats->average_delta),
 				(unsigned long)ntohl(ClientStats->high_delta), (unsigned long)ntohl(ClientStats->last_remote_delta));
-
+			
 			AdjustRates(ntohl(ClientStats->average_delta));

 			if(GetExecutablePlatform() == ExePlatformWorld || GetExecutablePlatform() == ExePlatformZone) {
@@ -951,7 +951,7 @@ EQRawApplicationPacket *p=nullptr;
 			EmuOpcode emu_op = (*OpMgr)->EQToEmu(p->opcode);
 			if (emu_op == OP_Unknown) {
 				// Log(Logs::General, Logs::Client_Server_Packet_Unhandled, "Unknown :: [%s - 0x%04x] [Size: %u] %s", OpcodeManager::EmuToName(p->GetOpcode()), p->opcode, p->Size(), DumpPacketToString(p).c_str());
-			}
+			} 
 			p->SetOpcode(emu_op);
 		}
 	}
@@ -1359,11 +1359,11 @@ void EQStream::AdjustRates(uint32 average_delta)
 			DecayRate=DECAYBASE/average_delta;
 			if (BytesWritten > RateThreshold)
 				BytesWritten = RateThreshold + DecayRate;
-			Log(Logs::Detail, Logs::Netcode, _L "Adjusting data rate to thresh %d, decay %d based on avg delta %d" __L,
+			Log(Logs::Detail, Logs::Netcode, _L "Adjusting data rate to thresh %d, decay %d based on avg delta %d" __L, 
 				RateThreshold, DecayRate, average_delta);
 			MRate.unlock();
 		} else {
-			Log(Logs::Detail, Logs::Netcode, _L "Not adjusting data rate because avg delta over max (%d > %d)" __L,
+			Log(Logs::Detail, Logs::Netcode, _L "Not adjusting data rate because avg delta over max (%d > %d)" __L, 
 				average_delta, AVERAGE_DELTA_MAX);
 			AverageDelta = AVERAGE_DELTA_MAX;
 		}
@@ -1374,7 +1374,7 @@ void EQStream::AdjustRates(uint32 average_delta)
 			BytesWritten = 0;
 			RateThreshold=RATEBASE/average_delta;
 			DecayRate=DECAYBASE/average_delta;
-			Log(Logs::Detail, Logs::Netcode, _L "Adjusting data rate to thresh %d, decay %d based on avg delta %d" __L,
+			Log(Logs::Detail, Logs::Netcode, _L "Adjusting data rate to thresh %d, decay %d based on avg delta %d" __L, 
 				RateThreshold, DecayRate, average_delta);
 			MRate.unlock();
 		}
@@ -218,13 +218,13 @@ class EQStream : public EQStreamInterface {

 		void init(bool resetSession=true);
 	public:
-		EQStream() { init(); remote_ip = 0; remote_port = 0; State = UNESTABLISHED;
-			StreamType = UnknownStream; compressed = true; encoded = false; app_opcode_size = 2;
-			bytes_sent = 0; bytes_recv = 0; create_time = Timer::GetTimeSeconds(); sessionAttempts = 0;
+		EQStream() { init(); remote_ip = 0; remote_port = 0; State = UNESTABLISHED; 
+			StreamType = UnknownStream; compressed = true; encoded = false; app_opcode_size = 2; 
+			bytes_sent = 0; bytes_recv = 0; create_time = Timer::GetTimeSeconds(); sessionAttempts = 0; 
 			streamactive = false; }
-		EQStream(sockaddr_in addr) { init(); remote_ip = addr.sin_addr.s_addr;
-			remote_port = addr.sin_port; State = UNESTABLISHED; StreamType = UnknownStream;
-			compressed = true; encoded = false; app_opcode_size = 2; bytes_sent = 0; bytes_recv = 0;
+		EQStream(sockaddr_in addr) { init(); remote_ip = addr.sin_addr.s_addr; 
+			remote_port = addr.sin_port; State = UNESTABLISHED; StreamType = UnknownStream; 
+			compressed = true; encoded = false; app_opcode_size = 2; bytes_sent = 0; bytes_recv = 0; 
 			create_time = Timer::GetTimeSeconds(); }
 		virtual ~EQStream() { RemoveData(); SetState(CLOSED); }
 		void SetMaxLen(uint32 length) { MaxLen=length; }
@@ -243,11 +243,6 @@ class EQStream : public EQStreamInterface {

 		virtual void SetOpcodeManager(OpcodeManager **opm) { OpMgr = opm; }

-		virtual OpcodeManager* GetOpcodeManager() const
-		{
-			return (*OpMgr);
-		};
-
 		void CheckTimeout(uint32 now, uint32 timeout=30);
 		bool HasOutgoingData();
 		void Process(const unsigned char *data, const uint32 length);
@@ -26,7 +26,7 @@ EQStreamIdentifier::~EQStreamIdentifier() {
 	}
 }

-void EQStreamIdentifier::RegisterPatch(EQStreamInterface::Signature sig, const char *name, OpcodeManager ** opcodes, const StructStrategy *structs) {
+void EQStreamIdentifier::RegisterPatch(const EQStreamInterface::Signature &sig, const char *name, OpcodeManager ** opcodes, const StructStrategy *structs) {
 	auto p = new Patch;
 	p->signature = sig;
 	p->name = name;
@@ -145,7 +145,7 @@ void EQStreamIdentifier::Process() {
 }

 void EQStreamIdentifier::AddStream(std::shared_ptr<EQStreamInterface> eqs) {
-	m_streams.emplace_back(Record(eqs));
+	m_streams.push_back(Record(eqs));
 	eqs = nullptr;
 }

@@ -18,7 +18,7 @@ public:
 	~EQStreamIdentifier();

 	//registration interface.
-	void RegisterPatch(EQStreamInterface::Signature sig, const char *name, OpcodeManager ** opcodes, const StructStrategy *structs);
+	void RegisterPatch(const EQStreamInterface::Signature &sig, const char *name, OpcodeManager ** opcodes, const StructStrategy *structs);

 	//main processing interface
 	void Process();
@@ -30,7 +30,7 @@ struct EQStreamManagerInterfaceOptions

 		//World seems to support both compression and xor zone supports one or the others.
 		//Enforce one or the other in the convienence construct
-		//Login I had trouble getting to recognize compression at all
+		//Login I had trouble getting to recognize compression at all 
 		//but that might be because it was still a bit buggy when i was testing that.
 		if (compressed) {
 			daybreak_options.encode_passes[0] = EQ::Net::EncodeCompression;
@@ -100,7 +100,6 @@ public:
 	virtual MatchState CheckSignature(const Signature *sig) { return MatchFailed; }
 	virtual EQStreamState GetState() = 0;
 	virtual void SetOpcodeManager(OpcodeManager **opm) = 0;
-	virtual OpcodeManager* GetOpcodeManager() const = 0;
 	virtual const EQ::versions::ClientVersion ClientVersion() const { return EQ::versions::ClientVersion::Unknown; }
 	virtual Stats GetStats() const = 0;
 	virtual void ResetStats() = 0;
@@ -38,8 +38,12 @@ void EQStreamProxy::SetOpcodeManager(OpcodeManager **opm)
 }

 void EQStreamProxy::QueuePacket(const EQApplicationPacket *p, bool ack_req) {
-	if (p == nullptr) {
+	if(p == nullptr)
 		return;
+
+	if (p->GetOpcode() != OP_SpecialMesg) {
+		Log(Logs::General, Logs::PacketServerClient, "[%s - 0x%04x] [Size: %u]", OpcodeManager::EmuToName(p->GetOpcode()), p->GetOpcode(), p->Size());
+		Log(Logs::General, Logs::PacketServerClientWithDump, "[%s - 0x%04x] [Size: %u] %s", OpcodeManager::EmuToName(p->GetOpcode()), p->GetOpcode(), p->Size(), DumpPacketToString(p).c_str());
 	}

 	EQApplicationPacket *newp = p->Copy();
@@ -108,8 +112,3 @@ bool EQStreamProxy::CheckState(EQStreamState state) {
 	return false;
 }

-OpcodeManager *EQStreamProxy::GetOpcodeManager() const
-{
-	return (*m_opcodes);
-}
-
@@ -34,15 +34,13 @@ public:
 	virtual Stats GetStats() const;
 	virtual void ResetStats();
 	virtual EQStreamManagerInterface* GetManager() const;
-	virtual OpcodeManager* GetOpcodeManager() const;

 protected:
 	std::shared_ptr<EQStreamInterface> const m_stream;	//we own this stream object.
 	const StructStrategy *const	m_structs;	//we do not own this object.
 	//this is a pointer to a pointer to make it less likely that a packet will
 	//reference an invalid opcode manager when they are being reloaded.
-	OpcodeManager **const			m_opcodes;
-	//we do not own this object.
+	OpcodeManager **const			m_opcodes;	//we do not own this object.
 };

 #endif /*EQSTREAMPROXY_H_*/
@@ -23,6 +23,9 @@

 EQDB EQDB::s_EQDB;

+EQDB::EQDB() {
+}
+
 unsigned int EQDB::field_count() {
 	return mysql_field_count(mysql_ref);
 }
@@ -27,7 +27,7 @@

 //this is the main object exported to perl.
 class EQDB {
-	EQDB() = default;
+	EQDB();
 public:
 	static EQDB *Singleton() { return(&s_EQDB); }

@@ -19,13 +19,9 @@
 #include "../common/global_define.h"
 #include "eqemu_config.h"
 #include "misc_functions.h"
-#include "strings.h"
-#include "eqemu_logsys.h"
-#include "json/json.hpp"

 #include <iostream>
 #include <sstream>
-#include <filesystem>

 std::string EQEmuConfig::ConfigFile = "eqemu_config.json";
 EQEmuConfig *EQEmuConfig::_config = nullptr;
@@ -37,23 +33,17 @@ void EQEmuConfig::parse_config()
 	LongName     = _root["server"]["world"].get("longname", "").asString();
 	WorldAddress = _root["server"]["world"].get("address", "").asString();
 	LocalAddress = _root["server"]["world"].get("localaddress", "").asString();
-	MaxClients   = Strings::ToInt(_root["server"]["world"].get("maxclients", "-1").asString());
+	MaxClients   = atoi(_root["server"]["world"].get("maxclients", "-1").asString().c_str());
 	SharedKey    = _root["server"]["world"].get("key", "").asString();
 	LoginCount   = 0;

 	if (_root["server"]["world"]["loginserver"].isObject()) {
 		LoginHost   = _root["server"]["world"]["loginserver"].get("host", "login.eqemulator.net").asString();
-		LoginPort   = Strings::ToUnsignedInt(_root["server"]["world"]["loginserver"].get("port", "5998").asString());
+		LoginPort   = atoi(_root["server"]["world"]["loginserver"].get("port", "5998").asString().c_str());
 		LoginLegacy = false;
 		if (_root["server"]["world"]["loginserver"].get("legacy", "0").asString() == "1") { LoginLegacy = true; }
 		LoginAccount  = _root["server"]["world"]["loginserver"].get("account", "").asString();
 		LoginPassword = _root["server"]["world"]["loginserver"].get("password", "").asString();
-
-		// at least today, this is wrong a majority of the time
-		// remove this if eqemulator ever upgrades its loginserver
-		if (LoginHost.find("login.eqemulator.net") != std::string::npos) {
-			LoginLegacy = true;
-		}
 	}
 	else {
 		char str[32];
@@ -66,60 +56,44 @@ void EQEmuConfig::parse_config()

 			auto loginconfig = new LoginConfig;
 			loginconfig->LoginHost     = _root["server"]["world"][str].get("host", "login.eqemulator.net").asString();
-			loginconfig->LoginPort     = Strings::ToUnsignedInt(_root["server"]["world"][str].get("port", "5998").asString());
+			loginconfig->LoginPort     = atoi(_root["server"]["world"][str].get("port", "5998").asString().c_str());
 			loginconfig->LoginAccount  = _root["server"]["world"][str].get("account", "").asString();
 			loginconfig->LoginPassword = _root["server"]["world"][str].get("password", "").asString();

 			loginconfig->LoginLegacy = false;
 			if (_root["server"]["world"][str].get("legacy", "0").asString() == "1") { loginconfig->LoginLegacy = true; }
-
-			// at least today, this is wrong a majority of the time
-			// remove this if eqemulator ever upgrades its loginserver
-			if (loginconfig->LoginHost.find("login.eqemulator.net") != std::string::npos) {
-				loginconfig->LoginLegacy = true;
-			}
-
 			loginlist.Insert(loginconfig);
 		} while (LoginCount < 100);
 	}


-	//<locked> from xml converts to json as locked: "", so i default to "false".
+	//<locked> from xml converts to json as locked: "", so i default to "false". 
 	//The only way to enable locked is by switching to true, meaning this value is always false until manually set true
 	Locked = false;
 	if (_root["server"]["world"].get("locked", "false").asString() == "true") { Locked = true; }
-
-	auto_database_updates = false;
-	if (_root["server"].get("auto_database_updates", "true").asString() == "true") {
-		auto_database_updates = true;
-	}
-
 	WorldIP      = _root["server"]["world"]["tcp"].get("host", "127.0.0.1").asString();
-	WorldTCPPort = Strings::ToUnsignedInt(_root["server"]["world"]["tcp"].get("port", "9000").asString());
+	WorldTCPPort = atoi(_root["server"]["world"]["tcp"].get("port", "9000").asString().c_str());

 	TelnetIP      = _root["server"]["world"]["telnet"].get("ip", "127.0.0.1").asString();
-	TelnetTCPPort = Strings::ToUnsignedInt(_root["server"]["world"]["telnet"].get("port", "9001").asString());
+	TelnetTCPPort = atoi(_root["server"]["world"]["telnet"].get("port", "9001").asString().c_str());
 	TelnetEnabled = false;
 	if (_root["server"]["world"]["telnet"].get("enabled", "false").asString() == "true") { TelnetEnabled = true; }

 	WorldHTTPMimeFile = _root["server"]["world"]["http"].get("mimefile", "mime.types").asString();
-	WorldHTTPPort     = Strings::ToUnsignedInt(_root["server"]["world"]["http"].get("port", "9080").asString());
+	WorldHTTPPort     = atoi(_root["server"]["world"]["http"].get("port", "9080").asString().c_str());
 	WorldHTTPEnabled  = false;

 	if (_root["server"]["world"]["http"].get("enabled", "false").asString() == "true") {
 		WorldHTTPEnabled = true;
 	}

-	if (_root["server"].get("disable_config_checks", "false").asString() == "true") {
-		DisableConfigChecks = true;
-	}
-
-
-
-	CheckUcsConfigConversion();
-
-	m_ucs_host = _root["server"]["ucs"].get("host", "eqchat.eqemulator.net").asString();
-	m_ucs_port = Strings::ToUnsignedInt(_root["server"]["ucs"].get("port", "7778").asString());
+	/**
+	 * UCS
+	 */
+	ChatHost = _root["server"]["chatserver"].get("host", "eqchat.eqemulator.net").asString();
+	ChatPort = atoi(_root["server"]["chatserver"].get("port", "7778").asString().c_str());
+	MailHost = _root["server"]["mailserver"].get("host", "eqmail.eqemulator.net").asString();
+	MailPort = atoi(_root["server"]["mailserver"].get("port", "7778").asString().c_str());

 	/**
 	 * Database
@@ -127,7 +101,7 @@ void EQEmuConfig::parse_config()
 	DatabaseUsername = _root["server"]["database"].get("username", "eq").asString();
 	DatabasePassword = _root["server"]["database"].get("password", "eq").asString();
 	DatabaseHost     = _root["server"]["database"].get("host", "localhost").asString();
-	DatabasePort     = Strings::ToUnsignedInt(_root["server"]["database"].get("port", "3306").asString());
+	DatabasePort     = atoi(_root["server"]["database"].get("port", "3306").asString().c_str());
 	DatabaseDB       = _root["server"]["database"].get("db", "eq").asString();

 	/**
@@ -136,14 +110,14 @@ void EQEmuConfig::parse_config()
 	ContentDbUsername = _root["server"]["content_database"].get("username", "").asString();
 	ContentDbPassword = _root["server"]["content_database"].get("password", "").asString();
 	ContentDbHost     = _root["server"]["content_database"].get("host", "").asString();
-	ContentDbPort     = Strings::ToUnsignedInt(_root["server"]["content_database"].get("port", 0).asString());
+	ContentDbPort     = atoi(_root["server"]["content_database"].get("port", 0).asString().c_str());
 	ContentDbName     = _root["server"]["content_database"].get("db", "").asString();

 	/**
 	 * QS
 	 */
 	QSDatabaseHost     = _root["server"]["qsdatabase"].get("host", "localhost").asString();
-	QSDatabasePort     = Strings::ToUnsignedInt(_root["server"]["qsdatabase"].get("port", "3306").asString());
+	QSDatabasePort     = atoi(_root["server"]["qsdatabase"].get("port", "3306").asString().c_str());
 	QSDatabaseUsername = _root["server"]["qsdatabase"].get("username", "eq").asString();
 	QSDatabasePassword = _root["server"]["qsdatabase"].get("password", "eq").asString();
 	QSDatabaseDB       = _root["server"]["qsdatabase"].get("db", "eq").asString();
@@ -151,9 +125,9 @@ void EQEmuConfig::parse_config()
 	/**
 	 * Zones
 	 */
-	DefaultStatus = Strings::ToUnsignedInt(_root["server"]["zones"].get("defaultstatus", 0).asString());
-	ZonePortLow   = Strings::ToUnsignedInt(_root["server"]["zones"]["ports"].get("low", "7000").asString());
-	ZonePortHigh  = Strings::ToUnsignedInt(_root["server"]["zones"]["ports"].get("high", "7999").asString());
+	DefaultStatus = atoi(_root["server"]["zones"].get("defaultstatus", 0).asString().c_str());
+	ZonePortLow   = atoi(_root["server"]["zones"]["ports"].get("low", "7000").asString().c_str());
+	ZonePortHigh  = atoi(_root["server"]["zones"]["ports"].get("high", "7999").asString().c_str());

 	/**
 	 * Files
@@ -183,10 +157,10 @@ void EQEmuConfig::parse_config()
 	/**
 	 * Launcher
 	 */
-	RestartWait      = Strings::ToInt(_root["server"]["launcher"]["timers"].get("restart", "10000").asString());
-	TerminateWait    = Strings::ToInt(_root["server"]["launcher"]["timers"].get("reterminate", "10000").asString());
-	InitialBootWait  = Strings::ToInt(_root["server"]["launcher"]["timers"].get("initial", "20000").asString());
-	ZoneBootInterval = Strings::ToInt(_root["server"]["launcher"]["timers"].get("interval", "2000").asString());
+	RestartWait      = atoi(_root["server"]["launcher"]["timers"].get("restart", "10000").asString().c_str());
+	TerminateWait    = atoi(_root["server"]["launcher"]["timers"].get("reterminate", "10000").asString().c_str());
+	InitialBootWait  = atoi(_root["server"]["launcher"]["timers"].get("initial", "20000").asString().c_str());
+	ZoneBootInterval = atoi(_root["server"]["launcher"]["timers"].get("interval", "2000").asString().c_str());
 #ifdef WIN32
 	ZoneExe = _root["server"]["launcher"].get("exe", "zone.exe").asString();
 #else
@@ -248,16 +222,16 @@ std::string EQEmuConfig::GetByName(const std::string &var_name) const
 		return (WorldHTTPEnabled ? "true" : "false");
 	}
 	if (var_name == "ChatHost") {
-		return (m_ucs_host);
+		return (ChatHost);
 	}
 	if (var_name == "ChatPort") {
-		return (itoa(m_ucs_port));
+		return (itoa(ChatPort));
 	}
 	if (var_name == "MailHost") {
-		return (m_ucs_host);
+		return (MailHost);
 	}
 	if (var_name == "MailPort") {
-		return (itoa(m_ucs_port));
+		return (itoa(MailPort));
 	}
 	if (var_name == "DatabaseHost") {
 		return (DatabaseHost);
@@ -364,8 +338,10 @@ void EQEmuConfig::Dump() const
 	std::cout << "WorldHTTPPort = " << WorldHTTPPort << std::endl;
 	std::cout << "WorldHTTPMimeFile = " << WorldHTTPMimeFile << std::endl;
 	std::cout << "WorldHTTPEnabled = " << WorldHTTPEnabled << std::endl;
-	std::cout << "UCSHost = " << m_ucs_host << std::endl;
-	std::cout << "UCSPort = " << m_ucs_port << std::endl;
+	std::cout << "ChatHost = " << ChatHost << std::endl;
+	std::cout << "ChatPort = " << ChatPort << std::endl;
+	std::cout << "MailHost = " << MailHost << std::endl;
+	std::cout << "MailPort = " << MailPort << std::endl;
 	std::cout << "DatabaseHost = " << DatabaseHost << std::endl;
 	std::cout << "DatabaseUsername = " << DatabaseUsername << std::endl;
 	std::cout << "DatabasePassword = " << DatabasePassword << std::endl;
@@ -392,98 +368,3 @@ void EQEmuConfig::Dump() const
 	std::cout << "DefaultStatus = " << (int) DefaultStatus << std::endl;
 //	std::cout << "DynamicCount = " << DynamicCount << std::endl;
 }
-
-const std::string &EQEmuConfig::GetUCSHost() const
-{
-	return m_ucs_host;
-}
-
-uint16 EQEmuConfig::GetUCSPort() const
-{
-	return m_ucs_port;
-}
-
-void EQEmuConfig::CheckUcsConfigConversion()
-{
-	std::string chat_host = _root["server"]["chatserver"].get("host", "").asString();
-	uint32      chat_port = Strings::ToUnsignedInt(_root["server"]["chatserver"].get("port", "0").asString());
-	std::string mail_host = _root["server"]["mailserver"].get("host", "").asString();
-	uint32      mail_port = Strings::ToUnsignedInt(_root["server"]["mailserver"].get("port", "0").asString());
-	std::string ucs_host  = _root["server"]["ucs"].get("host", "").asString();
-
-	// automatic ucs legacy configuration migration
-	// if old configuration values are set, let's backup the existing configuration
-	// and migrate to to use the new fields and write the new config
-	if ((!chat_host.empty() || !mail_host.empty()) && ucs_host.empty()) {
-		LogInfo("Migrating old [eqemu_config] UCS configuration to new configuration");
-
-		std::string config_file_path = std::filesystem::path{
-			path.GetServerPath() + "/eqemu_config.json"
-		}.string();
-
-		std::string config_file_bak_path = std::filesystem::path{
-			path.GetServerPath() + "/eqemu_config.ucs-migrate-json.bak"
-		}.string();
-
-		// copy eqemu_config.json to eqemu_config.json.bak
-		std::ifstream src(config_file_path, std::ios::binary);
-		std::ofstream dst(config_file_bak_path, std::ios::binary);
-		dst << src.rdbuf();
-		src.close();
-
-		LogInfo("Old configuration backed up to [{}]", config_file_bak_path);
-
-		// read eqemu_config.json, transplant new fields and write to eqemu_config.json
-		Json::Value   root;
-		Json::Reader  reader;
-		std::ifstream file(config_file_path);
-		if (!reader.parse(file, root)) {
-			LogError("Failed to parse configuration file");
-			return;
-		}
-		file.close();
-
-		// get old fields
-		std::string host = !chat_host.empty() ? chat_host : mail_host;
-		if (host.empty()) {
-			host = "eqchat.eqemulator.net";
-		}
-		std::string port = chat_port > 0 ? std::to_string(chat_port) : std::to_string(mail_port);
-		if (port.empty()) {
-			port = "7778";
-		}
-
-		// set new fields
-		root["server"]["ucs"]["host"] = host;
-		root["server"]["ucs"]["port"] = port;
-
-		// unset old fields
-		root["server"].removeMember("chatserver");
-		root["server"].removeMember("mailserver");
-
-		// get Json::Value raw string
-		std::string config = root.toStyledString();
-
-		// format using more modern json library
-		nlohmann::json data = nlohmann::json::parse(config);
-
-		// write to file
-		std::ofstream o(config_file_path);
-		o << std::setw(1) << data << std::endl;
-		o.close();
-
-		// write new config
-		LogInfo("New configuration written to [{}]", config_file_path);
-		LogInfo("Migration complete, please review the new configuration file");
-
-		// reload config internally
-		try {
-			std::ifstream fconfig(config_file_path, std::ifstream::binary);
-			fconfig >> _config->_root;
-			_config->parse_config();
-		}
-		catch (std::exception &) {
-			return;
-		}
-	}
-}
@@ -20,9 +20,7 @@

 #include "json/json.h"
 #include "linked_list.h"
-#include "path_manager.h"
 #include <fstream>
-#include <fmt/format.h>

 struct LoginConfig {
 	std::string LoginHost;
@@ -60,7 +58,14 @@ class EQEmuConfig
 		uint16 WorldHTTPPort;
 		std::string WorldHTTPMimeFile;
 		std::string SharedKey;
-		bool DisableConfigChecks;
+
+		// From <chatserver/>
+		std::string ChatHost;
+		uint16 ChatPort;
+
+		// From <mailserver/>
+		std::string MailHost;
+		uint16 MailPort;

 		// From <database/>
 		std::string DatabaseHost;
@@ -112,20 +117,12 @@ class EQEmuConfig
 		uint16 ZonePortHigh;
 		uint8 DefaultStatus;

-		bool auto_database_updates;
-
-		const std::string &GetUCSHost() const;
-		uint16 GetUCSPort() const;
-
 //	uint16 DynamicCount;

 //	map<string,uint16> StaticZones;

 	protected:

-		std::string m_ucs_host;
-		uint16      m_ucs_port;
-
 		static EQEmuConfig *_config;
 		Json::Value _root;
 		static std::string ConfigFile;
@@ -133,7 +130,7 @@ class EQEmuConfig
 		void parse_config();

 		EQEmuConfig()
-		{
+		{			

 		}
 		virtual ~EQEmuConfig() {}
@@ -147,44 +144,41 @@ class EQEmuConfig
 			return (_config);
 		}

+		// Allow the use to set the conf file to be used.
+		static void SetConfigFile(std::string file)
+		{
+			EQEmuConfig::ConfigFile = file;
+		}
+
 		// Load the config
-		static bool LoadConfig(const std::string& path = "")
+		static bool LoadConfig()
 		{
 			if (_config != nullptr) {
 				return true;
 			}
 			_config = new EQEmuConfig;

-			return parseFile(path);
+			return parseFile();
 		}

 		// Load config file and parse data
-		static bool parseFile(const std::string& file_path = ".")
-		{
+		static bool parseFile() {
 			if (_config == nullptr) {
-				return LoadConfig(file_path);
+				return LoadConfig();
 			}

-			std::string file = fmt::format(
-				"{}/{}",
-				(file_path.empty() ? path.GetServerPath() : file_path),
-				EQEmuConfig::ConfigFile
-			);
-
-			std::ifstream fconfig(file, std::ifstream::binary);
-
+			std::ifstream fconfig(EQEmuConfig::ConfigFile, std::ifstream::binary);
 			try {
 				fconfig >> _config->_root;
 				_config->parse_config();
 			}
 			catch (std::exception &) {
 				return false;
-			}
+			}			
 			return true;
 		}

 		void Dump() const;
-		void CheckUcsConfigConversion();
 };

 #endif
@@ -23,9 +23,8 @@

 #include <iostream>
 #include <fstream>
-#include <cstdio>
+#include <stdio.h>
 #include <functional>
-#include <algorithm>

 #ifdef _WIN32
 #ifdef utf16_to_utf8
@@ -38,8 +37,9 @@

 namespace Logs {
 	enum DebugLevel {
-		General = 1,    // 1 - Low-Level general debugging, useful info on single line
-		Detail          // 2 - Use this for very chatty logging you want to leave in but don't want on by default
+		General = 1,	/* 1 - Low-Level general debugging, useful info on single line */
+		Moderate,		/* 2 - Informational based, used in functions, when particular things load */
+		Detail			/* 3 - Use this for extreme detail in logging, usually in extreme debugging in the stack or interprocess communication */
 	};

 	/**
@@ -53,7 +53,7 @@ namespace Logs {
 		AI,
 		Aggro,
 		Attack,
-		DeprecatedCS, // deprecated
+		PacketClientServer,
 		Combat,
 		Commands,
 		Crash,
@@ -64,36 +64,36 @@ namespace Logs {
 		Inventory,
 		Launcher,
 		Netcode,
-		Normal, // deprecated
+		Normal,
 		Object,
 		Pathing,
-		QSServer, // deprecated
+		QSServer,
 		Quests,
 		Rules,
 		Skills,
 		Spawns,
 		Spells,
-		Status, // deprecated
+		Status,
 		TCPConnection,
 		Tasks,
 		Tradeskills,
 		Trading,
 		Tribute,
-		UCSServer, // deprecated
-		WebInterfaceServer, // deprecated
-		WorldServer, // deprecated
-		ZoneServer, // deprecated
+		UCSServer,
+		WebInterfaceServer,
+		WorldServer,
+		ZoneServer,
 		MySQLError,
 		MySQLQuery,
 		Mercenaries,
 		QuestDebug,
-		DeprecatedSC, // deprecated
-		DeprecatedCSU, // deprecated
-		DeprecatedSCD, // deprecated
-		DeprecatedCSD, // deprecated
-		Loginserver, // deprecated
+		PacketServerClient,
+		PacketClientServerUnhandled,
+		PacketServerClientWithDump,
+		PacketClientServerWithDump,
+		Loginserver,
 		ClientLogin,
-		HeadlessClient, // deprecated
+		HeadlessClient,
 		HPUpdate,
 		FixZ,
 		Food,
@@ -103,10 +103,10 @@ namespace Logs {
 		MobAppearance,
 		Info,
 		Warning,
-		Critical, // deprecated
-		Emergency, // deprecated
-		Alert, // deprecated
-		Notice, // deprecated
+		Critical,
+		Emergency,
+		Alert,
+		Notice,
 		AIScanClose,
 		AIYellForHelp,
 		AICastBeneficialClose,
@@ -121,40 +121,19 @@ namespace Logs {
 		Expeditions,
 		DynamicZones,
 		Scheduler,
-		Cheat,
-		ClientList,
-		DiaWind,
-		HTTP,
-		Saylink,
-		ChecksumVerification,
-		CombatRecord,
-		Hate,
-		Discord,
-		Faction,
-		PacketServerClient,
-		PacketClientServer,
-		PacketServerToServer,
-		Bugs,
-		QuestErrors,
-		PlayerEvents,
-		DataBuckets,
-		Zoning,
-		EqTime,
-		Corpses,
-		XTargets,
 		MaxCategoryID /* Don't Remove this */
 	};

 	/**
 	 * If you add to this, make sure you update LogCategory
 	 */
-	static const char *LogCategoryName[LogCategory::MaxCategoryID] = {
+	static const char* LogCategoryName[LogCategory::MaxCategoryID] = {
 		"",
 		"AA",
 		"AI",
 		"Aggro",
 		"Attack",
-		"Deprecated",
+		"Packet :: Client -> Server",
 		"Combat",
 		"Commands",
 		"Crash",
@@ -165,52 +144,52 @@ namespace Logs {
 		"Inventory",
 		"Launcher",
 		"Netcode",
-		"Normal (Deprecated)",
+		"Normal",
 		"Object",
 		"Pathing",
-		"QS Server (Deprecated)",
+		"QS Server",
 		"Quests",
 		"Rules",
 		"Skills",
 		"Spawns",
 		"Spells",
-		"Status (Deprecated)",
+		"Status",
 		"TCP Connection",
 		"Tasks",
 		"Tradeskills",
 		"Trading",
 		"Tribute",
-		"UCS Server (Deprecated)",
-		"Web Interface (Deprecated)",
-		"World Server (Deprecated)",
-		"Zone Server (Deprecated)",
-		"QueryErr",
-		"Query",
+		"UCS Server",
+		"WebInterface Server",
+		"World Server",
+		"Zone Server",
+		"MySQL Error",
+		"MySQL Query",
 		"Mercenaries",
 		"Quest Debug",
-		"Legacy Packet Logging (Deprecated)",
-		"Legacy Packet Logging (Deprecated)",
-		"Legacy Packet Logging (Deprecated)",
-		"Legacy Packet Logging (Deprecated)",
-		"Login Server (Deprecated)",
+		"Packet :: Server -> Client",
+		"Packet :: Client -> Server Unhandled",
+		"Packet :: Server -> Client (Dump)",
+		"Packet :: Client -> Server (Dump)",
+		"Login Server",
 		"Client Login",
-		"Headless Client (Deprecated)",
+		"Headless Client",
 		"HP Update",
 		"FixZ",
 		"Food",
 		"Traps",
 		"NPC Roam Box",
 		"NPC Scaling",
-		"MobAppearance",
+		"Mob Appearance",
 		"Info",
 		"Warning",
-		"Critical (Deprecated)",
-		"Emergency (Deprecated)",
-		"Alert (Deprecated)",
-		"Notice (Deprecated)",
-		"AI Scan",
-		"AI Yell",
-		"AI CastBeneficial",
+		"Critical",
+		"Emergency",
+		"Alert",
+		"Notice",
+		"AI Scan Close",
+		"AI Yell For Help",
+		"AI Cast Beneficial Close",
 		"AOE Cast",
 		"Entity Management",
 		"Flee",
@@ -222,36 +201,11 @@ namespace Logs {
 		"Expeditions",
 		"DynamicZones",
 		"Scheduler",
-		"Cheat",
-		"ClientList",
-		"DialogueWindow",
-		"HTTP",
-		"Saylink",
-		"ChecksumVer",
-		"CombatRecord",
-		"Hate",
-		"Discord",
-		"Faction",
-		"Packet S->C",
-		"Packet C->S",
-		"Packet S->S",
-		"Bugs",
-		"QuestErrors",
-		"PlayerEvents",
-		"DataBuckets",
-		"Zoning",
-		"EqTime",
-		"Corpses",
-		"XTargets"
 	};
 }

 #include "eqemu_logsys_log_aliases.h"

-class Database;
-
-constexpr uint16 MAX_DISCORD_WEBHOOK_ID = 300;
-
 class EQEmuLogSys {
 public:
 	EQEmuLogSys();
@@ -262,8 +216,7 @@ public:
 	 * This should be handled on deconstructor but to be safe we use it anyways.
 	 */
 	void CloseFileLogs();
-	EQEmuLogSys *LoadLogSettingsDefaults();
-	EQEmuLogSys *LoadLogDatabaseSettings();
+	void LoadLogSettingsDefaults();

 	/**
 	 * @param directory_name
@@ -293,7 +246,7 @@ public:
 	 * Used in file logs to prepend a timestamp entry for logs
 	 * @param time_stamp
 	 */
-	void SetCurrentTimeStamp(char *time_stamp);
+	void SetCurrentTimeStamp(char* time_stamp);

 	/**
 	 * @param log_name
@@ -314,104 +267,108 @@ public:
 		uint8 log_to_file;
 		uint8 log_to_console;
 		uint8 log_to_gmsay;
-		uint8 log_to_discord;
-		int   discord_webhook_id;
 		uint8 is_category_enabled; /* When any log output in a category > 0, set this to 1 as (Enabled) */
 	};

-	struct OriginationInfo {
-		std::string zone_short_name;
-		std::string zone_long_name;
-		int         instance_id;
-	};
-
-	OriginationInfo origination_info{};
-
 	/**
 	 * Internally used memory reference for all log settings per category
 	 * These are loaded via DB and have defaults loaded in LoadLogSettingsDefaults
-	 * Database loaded via LogSys.SetDatabase(&database)->LoadLogDatabaseSettings();
+	 * Database loaded via Database::LoadLogSettings(log_settings)
 	*/
 	LogSettings log_settings[Logs::LogCategory::MaxCategoryID]{};

-	// temporary bucket to re-load after silencing
-	LogSettings pre_silence_settings[Logs::LogCategory::MaxCategoryID]{};
+	bool file_logs_enabled = false;

-	struct LogEnabled {
-		bool log_to_file_enabled;
-		bool log_to_console_enabled;
-		bool log_to_gmsay_enabled;
-		bool log_to_discord_enabled;
-		bool log_enabled;
-	};
+	/**
+	 * Sets Executable platform (Zone/World/UCS) etc.
+	 */
+	int log_platform = 0;

-	LogEnabled GetLogsEnabled(const Logs::DebugLevel &debug_level, const uint16 &log_category);
-	bool IsLogEnabled(const Logs::DebugLevel &debug_level, const uint16 &log_category);
+	/**
+	 * File name used in writing logs
+	 */
+	std::string platform_file_name;

-	struct DiscordWebhooks {
-		int         id;
-		std::string webhook_name;
-		std::string webhook_url;
-	};
-
-	const DiscordWebhooks *GetDiscordWebhooks() const;
-
-	// gmsay
+	/**
+	 * GMSay Client Message colors mapped by category
+	 *
+	 * @param log_category
+	 * @return
+	 */
 	uint16 GetGMSayColorFromCategory(uint16 log_category);

-	EQEmuLogSys *SetGMSayHandler(const std::function<void(uint16 log_type, const char *func, const std::string &)>& f)
-	{
-		m_on_log_gmsay_hook = f;
-		return this;
-	}
+	/**
+	 * @param f
+	 */
+	void SetGMSayHandler(std::function<void(uint16 log_type, const std::string&)> f) { on_log_gmsay_hook = f; }

-	EQEmuLogSys *SetDiscordHandler(std::function<void(uint16 log_category, int webhook_id, const std::string &)> f)
-	{
-		m_on_log_discord_hook = f;
-		return this;
-	}
+	/**
+	 * @param f
+	 */
+	void SetConsoleHandler(std::function<void(uint16 debug_level, uint16 log_type, const std::string&)> f) { on_log_console_hook = f; }

-	// console
-	void SetConsoleHandler(
-		std::function<void(
-			uint16 log_type,
-			const std::string &
-		)> f
-	) { m_on_log_console_hook = f; }
+	/**
+	 * Silence console logging
+	 */
 	void SilenceConsoleLogging();
+
+	/**
+	 * Turn on all console logging
+	 */
 	void EnableConsoleLogging();

-	// database
-	EQEmuLogSys *SetDatabase(Database *db);
-
-	[[nodiscard]] const std::string &GetLogPath() const;
-	EQEmuLogSys * SetLogPath(const std::string &log_path);
-
-	void DisableMySQLErrorLogs();
-	void EnableMySQLErrorLogs();
-
 private:

-	// reference to database
-	Database                                                                        *m_database;
-	std::function<void(uint16 log_category, const char *func, const std::string &)> m_on_log_gmsay_hook;
-	std::function<void(uint16 log_category, int webhook_id, const std::string &)>   m_on_log_discord_hook;
-	std::function<void(uint16 log_category, const std::string &)>                   m_on_log_console_hook;
-	DiscordWebhooks                                                                 m_discord_webhooks[MAX_DISCORD_WEBHOOK_ID]{};
-	bool                                                                            m_file_logs_enabled = false;
-	int                                                                             m_log_platform      = 0;
-	std::string                                                                     m_platform_file_name;
-	std::string                                                                     m_log_path;
+	/**
+	 * Callback pointer to zone process for hooking logs to zone using GMSay
+	 */
+	std::function<void(uint16 log_category, const std::string&)> on_log_gmsay_hook;
+	std::function<void(uint16 debug_level, uint16 log_category, const std::string&)> on_log_console_hook;

-	void ProcessConsoleMessage(
-		uint16 log_category,
-		const std::string &message,
-		const char *file,
-		const char *func,
-		int line
-	);
-	void ProcessLogWrite(uint16 log_category, const std::string &message);
-	void InjectTablesIfNotExist();
+	/**
+	 * Formats log messages like '[Category] This is a log message'
+	 */
+	std::string FormatOutMessageString(uint16 log_category, const std::string &in_message);
+
+	/**
+	 * Linux console color messages mapped by category
+	 *
+	 * @param log_category
+	 * @return
+	 */
+	std::string GetLinuxConsoleColorFromCategory(uint16 log_category);
+
+	/**
+	 * Windows console color messages mapped by category
+	 */
+	uint16 GetWindowsConsoleColorFromCategory(uint16 log_category);
+
+	/**
+	 * @param debug_level
+	 * @param log_category
+	 * @param message
+	 */
+	void ProcessConsoleMessage(uint16 debug_level, uint16 log_category, const std::string &message);
+
+	/**
+	 * @param debug_level
+	 * @param log_category
+	 * @param message
+	 */
+	void ProcessGMSay(uint16 debug_level, uint16 log_category, const std::string &message);
+
+	/**
+	 * @param debug_level
+	 * @param log_category
+	 * @param message
+	 */
+	void ProcessLogWrite(uint16 debug_level, uint16 log_category, const std::string &message);
+
+	/**
+	 * @param log_category
+	 * @return
+	 */
+	bool IsRfc5424LogCategory(uint16 log_category);
 };

 extern EQEmuLogSys LogSys;
@@ -46,16 +46,20 @@ EQTime::EQTime()
 	timezone = 0;
 	memset(&eqTime, 0, sizeof(eqTime));
 	//Defaults for time
-	TimeOfDay_Struct t{};
-	t.day    = 1;
-	t.hour   = 9;
-	t.minute = 0;
-	t.month  = 1;
-	t.year   = 3100;
+	TimeOfDay_Struct start;
+	start.day = 1;
+	start.hour = 9;
+	start.minute = 0;
+	start.month = 1;
+	start.year = 3100;
 	//Set default time zone
 	timezone = 0;
 	//Start EQTimer
-	SetCurrentEQTimeOfDay(t, time(nullptr));
+	SetCurrentEQTimeOfDay(start, time(0));
+}
+
+EQTime::~EQTime()
+{
 }

 //getEQTimeOfDay - Reads timeConvert and writes the result to eqTimeOfDay
@@ -199,48 +203,4 @@ void EQTime::ToString(TimeOfDay_Struct *t, std::string &str) {
 		t->month, t->day, t->year, t->hour, t->minute);
 	buf[127] = '\0';
 	str = buf;
-}
-
-bool EQTime::IsDayTime() {
-	TimeOfDay_Struct tod{}; //Day time is 5am to 6:59pm (14 hours in-game)
-	GetCurrentEQTimeOfDay(&tod); //TODO: what if it fails and returns zero?
-
-	if (tod.hour >= 5 || tod.hour < 19) {
-		return true;
-	}
-
-	return false;
-}
-
-bool EQTime::IsNightTime() {
-	TimeOfDay_Struct tod{}; //Night time is 7pm to 4:59am (10 hours in-game)
-	GetCurrentEQTimeOfDay(&tod); //TODO: what if it fails and returns zero?
-
-	if (tod.hour >= 19 || tod.hour < 5) {
-		return true;
-	}
-
-	return false;
-}
-
-bool EQTime::IsInbetweenTime(uint8 min_time, uint8 max_time) {
-	TimeOfDay_Struct tod{};
-	GetCurrentEQTimeOfDay(&tod);
-
-	if (min_time == 0 || max_time == 0 || min_time > 24 || max_time > 24) {
-		return true;
-	}
-
-	if (max_time < min_time) {
-		if ((tod.hour >= min_time && tod.hour > max_time) || (tod.hour < min_time && tod.hour <= max_time)) {
-			return true;
-		}
-	}
-	else {
-		if (tod.hour >= min_time && tod.hour <= max_time) {
-			return true;
-		}
-	}
-
-	return false;
-}
+}
@@ -18,7 +18,7 @@ public:
 	//Constructor/destructor
 	EQTime(TimeOfDay_Struct start_eq, time_t start_real);
 	EQTime();
-	~EQTime() = default;
+	~EQTime();

 	//Get functions
 	int GetCurrentEQTimeOfDay( TimeOfDay_Struct *eqTimeOfDay ) { return(GetCurrentEQTimeOfDay(time(nullptr), eqTimeOfDay)); }
@@ -28,9 +28,6 @@ public:
 	uint32 getEQTimeZone() { return timezone; }
 	uint32 getEQTimeZoneHr() { return timezone/60; }
 	uint32 getEQTimeZoneMin() { return timezone%60; }
-	bool IsDayTime();
-	bool IsNightTime();
-	bool IsInbetweenTime(uint8 min_time, uint8 max_time);

 	//Set functions
 	int SetCurrentEQTimeOfDay(TimeOfDay_Struct start_eq, time_t start_real);
@@ -0,0 +1,59 @@
+/*	Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+
+	This library is free software; you can redistribute it and/or
+	modify it under the terms of the GNU Library General Public
+	License as published by the Free Software Foundation; either
+	version 2 of the License, or (at your option) any later version.
+
+	This library is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+	Library General Public License for more details.
+
+	You should have received a copy of the GNU Library General Public
+	License along with this library; if not, write to the Free
+	Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+	MA 02111-1307, USA */
+
+/*	Error messages for mysql clients */
+/*	error messages for the demon is in share/language/errmsg.sys */
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+void	init_client_errs(void);
+extern const char *client_errors[];	/* Error messages */
+#ifdef	__cplusplus
+}
+#endif
+
+#define CR_MIN_ERROR		2000	/* For easier client code */
+#define CR_MAX_ERROR		2999
+#if defined(OS2) && defined( MYSQL_SERVER)
+#define CER(X) client_errors[(X)-CR_MIN_ERROR]
+#else
+#define ER(X) client_errors[(X)-CR_MIN_ERROR]
+#endif
+#define CLIENT_ERRMAP		2	/* Errormap used by my_error() */
+
+#define CR_UNKNOWN_ERROR	2000
+#define CR_SOCKET_CREATE_ERROR	2001
+#define CR_CONNECTION_ERROR	2002
+#define CR_CONN_HOST_ERROR	2003
+#define CR_IPSOCK_ERROR		2004
+#define CR_UNKNOWN_HOST		2005
+#define CR_SERVER_GONE_ERROR	2006
+#define CR_VERSION_ERROR	2007
+#define CR_OUT_OF_MEMORY	2008
+#define CR_WRONG_HOST_INFO	2009
+#define CR_LOCALHOST_CONNECTION 2010
+#define CR_TCP_CONNECTION	2011
+#define CR_SERVER_HANDSHAKE_ERR 2012
+#define CR_SERVER_LOST		2013
+#define CR_COMMANDS_OUT_OF_SYNC 2014
+#define CR_NAMEDPIPE_CONNECTION 2015
+#define CR_NAMEDPIPEWAIT_ERROR 2016
+#define CR_NAMEDPIPEOPEN_ERROR 2017
+#define CR_NAMEDPIPESETSTATE_ERROR 2018
+#define CR_CANT_READ_CHARSET	2019
+#define CR_NET_PACKET_TOO_LARGE 2020
@@ -1,14 +1,14 @@
 #pragma once
-#include <any>
 #include <functional>
 #include <exception>
 #include "event_loop.h"
+#include "../any.h"

 namespace EQ {
 	class Task
 	{
 	public:
-		typedef std::function<void(const std::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;
-			std::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 std::any& result) {
+				baton->fn([baton](const EQ::Any& result) {
 					baton->has_error = false;
 					baton->has_result = true;
 					baton->result = result;
@@ -38,7 +38,7 @@ namespace EQ
 				_running = true;

 				for (size_t i = 0; i < threads; ++i) {
-					_threads.emplace_back(std::thread(std::bind(&TaskScheduler::ProcessWork, this)));
+					_threads.push_back(std::thread(std::bind(&TaskScheduler::ProcessWork, this)));
 				}
 			}
 			
@@ -60,8 +60,8 @@ namespace EQ
 			}
 			
 			template<typename Fn, typename... Args>
-			auto Enqueue(Fn&& fn, Args&&... args) -> std::future<typename std::invoke_result<Fn, Args...>::type> {
-				using return_type = typename std::invoke_result<Fn, Args...>::type;
+			auto Enqueue(Fn&& fn, Args&&... args) -> std::future<typename std::result_of<Fn(Args...)>::type> {
+				using return_type = typename std::result_of<Fn(Args...)>::type;
 			
 				auto task = std::make_shared<std::packaged_task<return_type()>>(
 					std::bind(std::forward<Fn>(fn), std::forward<Args>(args)...)
@@ -1,214 +0,0 @@
-#ifndef EQEMU_PLAYER_EVENT_DISCORD_FORMATTER_H
-#define EQEMU_PLAYER_EVENT_DISCORD_FORMATTER_H
-
-#include <string>
-#include "player_events.h"
-#include "../repositories/base/base_player_event_logs_repository.h"
-#include <cereal/archives/json.hpp>
-#include <cereal/types/vector.hpp>
-
-struct DiscordField {
-	std::string name;
-	std::string value;
-	bool        is_inline;
-
-	// cereal
-	template<class Archive>
-	void serialize(Archive &ar)
-	{
-		ar(
-			CEREAL_NVP(name),
-			CEREAL_NVP(value),
-			cereal::make_nvp("inline", is_inline)
-		);
-	}
-};
-
-struct DiscordAuthor {
-	std::string name;
-	std::string icon_url;
-	std::string url;
-
-	// cereal
-	template<class Archive>
-	void serialize(Archive &ar)
-	{
-		ar(
-			CEREAL_NVP(name),
-			CEREAL_NVP(icon_url),
-			CEREAL_NVP(url)
-		);
-	}
-};
-
-struct DiscordEmbed {
-	std::vector<DiscordField> fields;
-	std::string               title;
-	std::string               description;
-	std::string               timestamp;
-	DiscordAuthor             author;
-
-
-	// cereal
-	template<class Archive>
-	void serialize(Archive &ar)
-	{
-		ar(
-			CEREAL_NVP(fields),
-			CEREAL_NVP(title),
-			CEREAL_NVP(description),
-			CEREAL_NVP(timestamp),
-			CEREAL_NVP(author)
-		);
-	}
-};
-
-struct DiscordWebhook {
-	std::vector<DiscordEmbed> embeds;
-	std::string               content;
-	std::string               avatar_url;
-
-	// cereal
-	template<class Archive>
-	void serialize(Archive &ar)
-	{
-		ar(
-			CEREAL_NVP(embeds),
-			CEREAL_NVP(avatar_url),
-			CEREAL_NVP(content)
-		);
-	}
-};
-
-
-class PlayerEventDiscordFormatter {
-public:
-	static std::string GetCurrentTimestamp();
-	static std::string FormatEventSay(const PlayerEvent::PlayerEventContainer &c, const PlayerEvent::SayEvent &e);
-	static std::string
-	FormatGMCommand(const PlayerEvent::PlayerEventContainer &c, const PlayerEvent::GMCommandEvent &e);
-	static void BuildDiscordField(
-		std::vector<DiscordField> *f,
-		const std::string &name,
-		const std::string &value,
-		bool is_inline = true
-	);
-	static void BuildBaseEmbed(
-		std::vector<DiscordEmbed> *e,
-		const std::vector<DiscordField> &f,
-		PlayerEvent::PlayerEventContainer c
-	);
-	static std::string FormatWithNodata(const PlayerEvent::PlayerEventContainer &c);
-
-	static std::string FormatAAGainedEvent(
-		const PlayerEvent::PlayerEventContainer &c,
-		const PlayerEvent::AAGainedEvent &e
-	);
-	static std::string FormatAAPurchasedEvent(
-		const PlayerEvent::PlayerEventContainer &c,
-		const PlayerEvent::AAPurchasedEvent &e
-	);
-	static std::string FormatDeathEvent(
-		const PlayerEvent::PlayerEventContainer &c,
-		const PlayerEvent::DeathEvent &e
-	);
-	static std::string FormatFishSuccessEvent(
-		const PlayerEvent::PlayerEventContainer &c,
-		const PlayerEvent::FishSuccessEvent &e
-	);
-	static std::string FormatForageSuccessEvent(
-		const PlayerEvent::PlayerEventContainer &c,
-		const PlayerEvent::ForageSuccessEvent &e
-	);
-	static std::string FormatDestroyItemEvent(
-		const PlayerEvent::PlayerEventContainer &c,
-		const PlayerEvent::DestroyItemEvent &e
-	);
-	static std::string FormatDiscoverItemEvent(
-		const PlayerEvent::PlayerEventContainer &c,
-		const PlayerEvent::DiscoverItemEvent &e
-	);
-	static std::string FormatDroppedItemEvent(
-		const PlayerEvent::PlayerEventContainer &c,
-		const PlayerEvent::DroppedItemEvent &e
-	);
-	static std::string FormatLevelGainedEvent(
-		const PlayerEvent::PlayerEventContainer &c,
-		const PlayerEvent::LevelGainedEvent &e
-	);
-	static std::string FormatLevelLostEvent(
-		const PlayerEvent::PlayerEventContainer &c,
-		const PlayerEvent::LevelLostEvent &e
-	);
-	static std::string FormatLootItemEvent(
-		const PlayerEvent::PlayerEventContainer &c,
-		const PlayerEvent::LootItemEvent &e
-	);
-	static std::string FormatGroundSpawnPickupEvent(
-		const PlayerEvent::PlayerEventContainer &c,
-		const PlayerEvent::GroundSpawnPickupEvent &e
-	);
-	static std::string FormatMerchantPurchaseEvent(
-		const PlayerEvent::PlayerEventContainer &c,
-		const PlayerEvent::MerchantPurchaseEvent &e
-	);
-	static std::string FormatMerchantSellEvent(
-		const PlayerEvent::PlayerEventContainer &c,
-		const PlayerEvent::MerchantSellEvent &e
-	);
-	static std::string FormatNPCHandinEvent(
-		const PlayerEvent::PlayerEventContainer &c,
-		const PlayerEvent::HandinEvent &e
-	);
-	static std::string FormatSkillUpEvent(
-		const PlayerEvent::PlayerEventContainer &c,
-		const PlayerEvent::SkillUpEvent &e
-	);
-	static std::string FormatTaskAcceptEvent(
-		const PlayerEvent::PlayerEventContainer &c,
-		const PlayerEvent::TaskAcceptEvent &e
-	);
-	static std::string FormatTaskCompleteEvent(
-		const PlayerEvent::PlayerEventContainer &c,
-		const PlayerEvent::TaskCompleteEvent &e
-	);
-	static std::string FormatTaskUpdateEvent(
-		const PlayerEvent::PlayerEventContainer &c,
-		const PlayerEvent::TaskUpdateEvent &e
-	);
-	static std::string FormatTradeEvent(
-		const PlayerEvent::PlayerEventContainer &c,
-		const PlayerEvent::TradeEvent &e
-	);
-	static std::string FormatTraderPurchaseEvent(
-		const PlayerEvent::PlayerEventContainer &c,
-		const PlayerEvent::TraderPurchaseEvent &e
-	);
-	static std::string FormatTraderSellEvent(
-		const PlayerEvent::PlayerEventContainer &c,
-		const PlayerEvent::TraderSellEvent &e
-	);
-	static std::string FormatResurrectAcceptEvent(
-		const PlayerEvent::PlayerEventContainer &c,
-		const PlayerEvent::ResurrectAcceptEvent &e
-	);
-	static std::string FormatSplitMoneyEvent(
-		const PlayerEvent::PlayerEventContainer &c,
-		const PlayerEvent::SplitMoneyEvent &e
-	);
-	static std::string FormatCombineEvent(
-		const PlayerEvent::PlayerEventContainer &c,
-		const PlayerEvent::CombineEvent &e
-	);
-	static std::string FormatZoningEvent(
-		const PlayerEvent::PlayerEventContainer &c,
-		const PlayerEvent::ZoningEvent &e
-	);
-	static DiscordWebhook BuildDiscordWebhook(
-		const PlayerEvent::PlayerEventContainer &p,
-		std::vector<DiscordEmbed> &embeds
-	);
-};
-
-
-#endif //EQEMU_PLAYER_EVENT_DISCORD_FORMATTER_H
@@ -1,706 +0,0 @@
-#include <cereal/archives/json.hpp>
-#include "player_event_logs.h"
-#include "player_event_discord_formatter.h"
-#include "../platform.h"
-#include "../rulesys.h"
-
-const uint32 PROCESS_RETENTION_TRUNCATION_TIMER_INTERVAL = 60 * 60 * 1000; // 1 hour
-
-// general initialization routine
-void PlayerEventLogs::Init()
-{
-	m_process_batch_events_timer.SetTimer(RuleI(Logging, BatchPlayerEventProcessIntervalSeconds) * 1000);
-	m_process_retention_truncation_timer.SetTimer(PROCESS_RETENTION_TRUNCATION_TIMER_INTERVAL);
-
-	ValidateDatabaseConnection();
-
-	// initialize settings array
-	for (int i = PlayerEvent::GM_COMMAND; i != PlayerEvent::MAX; i++) {
-		m_settings[i].id                 = i;
-		m_settings[i].event_name         = PlayerEvent::EventName[i];
-		m_settings[i].event_enabled      = 1;
-		m_settings[i].retention_days     = 0;
-		m_settings[i].discord_webhook_id = 0;
-	}
-
-	SetSettingsDefaults();
-
-	// initialize settings from database
-	auto             s = PlayerEventLogSettingsRepository::All(*m_database);
-	std::vector<int> db{};
-	db.reserve(s.size());
-	for (auto &e: s) {
-		if (e.id >= PlayerEvent::MAX) {
-			continue;
-		}
-		m_settings[e.id] = e;
-		db.emplace_back(e.id);
-	}
-
-	std::vector<PlayerEventLogSettingsRepository::PlayerEventLogSettings> settings_to_insert{};
-
-	// insert entries that don't exist in database
-	for (int i = PlayerEvent::GM_COMMAND; i != PlayerEvent::MAX; i++) {
-		bool is_in_database = std::find(db.begin(), db.end(), i) != db.end();
-		bool is_deprecated  = Strings::Contains(PlayerEvent::EventName[i], "Deprecated");
-		bool is_implemented = !Strings::Contains(PlayerEvent::EventName[i], "Unimplemented");
-
-		// remove when deprecated
-		if (is_deprecated && is_in_database) {
-			LogInfo("[Deprecated] Removing PlayerEvent [{}] ({})", PlayerEvent::EventName[i], i);
-			PlayerEventLogSettingsRepository::DeleteWhere(*m_database, fmt::format("id = {}", i));
-		}
-		// remove when unimplemented if present
-		if (!is_implemented && is_in_database) {
-			LogInfo("[Unimplemented] Removing PlayerEvent [{}] ({})", PlayerEvent::EventName[i], i);
-			PlayerEventLogSettingsRepository::DeleteWhere(*m_database, fmt::format("id = {}", i));
-		}
-
-		bool is_missing_in_database = std::find(db.begin(), db.end(), i) == db.end();
-		if (is_missing_in_database && is_implemented && !is_deprecated) {
-			LogInfo("[New] PlayerEvent [{}] ({})", PlayerEvent::EventName[i], i);
-
-			auto c = PlayerEventLogSettingsRepository::NewEntity();
-			c.id             = i;
-			c.event_name     = PlayerEvent::EventName[i];
-			c.event_enabled  = m_settings[i].event_enabled;
-			c.retention_days = m_settings[i].retention_days;
-			settings_to_insert.emplace_back(c);
-		}
-	}
-
-	if (!settings_to_insert.empty()) {
-		PlayerEventLogSettingsRepository::ReplaceMany(*m_database, settings_to_insert);
-	}
-
-	bool processing_in_world = !RuleB(Logging, PlayerEventsQSProcess) && IsWorld();
-	bool processing_in_qs    = RuleB(Logging, PlayerEventsQSProcess) && IsQueryServ();
-
-	// on initial boot process truncation
-	if (processing_in_world || processing_in_qs) {
-		ProcessRetentionTruncation();
-	}
-}
-
-// set the database object, during initialization
-PlayerEventLogs *PlayerEventLogs::SetDatabase(Database *db)
-{
-	m_database = db;
-
-	return this;
-}
-
-// validates whether the connection is valid or not, used in initialization
-bool PlayerEventLogs::ValidateDatabaseConnection()
-{
-	if (!m_database) {
-		LogError("No database connection");
-		return false;
-	}
-
-	return true;
-}
-
-// determines if the passed in event is enabled or not
-// this is used to gate logic or events from firing off
-// this is used prior to building the events, we don't want to
-// build the events, send them through the stack in a function call
-// only to discard them immediately afterwards, very wasteful on resources
-// the quest api currently does this
-bool PlayerEventLogs::IsEventEnabled(PlayerEvent::EventType event)
-{
-	return m_settings[event].event_enabled ? m_settings[event].event_enabled : false;
-}
-
-// this processes any current player events on the queue
-void PlayerEventLogs::ProcessBatchQueue()
-{
-	m_batch_queue_lock.lock();
-	if (m_record_batch_queue.empty()) {
-		m_batch_queue_lock.unlock();
-		return;
-	}
-
-	BenchTimer benchmark;
-
-	// flush many
-	PlayerEventLogsRepository::InsertMany(*m_database, m_record_batch_queue);
-	LogPlayerEventsDetail(
-		"Processing batch player event log queue of [{}] took [{}]",
-		m_record_batch_queue.size(),
-		benchmark.elapsed()
-	);
-
-	// empty
-	m_record_batch_queue = {};
-	m_batch_queue_lock.unlock();
-}
-
-// adds a player event to the queue
-void PlayerEventLogs::AddToQueue(const PlayerEventLogsRepository::PlayerEventLogs &log)
-{
-	m_batch_queue_lock.lock();
-	m_record_batch_queue.emplace_back(log);
-	m_batch_queue_lock.unlock();
-}
-
-// fills common event data in the SendEvent function
-void PlayerEventLogs::FillPlayerEvent(
-	const PlayerEvent::PlayerEvent &p,
-	PlayerEventLogsRepository::PlayerEventLogs &n
-)
-{
-	n.account_id   = p.account_id;
-	n.character_id = p.character_id;
-	n.zone_id      = p.zone_id;
-	n.instance_id  = p.instance_id;
-	n.x            = p.x;
-	n.y            = p.y;
-	n.z            = p.z;
-	n.heading      = p.heading;
-}
-
-// builds the dynamic packet used to ship the player event over the wire
-// supports serializing the struct so it can be rebuilt on the other end
-std::unique_ptr<ServerPacket>
-PlayerEventLogs::BuildPlayerEventPacket(const PlayerEvent::PlayerEventContainer &e)
-{
-	EQ::Net::DynamicPacket dyn_pack;
-	dyn_pack.PutSerialize(0, e);
-	auto pack_size = sizeof(ServerSendPlayerEvent_Struct) + dyn_pack.Length();
-	auto pack      = std::make_unique<ServerPacket>(ServerOP_PlayerEvent, static_cast<uint32_t>(pack_size));
-	auto buf       = reinterpret_cast<ServerSendPlayerEvent_Struct *>(pack->pBuffer);
-	buf->cereal_size = static_cast<uint32_t>(dyn_pack.Length());
-	memcpy(buf->cereal_data, dyn_pack.Data(), dyn_pack.Length());
-
-	return pack;
-}
-
-const PlayerEventLogSettingsRepository::PlayerEventLogSettings *PlayerEventLogs::GetSettings() const
-{
-	return m_settings;
-}
-
-bool PlayerEventLogs::IsEventDiscordEnabled(int32_t event_type_id)
-{
-	// out of bounds check
-	if (event_type_id >= PlayerEvent::EventType::MAX) {
-		return false;
-	}
-
-	// make sure webhook id is set
-	if (m_settings[event_type_id].discord_webhook_id == 0) {
-		return false;
-	}
-
-	// ensure there is a matching webhook to begin with
-	if (!LogSys.GetDiscordWebhooks()[m_settings[event_type_id].discord_webhook_id].webhook_url.empty()) {
-		return true;
-	}
-
-	return false;
-}
-
-std::string PlayerEventLogs::GetDiscordWebhookUrlFromEventType(int32_t event_type_id)
-{
-	// out of bounds check
-	if (event_type_id >= PlayerEvent::EventType::MAX) {
-		return "";
-	}
-
-	// make sure webhook id is set
-	if (m_settings[event_type_id].discord_webhook_id == 0) {
-		return "";
-	}
-
-	// ensure there is a matching webhook to begin with
-	if (!LogSys.GetDiscordWebhooks()[m_settings[event_type_id].discord_webhook_id].webhook_url.empty()) {
-		return LogSys.GetDiscordWebhooks()[m_settings[event_type_id].discord_webhook_id].webhook_url;
-	}
-
-	return "";
-}
-
-// GM_COMMAND           | [x] Implemented Formatter
-// ZONING               | [x] Implemented Formatter
-// AA_GAIN              | [x] Implemented Formatter
-// AA_PURCHASE          | [x] Implemented Formatter
-// FORAGE_SUCCESS       | [x] Implemented Formatter
-// FORAGE_FAILURE       | [x] Implemented Formatter
-// FISH_SUCCESS         | [x] Implemented Formatter
-// FISH_FAILURE         | [x] Implemented Formatter
-// ITEM_DESTROY         | [x] Implemented Formatter
-// WENT_ONLINE          | [x] Implemented Formatter
-// WENT_OFFLINE         | [x] Implemented Formatter
-// LEVEL_GAIN           | [x] Implemented Formatter
-// LEVEL_LOSS           | [x] Implemented Formatter
-// LOOT_ITEM            | [x] Implemented Formatter
-// MERCHANT_PURCHASE    | [x] Implemented Formatter
-// MERCHANT_SELL        | [x] Implemented Formatter
-// GROUP_JOIN           | [] Implemented Formatter
-// GROUP_LEAVE          | [] Implemented Formatter
-// RAID_JOIN            | [] Implemented Formatter
-// RAID_LEAVE           | [] Implemented Formatter
-// GROUNDSPAWN_PICKUP   | [x] Implemented Formatter
-// NPC_HANDIN           | [x] Implemented Formatter
-// SKILL_UP             | [x] Implemented Formatter
-// TASK_ACCEPT          | [x] Implemented Formatter
-// TASK_UPDATE          | [x] Implemented Formatter
-// TASK_COMPLETE        | [x] Implemented Formatter
-// TRADE                | [] Implemented Formatter
-// GIVE_ITEM            | [] Implemented Formatter
-// SAY                  | [x] Implemented Formatter
-// REZ_ACCEPTED         | [x] Implemented Formatter
-// DEATH                | [x] Implemented Formatter
-// COMBINE_FAILURE      | [x] Implemented Formatter
-// COMBINE_SUCCESS      | [x] Implemented Formatter
-// DROPPED_ITEM         | [x] Implemented Formatter
-// SPLIT_MONEY          | [x] Implemented Formatter
-// DZ_JOIN              | [] Implemented Formatter
-// DZ_LEAVE             | [] Implemented Formatter
-// TRADER_PURCHASE      | [x] Implemented Formatter
-// TRADER_SELL          | [x] Implemented Formatter
-// BANDOLIER_CREATE     | [] Implemented Formatter
-// BANDOLIER_SWAP       | [] Implemented Formatter
-// DISCOVER_ITEM        | [X] Implemented Formatter
-
-std::string PlayerEventLogs::GetDiscordPayloadFromEvent(const PlayerEvent::PlayerEventContainer &e)
-{
-	std::string payload;
-	switch (e.player_event_log.event_type_id) {
-		case PlayerEvent::AA_GAIN: {
-			PlayerEvent::AAGainedEvent n{};
-			std::stringstream          ss;
-			{
-				ss << e.player_event_log.event_data;
-				cereal::JSONInputArchive ar(ss);
-				n.serialize(ar);
-			}
-			payload = PlayerEventDiscordFormatter::FormatAAGainedEvent(e, n);
-			break;
-		}
-		case PlayerEvent::AA_PURCHASE: {
-			PlayerEvent::AAPurchasedEvent n{};
-			std::stringstream             ss;
-			{
-				ss << e.player_event_log.event_data;
-				cereal::JSONInputArchive ar(ss);
-				n.serialize(ar);
-			}
-			payload = PlayerEventDiscordFormatter::FormatAAPurchasedEvent(e, n);
-			break;
-		}
-		case PlayerEvent::COMBINE_FAILURE:
-		case PlayerEvent::COMBINE_SUCCESS: {
-			PlayerEvent::CombineEvent n{};
-			std::stringstream         ss;
-			{
-				ss << e.player_event_log.event_data;
-				cereal::JSONInputArchive ar(ss);
-				n.serialize(ar);
-			}
-			payload = PlayerEventDiscordFormatter::FormatCombineEvent(e, n);
-			break;
-		}
-		case PlayerEvent::DEATH: {
-			PlayerEvent::DeathEvent n{};
-			std::stringstream       ss;
-			{
-				ss << e.player_event_log.event_data;
-				cereal::JSONInputArchive ar(ss);
-				n.serialize(ar);
-			}
-			payload = PlayerEventDiscordFormatter::FormatDeathEvent(e, n);
-			break;
-		}
-		case PlayerEvent::DISCOVER_ITEM: {
-			PlayerEvent::DiscoverItemEvent n{};
-			std::stringstream              ss;
-			{
-				ss << e.player_event_log.event_data;
-				cereal::JSONInputArchive ar(ss);
-				n.serialize(ar);
-			}
-			payload = PlayerEventDiscordFormatter::FormatDiscoverItemEvent(e, n);
-			break;
-		}
-		case PlayerEvent::DROPPED_ITEM: {
-			PlayerEvent::DroppedItemEvent n{};
-			std::stringstream             ss;
-			{
-				ss << e.player_event_log.event_data;
-				cereal::JSONInputArchive ar(ss);
-				n.serialize(ar);
-			}
-			payload = PlayerEventDiscordFormatter::FormatDroppedItemEvent(e, n);
-			break;
-		}
-		case PlayerEvent::FISH_FAILURE:
-		case PlayerEvent::FORAGE_FAILURE:
-		case PlayerEvent::WENT_ONLINE:
-		case PlayerEvent::WENT_OFFLINE: {
-			payload = PlayerEventDiscordFormatter::FormatWithNodata(e);
-			break;
-		}
-		case PlayerEvent::FISH_SUCCESS: {
-			PlayerEvent::FishSuccessEvent n{};
-			std::stringstream             ss;
-			{
-				ss << e.player_event_log.event_data;
-				cereal::JSONInputArchive ar(ss);
-				n.serialize(ar);
-			}
-			payload = PlayerEventDiscordFormatter::FormatFishSuccessEvent(e, n);
-			break;
-		}
-		case PlayerEvent::FORAGE_SUCCESS: {
-			PlayerEvent::ForageSuccessEvent n{};
-			std::stringstream               ss;
-			{
-				ss << e.player_event_log.event_data;
-				cereal::JSONInputArchive ar(ss);
-				n.serialize(ar);
-			}
-			payload = PlayerEventDiscordFormatter::FormatForageSuccessEvent(e, n);
-			break;
-		}
-		case PlayerEvent::ITEM_DESTROY: {
-			PlayerEvent::DestroyItemEvent n{};
-			std::stringstream             ss;
-			{
-				ss << e.player_event_log.event_data;
-				cereal::JSONInputArchive ar(ss);
-				n.serialize(ar);
-			}
-			payload = PlayerEventDiscordFormatter::FormatDestroyItemEvent(e, n);
-			break;
-		}
-		case PlayerEvent::LEVEL_GAIN: {
-			PlayerEvent::LevelGainedEvent n{};
-			std::stringstream             ss;
-			{
-				ss << e.player_event_log.event_data;
-				cereal::JSONInputArchive ar(ss);
-				n.serialize(ar);
-			}
-			payload = PlayerEventDiscordFormatter::FormatLevelGainedEvent(e, n);
-			break;
-		}
-		case PlayerEvent::LEVEL_LOSS: {
-			PlayerEvent::LevelLostEvent n{};
-			std::stringstream           ss;
-			{
-				ss << e.player_event_log.event_data;
-				cereal::JSONInputArchive ar(ss);
-				n.serialize(ar);
-			}
-			payload = PlayerEventDiscordFormatter::FormatLevelLostEvent(e, n);
-			break;
-		}
-		case PlayerEvent::LOOT_ITEM: {
-			PlayerEvent::LootItemEvent n{};
-			std::stringstream          ss;
-			{
-				ss << e.player_event_log.event_data;
-				cereal::JSONInputArchive ar(ss);
-				n.serialize(ar);
-			}
-			payload = PlayerEventDiscordFormatter::FormatLootItemEvent(e, n);
-			break;
-		}
-		case PlayerEvent::GROUNDSPAWN_PICKUP: {
-			PlayerEvent::GroundSpawnPickupEvent n{};
-			std::stringstream                   ss;
-			{
-				ss << e.player_event_log.event_data;
-				cereal::JSONInputArchive ar(ss);
-				n.serialize(ar);
-			}
-			payload = PlayerEventDiscordFormatter::FormatGroundSpawnPickupEvent(e, n);
-			break;
-		}
-		case PlayerEvent::NPC_HANDIN: {
-			PlayerEvent::HandinEvent n{};
-			std::stringstream        ss;
-			{
-				ss << e.player_event_log.event_data;
-				cereal::JSONInputArchive ar(ss);
-				n.serialize(ar);
-			}
-			payload = PlayerEventDiscordFormatter::FormatNPCHandinEvent(e, n);
-			break;
-		}
-		case PlayerEvent::SAY: {
-			PlayerEvent::SayEvent n{};
-			std::stringstream     ss;
-			{
-				ss << e.player_event_log.event_data;
-				cereal::JSONInputArchive ar(ss);
-				n.serialize(ar);
-			}
-			payload = PlayerEventDiscordFormatter::FormatEventSay(e, n);
-			break;
-		}
-		case PlayerEvent::GM_COMMAND: {
-			PlayerEvent::GMCommandEvent n{};
-			std::stringstream           ss;
-			{
-				ss << e.player_event_log.event_data;
-				cereal::JSONInputArchive ar(ss);
-				n.serialize(ar);
-			}
-			payload = PlayerEventDiscordFormatter::FormatGMCommand(e, n);
-			break;
-		}
-		case PlayerEvent::SKILL_UP: {
-			PlayerEvent::SkillUpEvent n{};
-			std::stringstream         ss;
-			{
-				ss << e.player_event_log.event_data;
-				cereal::JSONInputArchive ar(ss);
-				n.serialize(ar);
-			}
-			payload = PlayerEventDiscordFormatter::FormatSkillUpEvent(e, n);
-			break;
-		}
-		case PlayerEvent::SPLIT_MONEY: {
-			PlayerEvent::SplitMoneyEvent n{};
-			std::stringstream            ss;
-			{
-				ss << e.player_event_log.event_data;
-				cereal::JSONInputArchive ar(ss);
-				n.serialize(ar);
-			}
-			payload = PlayerEventDiscordFormatter::FormatSplitMoneyEvent(e, n);
-			break;
-		}
-		case PlayerEvent::TASK_ACCEPT: {
-			PlayerEvent::TaskAcceptEvent n{};
-			std::stringstream            ss;
-			{
-				ss << e.player_event_log.event_data;
-				cereal::JSONInputArchive ar(ss);
-				n.serialize(ar);
-			}
-			payload = PlayerEventDiscordFormatter::FormatTaskAcceptEvent(e, n);
-			break;
-		}
-		case PlayerEvent::TASK_COMPLETE: {
-			PlayerEvent::TaskCompleteEvent n{};
-			std::stringstream              ss;
-			{
-				ss << e.player_event_log.event_data;
-				cereal::JSONInputArchive ar(ss);
-				n.serialize(ar);
-			}
-			payload = PlayerEventDiscordFormatter::FormatTaskCompleteEvent(e, n);
-			break;
-		}
-		case PlayerEvent::TASK_UPDATE: {
-			PlayerEvent::TaskUpdateEvent n{};
-			std::stringstream            ss;
-			{
-				ss << e.player_event_log.event_data;
-				cereal::JSONInputArchive ar(ss);
-				n.serialize(ar);
-			}
-			payload = PlayerEventDiscordFormatter::FormatTaskUpdateEvent(e, n);
-			break;
-		}
-		case PlayerEvent::TRADE: {
-			PlayerEvent::TradeEvent n{};
-			std::stringstream       ss;
-			{
-				ss << e.player_event_log.event_data;
-				cereal::JSONInputArchive ar(ss);
-				n.serialize(ar);
-			}
-			payload = PlayerEventDiscordFormatter::FormatTradeEvent(e, n);
-			break;
-		}
-		case PlayerEvent::TRADER_PURCHASE: {
-			PlayerEvent::TraderPurchaseEvent n{};
-			std::stringstream                ss;
-			{
-				ss << e.player_event_log.event_data;
-				cereal::JSONInputArchive ar(ss);
-				n.serialize(ar);
-			}
-			payload = PlayerEventDiscordFormatter::FormatTraderPurchaseEvent(e, n);
-			break;
-		}
-		case PlayerEvent::TRADER_SELL: {
-			PlayerEvent::TraderSellEvent n{};
-			std::stringstream            ss;
-			{
-				ss << e.player_event_log.event_data;
-				cereal::JSONInputArchive ar(ss);
-				n.serialize(ar);
-			}
-			payload = PlayerEventDiscordFormatter::FormatTraderSellEvent(e, n);
-			break;
-		}
-		case PlayerEvent::REZ_ACCEPTED: {
-			PlayerEvent::ResurrectAcceptEvent n{};
-			std::stringstream                 ss;
-			{
-				ss << e.player_event_log.event_data;
-				cereal::JSONInputArchive ar(ss);
-				n.serialize(ar);
-			}
-			payload = PlayerEventDiscordFormatter::FormatResurrectAcceptEvent(e, n);
-			break;
-		}
-		case PlayerEvent::MERCHANT_PURCHASE: {
-			PlayerEvent::MerchantPurchaseEvent n{};
-			std::stringstream                  ss;
-			{
-				ss << e.player_event_log.event_data;
-				cereal::JSONInputArchive ar(ss);
-				n.serialize(ar);
-			}
-
-			payload = PlayerEventDiscordFormatter::FormatMerchantPurchaseEvent(e, n);
-			break;
-		}
-		case PlayerEvent::MERCHANT_SELL: {
-			PlayerEvent::MerchantSellEvent n{};
-			std::stringstream              ss;
-			{
-				ss << e.player_event_log.event_data;
-				cereal::JSONInputArchive ar(ss);
-				n.serialize(ar);
-			}
-
-			payload = PlayerEventDiscordFormatter::FormatMerchantSellEvent(e, n);
-			break;
-		}
-		case PlayerEvent::ZONING: {
-			PlayerEvent::ZoningEvent n{};
-			std::stringstream        ss;
-			{
-				ss << e.player_event_log.event_data;
-				cereal::JSONInputArchive ar(ss);
-				n.serialize(ar);
-			}
-
-			payload = PlayerEventDiscordFormatter::FormatZoningEvent(e, n);
-			break;
-		}
-		default: {
-			LogInfo(
-				"Player event [{}] ({}) Discord formatter not implemented",
-				e.player_event_log.event_type_name,
-				e.player_event_log.event_type_id
-			);
-		}
-	}
-
-	return payload;
-}
-
-// general process function, used in world or QS depending on rule Logging:PlayerEventsQSProcess
-void PlayerEventLogs::Process()
-{
-	if (m_process_batch_events_timer.Check() || m_record_batch_queue.size() >= RuleI(Logging, BatchPlayerEventProcessChunkSize)) {
-		ProcessBatchQueue();
-	}
-
-	if (m_process_retention_truncation_timer.Check()) {
-		ProcessRetentionTruncation();
-	}
-}
-
-void PlayerEventLogs::ProcessRetentionTruncation()
-{
-	LogPlayerEvents("Running truncation");
-
-	for (int i = PlayerEvent::GM_COMMAND; i != PlayerEvent::MAX; i++) {
-		if (m_settings[i].retention_days > 0) {
-			int deleted_count = PlayerEventLogsRepository::DeleteWhere(
-				*m_database,
-				fmt::format(
-					"event_type_id = {} AND created_at < (NOW() - INTERVAL {} DAY)",
-					i,
-					m_settings[i].retention_days
-				)
-			);
-
-			if (deleted_count > 0) {
-				LogInfo(
-					"Truncated [{}] events of type [{}] ({}) older than [{}] days",
-					deleted_count,
-					PlayerEvent::EventName[i],
-					i,
-					m_settings[i].retention_days
-				);
-			}
-		}
-	}
-}
-
-void PlayerEventLogs::ReloadSettings()
-{
-	for (auto &e: PlayerEventLogSettingsRepository::All(*m_database)) {
-		m_settings[e.id] = e;
-	}
-}
-
-const int32_t RETENTION_DAYS_DEFAULT = 7;
-
-void PlayerEventLogs::SetSettingsDefaults()
-{
-	m_settings[PlayerEvent::GM_COMMAND].event_enabled         = 1;
-	m_settings[PlayerEvent::ZONING].event_enabled             = 1;
-	m_settings[PlayerEvent::AA_GAIN].event_enabled            = 1;
-	m_settings[PlayerEvent::AA_PURCHASE].event_enabled        = 1;
-	m_settings[PlayerEvent::FORAGE_SUCCESS].event_enabled     = 0;
-	m_settings[PlayerEvent::FORAGE_FAILURE].event_enabled     = 0;
-	m_settings[PlayerEvent::FISH_SUCCESS].event_enabled       = 0;
-	m_settings[PlayerEvent::FISH_FAILURE].event_enabled       = 0;
-	m_settings[PlayerEvent::ITEM_DESTROY].event_enabled       = 1;
-	m_settings[PlayerEvent::WENT_ONLINE].event_enabled        = 0;
-	m_settings[PlayerEvent::WENT_OFFLINE].event_enabled       = 0;
-	m_settings[PlayerEvent::LEVEL_GAIN].event_enabled         = 1;
-	m_settings[PlayerEvent::LEVEL_LOSS].event_enabled         = 1;
-	m_settings[PlayerEvent::LOOT_ITEM].event_enabled          = 1;
-	m_settings[PlayerEvent::MERCHANT_PURCHASE].event_enabled  = 1;
-	m_settings[PlayerEvent::MERCHANT_SELL].event_enabled      = 1;
-	m_settings[PlayerEvent::GROUP_JOIN].event_enabled         = 0;
-	m_settings[PlayerEvent::GROUP_LEAVE].event_enabled        = 0;
-	m_settings[PlayerEvent::RAID_JOIN].event_enabled          = 0;
-	m_settings[PlayerEvent::RAID_LEAVE].event_enabled         = 0;
-	m_settings[PlayerEvent::GROUNDSPAWN_PICKUP].event_enabled = 1;
-	m_settings[PlayerEvent::NPC_HANDIN].event_enabled         = 1;
-	m_settings[PlayerEvent::SKILL_UP].event_enabled           = 0;
-	m_settings[PlayerEvent::TASK_ACCEPT].event_enabled        = 1;
-	m_settings[PlayerEvent::TASK_UPDATE].event_enabled        = 1;
-	m_settings[PlayerEvent::TASK_COMPLETE].event_enabled      = 1;
-	m_settings[PlayerEvent::TRADE].event_enabled              = 1;
-	m_settings[PlayerEvent::GIVE_ITEM].event_enabled          = 1;
-	m_settings[PlayerEvent::SAY].event_enabled                = 0;
-	m_settings[PlayerEvent::REZ_ACCEPTED].event_enabled       = 1;
-	m_settings[PlayerEvent::DEATH].event_enabled              = 1;
-	m_settings[PlayerEvent::COMBINE_FAILURE].event_enabled    = 1;
-	m_settings[PlayerEvent::COMBINE_SUCCESS].event_enabled    = 1;
-	m_settings[PlayerEvent::DROPPED_ITEM].event_enabled       = 1;
-	m_settings[PlayerEvent::SPLIT_MONEY].event_enabled        = 1;
-	m_settings[PlayerEvent::DZ_JOIN].event_enabled            = 1;
-	m_settings[PlayerEvent::DZ_LEAVE].event_enabled           = 1;
-	m_settings[PlayerEvent::TRADER_PURCHASE].event_enabled    = 1;
-	m_settings[PlayerEvent::TRADER_SELL].event_enabled        = 1;
-	m_settings[PlayerEvent::BANDOLIER_CREATE].event_enabled   = 0;
-	m_settings[PlayerEvent::BANDOLIER_SWAP].event_enabled     = 0;
-	m_settings[PlayerEvent::DISCOVER_ITEM].event_enabled      = 1;
-	m_settings[PlayerEvent::POSSIBLE_HACK].event_enabled      = 1;
-	m_settings[PlayerEvent::KILLED_NPC].event_enabled         = 0;
-	m_settings[PlayerEvent::KILLED_NAMED_NPC].event_enabled   = 1;
-	m_settings[PlayerEvent::KILLED_RAID_NPC].event_enabled    = 1;
-	m_settings[PlayerEvent::ITEM_CREATION].event_enabled      = 1;
-	m_settings[PlayerEvent::GUILD_TRIBUTE_DONATE_ITEM].event_enabled      = 1;
-	m_settings[PlayerEvent::GUILD_TRIBUTE_DONATE_PLAT].event_enabled      = 1;
-
-	for (int i = PlayerEvent::GM_COMMAND; i != PlayerEvent::MAX; i++) {
-		m_settings[i].retention_days = RETENTION_DAYS_DEFAULT;
-	}
-}
@@ -1,85 +0,0 @@
-#ifndef EQEMU_PLAYER_EVENT_LOGS_H
-#define EQEMU_PLAYER_EVENT_LOGS_H
-
-#include "../repositories/player_event_log_settings_repository.h"
-#include "player_events.h"
-#include "../servertalk.h"
-#include "../repositories/player_event_logs_repository.h"
-#include "../timer.h"
-#include "../json/json_archive_single_line.h"
-#include <cereal/archives/json.hpp>
-#include <mutex>
-
-class PlayerEventLogs {
-public:
-	void Init();
-	void ReloadSettings();
-	PlayerEventLogs *SetDatabase(Database *db);
-	bool ValidateDatabaseConnection();
-	bool IsEventEnabled(PlayerEvent::EventType event);
-
-	void Process();
-
-	// batch queue
-	void AddToQueue(const PlayerEventLogsRepository::PlayerEventLogs &logs);
-
-	// main event record generic function
-	// can ingest any struct event types
-	template<typename T>
-	std::unique_ptr<ServerPacket> RecordEvent(
-		PlayerEvent::EventType t,
-		const PlayerEvent::PlayerEvent &p,
-		T e
-	)
-	{
-		auto n = PlayerEventLogsRepository::NewEntity();
-		FillPlayerEvent(p, n);
-		n.event_type_id = t;
-
-		std::stringstream ss;
-		{
-			cereal::JSONOutputArchiveSingleLine ar(ss);
-			e.serialize(ar);
-		}
-
-		n.event_type_name = PlayerEvent::EventName[t];
-		n.event_data      = Strings::Contains(ss.str(), "noop") ? "{}" : ss.str();
-		n.created_at      = std::time(nullptr);
-
-		auto c = PlayerEvent::PlayerEventContainer{
-			.player_event = p,
-			.player_event_log = n
-		};
-
-		return BuildPlayerEventPacket(c);
-	}
-
-	[[nodiscard]] const PlayerEventLogSettingsRepository::PlayerEventLogSettings *GetSettings() const;
-	bool IsEventDiscordEnabled(int32_t event_type_id);
-	std::string GetDiscordWebhookUrlFromEventType(int32_t event_type_id);
-
-	static std::string GetDiscordPayloadFromEvent(const PlayerEvent::PlayerEventContainer &e);
-private:
-	Database                                                 *m_database; // reference to database
-	PlayerEventLogSettingsRepository::PlayerEventLogSettings m_settings[PlayerEvent::EventType::MAX]{};
-
-	// batch queue is used to record events in batch
-	std::vector<PlayerEventLogsRepository::PlayerEventLogs> m_record_batch_queue{};
-	static void FillPlayerEvent(const PlayerEvent::PlayerEvent &p, PlayerEventLogsRepository::PlayerEventLogs &n);
-	static std::unique_ptr<ServerPacket>
-	BuildPlayerEventPacket(const PlayerEvent::PlayerEventContainer &e);
-
-	// timers
-	Timer m_process_batch_events_timer; // events processing timer
-	Timer m_process_retention_truncation_timer; // timer for truncating events based on retention settings
-
-	// processing
-	std::mutex m_batch_queue_lock{};
-	void ProcessBatchQueue();
-	void ProcessRetentionTruncation();
-	void SetSettingsDefaults();
-};
-
-extern PlayerEventLogs player_event_logs;
-
-#endif //EQEMU_PLAYER_EVENT_LOGS_H
@@ -0,0 +1,23 @@
+#include "expedition_base.h"
+#include "repositories/expeditions_repository.h"
+
+ExpeditionBase::ExpeditionBase(uint32_t id, const std::string& uuid,
+	const std::string& expedition_name, const DynamicZoneMember& leader
+) :
+	m_id(id),
+	m_uuid(uuid),
+	m_expedition_name(expedition_name),
+	m_leader(leader)
+{
+}
+
+void ExpeditionBase::LoadRepositoryResult(ExpeditionsRepository::ExpeditionWithLeader&& entry)
+{
+	m_id                 = entry.id;
+	m_uuid               = std::move(entry.uuid);
+	m_expedition_name    = std::move(entry.expedition_name);
+	m_add_replay_on_join = entry.add_replay_on_join;
+	m_is_locked          = entry.is_locked;
+	m_leader.id          = entry.leader_id;
+	m_leader.name        = std::move(entry.leader_name);
+}
@@ -0,0 +1,40 @@
+#ifndef COMMON_EXPEDITION_BASE_H
+#define COMMON_EXPEDITION_BASE_H
+
+#include "dynamic_zone_base.h"
+#include "repositories/expeditions_repository.h"
+#include <cstdint>
+#include <string>
+
+class ExpeditionBase
+{
+public:
+	virtual ~ExpeditionBase() = default;
+	ExpeditionBase(const ExpeditionBase&) = default;
+	ExpeditionBase(ExpeditionBase&&) = default;
+	ExpeditionBase& operator=(const ExpeditionBase&) = default;
+	ExpeditionBase& operator=(ExpeditionBase&&) = default;
+
+	uint32_t GetID() const { return m_id; }
+	uint32_t GetLeaderID() const { return m_leader.id; }
+	const std::string& GetName() const { return m_expedition_name; }
+	const std::string& GetLeaderName() const { return m_leader.name; }
+	const std::string& GetUUID() const { return m_uuid; }
+	const DynamicZoneMember& GetLeader() const { return m_leader; }
+
+	void LoadRepositoryResult(ExpeditionsRepository::ExpeditionWithLeader&& entry);
+
+protected:
+	ExpeditionBase() = default;
+	ExpeditionBase(uint32_t id, const std::string& uuid, const std::string& expedition_name,
+		const DynamicZoneMember& leader);
+
+	uint32_t m_id = 0;
+	bool m_is_locked = false;
+	bool m_add_replay_on_join = true;
+	std::string m_uuid;
+	std::string m_expedition_name;
+	DynamicZoneMember m_leader;
+};
+
+#endif
@@ -19,7 +19,7 @@
 */

 #include "expedition_lockout_timer.h"
-#include "../common/strings.h"
+#include "../common/string_util.h"
 #include "../common/rulesys.h"
 #include "../common/util/uuid.h"
 #include <fmt/format.h>
@@ -20,31 +20,31 @@
 #include "races.h"
 #include "rulesys.h"

-const char *FactionValueToString(FACTION_VALUE faction_value)
+const char *FactionValueToString(FACTION_VALUE fv)
 {
-	switch (faction_value) {
+	switch (fv) {
 		case FACTION_ALLY:
-			return "Ally";
+			return ("Ally");
 		case FACTION_WARMLY:
-			return "Warmly";
+			return ("Warmly");
 		case FACTION_KINDLY:
-			return "Kindly";
-		case FACTION_AMIABLY:
-			return "Amiably";
-		case FACTION_INDIFFERENTLY:
-			return "Indifferently";
-		case FACTION_APPREHENSIVELY:
-			return "Apprehensively";
-		case FACTION_DUBIOUSLY:
-			return "Dubiously";
-		case FACTION_THREATENINGLY:
-			return "Threateningly";
+			return ("Kindly");
+		case FACTION_AMIABLE:
+			return ("Amiable");
+		case FACTION_INDIFFERENT:
+			return ("Indifferent");
+		case FACTION_APPREHENSIVE:
+			return ("Apprehensive");
+		case FACTION_DUBIOUS:
+			return ("Dubious");
+		case FACTION_THREATENLY:
+			return ("Threatenly");
 		case FACTION_SCOWLS:
-			return "Scowls";
+			return ("Scowls, ready to attack.");
 		default:
 			break;
 	}
-	return "Unknown";
+	return ("Unknown Faction Con");
 }


@@ -70,19 +70,19 @@ FACTION_VALUE CalculateFaction(FactionMods* fm, int32 tmpCharacter_value)
 		return FACTION_KINDLY;
 	}
 	if (character_value >= RuleI(Faction, AmiablyFactionMinimum)) {
-		return FACTION_AMIABLY;
+		return FACTION_AMIABLE;
 	}
 	if (character_value >= RuleI(Faction, IndifferentlyFactionMinimum)) {
-		return FACTION_INDIFFERENTLY;
+		return FACTION_INDIFFERENT;
 	}
 	if (character_value >= RuleI(Faction, ApprehensivelyFactionMinimum)) {
-		return FACTION_APPREHENSIVELY;
+		return FACTION_APPREHENSIVE;
 	}
 	if (character_value >= RuleI(Faction, DubiouslyFactionMinimum)) {
-		return FACTION_DUBIOUSLY;
+		return FACTION_DUBIOUS;
 	}
 	if (character_value >= RuleI(Faction, ThreateninglyFactionMinimum)) {
-		return FACTION_THREATENINGLY;
+		return FACTION_THREATENLY;
 	}
 	return FACTION_SCOWLS;
 }
@@ -96,12 +96,12 @@ bool IsOfEqualRace(int r1, int r2)
 	// TODO: add more values
 	switch (r1) {
 		case DARK_ELF:
-			if (r2 == Race::NeriakCitizen) {
+			if (r2 == 77) {
 				return true;
 			}
 			break;
 		case BARBARIAN:
-			if (r2 == Race::HalasCitizen) {
+			if (r2 == 90) {
 				return true;
 			}
 	}
@@ -24,15 +24,17 @@
 #include <string>

 enum FACTION_VALUE {
-	FACTION_ALLY           = 1,
-	FACTION_WARMLY         = 2,
-	FACTION_KINDLY         = 3,
-	FACTION_AMIABLY        = 4,
-	FACTION_INDIFFERENTLY  = 5,
-	FACTION_APPREHENSIVELY = 6,
-	FACTION_DUBIOUSLY      = 7,
-	FACTION_THREATENINGLY  = 8,
-	FACTION_SCOWLS         = 9
+	FACTION_ALLY = 1,
+	FACTION_WARMLY = 2,
+	FACTION_KINDLY = 3,
+	FACTION_AMIABLE = 4,
+
+	FACTION_INDIFFERENT = 5,
+
+	FACTION_APPREHENSIVE = 6,
+	FACTION_DUBIOUS = 7,
+	FACTION_THREATENLY = 8,
+	FACTION_SCOWLS = 9
 };

 struct NPCFactionList {
@@ -48,8 +50,8 @@ struct NPCFactionList {
 struct FactionMods
 {
 	int32 base;
-	int16	min; 	// The lowest your personal earned faction can go - before race/class/deity adjustments.
-	int16	max; 	// The highest your personal earned faction can go - before race/class/deity adjustments.
+	int16	min; 	// The lowest your personal earned faction can go - before race/class/diety adjustments.
+	int16	max; 	// The highest your personal earned faction can go - before race/class/diety adjustments.
 	int32 class_mod;
 	int32 race_mod;
 	int32 deity_mod;
@@ -59,8 +61,8 @@ struct Faction {
 	int32	id;
 	std::map<std::string, int16> mods;
 	int16	base;
-	int16	min; // The lowest your personal earned faction can go - before race/class/deity adjustments.
-	int16	max; // The highest your personal earned faction can go - before race/class/deity adjustments.
+	int16	min; // The lowest your personal earned faction can go - before race/class/diety adjustments.
+	int16	max; // The highest your personal earned faction can go - before race/class/diety adjustments.
 	char	name[50];
 };

@@ -73,6 +75,6 @@ struct NPCFaction
 	uint8 temp;
 };

-const char *FactionValueToString(FACTION_VALUE faction_value);
+const char *FactionValueToString(FACTION_VALUE fv);
 FACTION_VALUE CalculateFaction(FactionMods* fm, int32 tmpCharacter_value);
 #endif
@@ -35,6 +35,11 @@ Core Zone features

 */

+
+//Uncomment this to cause a zone to basically idle
+//when there are no players in it, mobs stop wandering, etc..
+#define IDLE_WHEN_EMPTY
+
 #ifdef EMBPERL
 //Enable the new XS based perl parser
 #define EMBPERL_XS
@@ -127,7 +132,7 @@ enum {	//reuse times
 	InstillDoubtReuseTime = 9,
 	FishingReuseTime = 11,
 	ForagingReuseTime = 50,
-	MendReuseTime = 360,
+	MendReuseTime = 290,
 	BashReuseTime = 5,
 	BackstabReuseTime = 9,
 	KickReuseTime = 5,
@@ -199,7 +204,7 @@ enum {	//some random constants
 #define MIN_LEVEL_ALCHEMY 25

 //chance ratio that a
-#define THREATENINGLY_AGGRO_CHANCE 32 // 32/128 (25%) chance that a mob will arrgo on con Threatenly
+#define THREATENLY_ARRGO_CHANCE 32 // 32/128 (25%) chance that a mob will arrgo on con Threatenly

 //max factions per npc faction list
 #define MAX_NPC_FACTIONS 20
@@ -213,14 +218,14 @@ enum {	//some random constants
 #define HARD_LEVEL_CAP 127

 //the square of the maximum range at whihc you could possibly use NPC services (shop, tribute, etc)
-#define USE_NPC_RANGE2 40000		//arbitrary right now
+#define USE_NPC_RANGE2 200*200		//arbitrary right now

 // Squared range for rampage 75.0 * 75.0 for now
 #define NPC_RAMPAGE_RANGE2 5625.0f

 //the formula for experience for killing a mob.
 //level is the only valid variable to use
-#define EXP_FORMULA (level * level * 75 * 35 / 10)
+#define EXP_FORMULA level*level*75*35/10

 #define HIGHEST_AA_VALUE 35

@@ -233,6 +238,41 @@ enum {	//some random constants
 // Timer to update aggrometer
 #define AGGRO_METER_UPDATE_MS 1000

+//Some hard coded statuses from commands and other places:
+enum {
+	minStatusToBeGM = 40,
+	minStatusToUseGMCommands = 80,
+	minStatusToKick = 150,
+	minStatusToAvoidFalling = 100,
+	minStatusToHaveInvalidSpells = 80,
+	minStatusToHaveInvalidSkills = 80,
+	minStatusToIgnoreZoneFlags = 80,
+	minStatusToSeeOthersZoneFlags = 80,
+	minStatusToEditOtherGuilds = 80,
+	commandMovecharSelfOnly = 80,	//below this == only self move allowed
+	commandMovecharToSpecials = 200,	//ability to send people to cshom/load zones
+	commandZoneToSpecials = 80,		//zone to cshome, out of load zones
+	commandToggleAI = 250,			//can turn NPC AI on and off
+	commandCastSpecials = 100,		//can cast special spells
+	commandInstacast = 100,			//insta-cast all #casted spells
+	commandLevelAboveCap = 100,		//can #level players above level cap
+	commandLevelNPCAboveCap = 100,	//can #level NPCs above level cap
+	commandSetSkillsOther = 100,	//ability to setskills on others
+	commandRaceOthers = 100,	//ability to #race on others
+	commandGenderOthers = 100,	//ability to #gender on others
+	commandTextureOthers = 100,	//ability to #texture on others
+	commandDoAnimOthers = 100,	//can #doanim on others
+	commandLockZones = 101,		//can lock or unlock zones
+	commandEditPlayerCorpses = 150,	//can Edit Player Corpses
+	commandChangeFlags = 200,		//ability to set/refresh flags
+	commandBanPlayers = 100,		//can set bans on players
+	commandChangeDatarate = 201,	//edit client's data rate
+	commandZoneToCoords = 0,		//can #zone with coords
+	commandInterrogateInv = 100,	//below this == only log on error state and self-only target dump
+	commandInvSnapshot = 150		//ability to clear/restore snapshots
+};
+
+
 // This is the item ID we use for say links, we use the max that fits in 5 ASCII chars
 #define SAYLINK_ITEM_ID 0xFFFFF

@@ -255,7 +295,7 @@ Developer configuration

 #define COMMON_PROFILE

-#define PROFILE_DUMP_TIME 180
+#define PROFILE_DUMP_TIME 3*60
 #endif	//EQPROFILE


@@ -1,112 +0,0 @@
-/**
- * EQEmulator: Everquest Server Emulator
- * Copyright (C) 2001-2020 EQEmulator Development Team (https://github.com/EQEmu/Server)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY except by those people which sell it, which
- * are required to give you total support for your newly bought product;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
-*/
-
-#include <fstream>
-#include "file.h"
-
-#ifdef _WINDOWS
-#include <direct.h>
-#include <conio.h>
-#include <iostream>
-#include <dos.h>
-#include <windows.h>
-#include <process.h>
-#else
-
-#include <unistd.h>
-#include <sys/stat.h>
-
-#endif
-
-#include <fmt/format.h>
-#include <filesystem>
-#include <iostream>
-#include <sys/stat.h>
-
-namespace fs = std::filesystem;
-
-
-bool File::Exists(const std::string &name)
-{
-	struct stat sb{};
-	if (stat(name.c_str(), &sb) == 0) {
-		return true;
-	}
-
-	return false;
-}
-
-void File::Makedir(const std::string &directory_name)
-{
-	try {
-		fs::create_directory(directory_name);
-		fs::permissions(directory_name, fs::perms::owner_all);
-	}
-	catch (const fs::filesystem_error &ex) {
-		std::cout << "Failed to create directory: " << directory_name << std::endl;
-		std::cout << ex.what() << std::endl;
-	}
-}
-
-std::string File::FindEqemuConfigPath()
-{
-	if (File::Exists(fs::path{File::GetCwd() + "/eqemu_config.json"}.string())) {
-		return File::GetCwd();
-	}
-	else if (File::Exists(fs::path{File::GetCwd() + "/../eqemu_config.json"}.string())) {
-		return canonical(fs::path{File::GetCwd() + "/../"}).string();
-	}
-	else if (File::Exists(fs::path{File::GetCwd() + "/login.json"}.string())) {
-		return File::GetCwd();
-	}
-	else if (File::Exists(fs::path{File::GetCwd() + "/../login.json"}.string())) {
-		return canonical(fs::path{File::GetCwd() + "/../"}).string();
-	}
-
-	return {};
-}
-
-std::string File::GetCwd()
-{
-	return fs::current_path().string();
-}
-
-FileContentsResult File::GetContents(const std::string &file_name)
-{
-	std::string   error;
-	std::ifstream f;
-	f.open(file_name);
-	std::string line;
-	std::string lines;
-	if (f.is_open()) {
-		while (f) {
-			std::getline(f, line);
-			lines += line + "\n";
-		}
-	}
-	else {
-		error = fmt::format("Couldn't open file [{}]", file_name);
-	}
-
-	return FileContentsResult{
-		.contents = lines,
-		.error = error,
-	};
-}
@@ -0,0 +1,67 @@
+/**
+ * EQEmulator: Everquest Server Emulator
+ * Copyright (C) 2001-2020 EQEmulator Development Team (https://github.com/EQEmu/Server)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY except by those people which sell it, which
+ * are required to give you total support for your newly bought product;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+*/
+
+#include <fstream>
+#include "file_util.h"
+
+#ifdef _WINDOWS
+#include <direct.h>
+#include <conio.h>
+#include <iostream>
+#include <dos.h>
+#include <windows.h>
+#include <process.h>
+#else
+
+#include <unistd.h>
+#include <sys/stat.h>
+
+#endif
+
+/**
+ * @param name
+ * @return
+ */
+bool FileUtil::exists(const std::string &name)
+{
+	std::ifstream f(name.c_str());
+
+	return f.good();
+}
+
+/**
+ * @param directory_name
+ */
+void FileUtil::mkdir(const std::string& directory_name)
+{
+
+#ifdef _WINDOWS
+	struct _stat st;
+	if (_stat(directory_name.c_str(), &st) == 0) // exists
+		return;
+	_mkdir(directory_name.c_str());
+#else
+	struct stat st{};
+	if (stat(directory_name.c_str(), &st) == 0) { // exists
+		return;
+	}
+	::mkdir(directory_name.c_str(), 0755);
+#endif
+}
@@ -18,27 +18,15 @@
 *
 */

-#ifndef EQEMU_FILE_H
-#define EQEMU_FILE_H
+#ifndef EQEMU_FILE_UTIL_H
+#define EQEMU_FILE_UTIL_H

-#include <filesystem>

-namespace fs = std::filesystem;
-
-struct FileContentsResult {
-	std::string contents;
-	std::string error;
-};
-
-class File {
+class FileUtil {
 public:
-	static bool Exists(const std::string &name);
-	static void Makedir(const std::string& directory_name);
-	static FileContentsResult GetContents(const std::string &file_name);
-	static std::string FindEqemuConfigPath();
-	static std::string GetCwd();
+	static bool exists(const std::string &name);
+	static void mkdir(const std::string& directory_name);
 };

-bool Exists(const std::string& name);

-#endif //EQEMU_FILE_H
+#endif //EQEMU_FILE_UTIL_H
@@ -5,42 +5,6 @@
 #include <map>
 #include <string>
 #include <vector>
-#include "timer.h"
-#include "../common/repositories/guild_members_repository.h"
-#include "../common/repositories/guilds_repository.h"
-
-struct DefaultPermissionStruct {
-	GuildAction id;
-	uint32      value;
-};
-
-struct DefaultRankNamesStruct {
-	uint32      id;
-	std::string name;
-};
-
-struct GuildTributeStruct {
-	Timer    timer;
-	uint32   id_1;
-	uint32   id_2;
-	uint32   id_1_tier;
-	uint32   id_2_tier;
-	uint32   favor;
-	uint32   time_remaining;
-	uint32   enabled;
-	bool     send_timer;
-};
-
-class TributeData {
-public:
-	//this level data stored in regular byte order and must be flipped before sending
-	TributeLevel_Struct tiers[MAX_TRIBUTE_TIERS];
-	uint8       tier_count;
-	uint32      unknown;
-	std::string name;
-	std::string description;
-	bool        is_guild;	//is a guild tribute item
-};

 class Database;

@@ -48,23 +12,22 @@ class CharGuildInfo
 {
 	public:
 		//fields from `characer_`
-		uint32	    char_id;
+		uint32	char_id;
 		std::string	char_name;
-		uint8	    class_;
-		uint16	    level;
-		uint32	    time_last_on;
-		uint32	    zone_id;
+		uint8	class_;
+		uint16	level;
+		uint32	time_last_on;
+		uint32	zone_id;

 		//fields from `guild_members`
-		uint32	    guild_id;
-		uint8	    rank;
-		bool	    tribute_enable;
-		uint32	    total_tribute;
-		uint32	    last_tribute;		//timestamp
-		bool	    banker;
-		bool	    alt;
+		uint32	guild_id;
+		uint8	rank;
+		bool	tribute_enable;
+		uint32	total_tribute;
+		uint32	last_tribute;		//timestamp
+		bool	banker;
+		bool	alt;
 		std::string	public_note;
-		bool	    online;
 };

 //this object holds guild functionality shared between world and zone.
@@ -75,31 +38,21 @@ class BaseGuildManager
 		virtual ~BaseGuildManager();

 		//this must be called before doing anything else with this object
-		BaseGuildManager * SetDatabase(Database *db)
+		void SetDatabase(Database *db)
 		{
 			m_db = db;
-
-			return this;
-		}
-
-		BaseGuildManager * SetContentDatabase(Database *db)
-		{
-			m_content_db = db;
-
-			return this;
 		}

 		bool LoadGuilds();
-		virtual bool RefreshGuild(uint32 guild_id);
+		bool RefreshGuild(uint32 guild_id);

 		//guild edit actions.
-		uint32	CreateGuild(std::string name, uint32 leader_char_id);
-		bool    StoreGuildDB(uint32 guild_id);
+		uint32	CreateGuild(const char* name, uint32 leader_char_id);
 		bool	DeleteGuild(uint32 guild_id);
-		bool	RenameGuild(uint32 guild_id, std::string name);
-		bool	SetGuildMOTD(uint32 guild_id, std::string motd, std::string setter);
-		bool	SetGuildURL(uint32 guild_id, std::string URL);
-		bool	SetGuildChannel(uint32 guild_id, std::string Channel);
+		bool	RenameGuild(uint32 guild_id, const char* name);
+		bool	SetGuildMOTD(uint32 guild_id, const char* motd, const char *setter);
+		bool	SetGuildURL(uint32 GuildID, const char* URL);
+		bool	SetGuildChannel(uint32 GuildID, const char* Channel);

 		//character edit actions
 		bool	SetGuildLeader(uint32 guild_id, uint32 leader_char_id);
@@ -109,16 +62,9 @@ class BaseGuildManager
 		bool	ForceRankUpdate(uint32 charid);
 		bool	GetAltFlag(uint32 CharID);
 		bool	SetAltFlag(uint32 charid, bool is_alt);
-		bool	GetBankerFlag(uint32 CharID, bool compat_mode = false);
-		bool    GetGuildBankerStatus(uint32 guild_id, uint32 guild_rank);
+		bool	GetBankerFlag(uint32 CharID);
 		bool	SetTributeFlag(uint32 charid, bool enabled);
-		bool	SetPublicNote(uint32 charid, std::string public_note);
-		uint32  UpdateDbGuildFavor(uint32 guild_id, uint32 enabled);
-		bool    UpdateDbGuildTributeEnabled(uint32 guild_id, uint32 enabled);
-		bool    UpdateDbMemberTributeEnabled(uint32 guild_id, uint32 char_id, uint32 enabled);
-		bool    UpdateDbTributeTimeRemaining(uint32 guild_id, uint32 enabled);
-		uint32	UpdateDbMemberFavor(uint32 guild_id, uint32 char_id, uint32 favor);
-		bool    UpdateDbMemberOnline(uint32 char_id, bool status);
+		bool	SetPublicNote(uint32 charid, const char *note);

 		//queries
 		bool	GetCharInfo(const char *char_name, CharGuildInfo &into);
@@ -128,24 +74,25 @@ class BaseGuildManager
 		bool	GetGuildMOTD(uint32 guild_id, char *motd_buffer, char *setter_buffer) const;
 		bool	GetGuildURL(uint32 GuildID, char *URLBuffer) const;
 		bool	GetGuildChannel(uint32 GuildID, char *ChannelBuffer) const;
-        bool    IsCharacterInGuild(uint32 character_id, uint32 guild_id = 0);
-        bool	GetGuildNameByID(uint32 guild_id, std::string& into) const;
-        bool	IsGuildLeader(uint32 guild_id, uint32 char_id) const;
-        bool	CheckGMStatus(uint32 guild_id, uint8 status) const;
-        bool	CheckPermission(uint32 guild_id, uint8 rank, GuildAction act) const;
-        bool	UpdateDbBankerFlag(uint32 charid, bool is_banker);
-        uint8*  MakeGuildList(const char* head_name, uint32& length) const;	//make a guild list packet, returns ownership of the buffer.
-        uint8	GetDisplayedRank(uint32 guild_id, uint8 rank, uint32 char_id) const;
-        uint32	GetGuildIDByName(const char *GuildName);
-		uint32  GetGuildIDByCharacterID(uint32 character_id);
-        uint32	FindGuildByLeader(uint32 leader) const;
-        uint32	NumberInGuild(uint32 guild_id);
-        uint32	DoesAccountContainAGuildLeader(uint32 AccountID);
-        const char* GetRankName(uint32 guild_id, uint8 rank) const;
-        const char* GetGuildName(uint32 guild_id) const;
-        std::string GetGuildNameByID(uint32 guild_id) const;
-        std::string GetGuildRankName(uint32 guild_id, uint8 rank) const;
-        std::vector<GuildMembersRepository::GuildMembers> GetGuildMembers(uint32 guild_id);
+		const char *GetRankName(uint32 guild_id, uint8 rank) const;
+		const char *GetGuildName(uint32 guild_id) const;
+		bool	GetGuildNameByID(uint32 guild_id, std::string &into) const;
+		uint32	GetGuildIDByName(const char *GuildName);
+		bool	IsGuildLeader(uint32 guild_id, uint32 char_id) const;
+		uint8	GetDisplayedRank(uint32 guild_id, uint8 rank, uint32 char_id) const;
+		bool	CheckGMStatus(uint32 guild_id, uint8 status) const;
+		bool	CheckPermission(uint32 guild_id, uint8 rank, GuildAction act) const;
+//	uint32	Getguild_id(uint32 eqid);
+		uint32	FindGuildByLeader(uint32 leader) const;
+//	void	GetGuildMembers(uint32 guild_id,GuildMember_Struct* gms);
+		uint32	NumberInGuild(uint32 guild_id);
+//	bool	GetGuildRanks(uint32 guildeqid, GuildRanks_Struct* gr);
+//	bool	EditGuild(uint32 guild_id, uint8 ranknum, GuildRankLevel_Struct* grl);
+
+		uint8 *MakeGuildList(const char *head_name, uint32 &length) const;	//make a guild list packet, returns ownership of the buffer.
+
+		static const char *const GuildActionNames[_MaxGuildAction];
+		uint32	DoesAccountContainAGuildLeader(uint32 AccountID);

 	protected:
 		//the methods which must be defined by base classes.
@@ -154,62 +101,58 @@ class BaseGuildManager
 		virtual void SendRankUpdate(uint32 CharID) = 0;
 		virtual void SendGuildDelete(uint32 guild_id) = 0;

-		uint32	UpdateDbCreateGuild(std::string name, uint32 leader_char_id);
-		bool    UpdateDbDeleteGuild(uint32 guild_id, bool local_delete = true, bool db_delete = true);
-		bool	UpdateDbRenameGuild(uint32 guild_id, std::string name);
-		bool	UpdateDbGuildLeader(uint32 guild_id, uint32 leader_char_id);
-		bool	UpdateDbGuildMOTD(uint32 guild_id, std::string motd, std::string setter);
-		bool	UpdateDbGuildURL(uint32 GuildID, std::string URL);
-		bool	UpdateDbGuildChannel(uint32 GuildID, std::string Channel);
-		bool	UpdateDbGuild(uint32 charid, uint32 guild_id, uint8 rank);
-		bool	UpdateDbGuildRank(uint32 charid, uint8 rank);
-		bool	UpdateDbAltFlag(uint32 charid, bool is_alt);
-		bool	UpdateDbTributeFlag(uint32 charid, bool enabled);
-		bool	UpdateDbPublicNote(uint32 charid, std::string public_note);
+		uint32	DBCreateGuild(const char* name, uint32 leader_char_id);
+		bool	DBDeleteGuild(uint32 guild_id);
+		bool	DBRenameGuild(uint32 guild_id, const char* name);
+		bool	DBSetGuildLeader(uint32 guild_id, uint32 leader_char_id);
+		bool	DBSetGuildMOTD(uint32 guild_id, const char* motd, const char *setter);
+		bool	DBSetGuildURL(uint32 GuildID, const char* URL);
+		bool	DBSetGuildChannel(uint32 GuildID, const char* Channel);
+		bool	DBSetGuild(uint32 charid, uint32 guild_id, uint8 rank);
+		bool	DBSetGuildRank(uint32 charid, uint8 rank);
+		bool	DBSetBankerFlag(uint32 charid, bool is_banker);
+		bool	DBSetAltFlag(uint32 charid, bool is_alt);
+		bool	DBSetTributeFlag(uint32 charid, bool enabled);
+		bool	DBSetPublicNote(uint32 charid, const char *note);
 		bool	QueryWithLogging(std::string query, const char *errmsg);
+//	void	DBSetPublicNote(uint32 guild_id,char* charname, char* note);
+
 		bool	LocalDeleteGuild(uint32 guild_id);

-		struct RankInfo
+		class RankInfo
 		{
-			RankInfo();
-			std::string rank_name;
+			public:
+				RankInfo();
+				std::string name;
+				bool permissions[_MaxGuildAction];
 		};
-		struct Functions
+		class GuildInfo
 		{
-			uint32 id;
-			uint32 perm_id;
-			uint32 guild_id;
-			uint32 perm_value;
-		};
-	public:
-		class GuildInfo {
-		public:
-			GuildInfo();
-			std::string   name;
-			std::string   motd;
-			std::string   motd_setter;
-			std::string   url;
-			std::string   channel;
-			uint32        leader;
-			uint8         minstatus;
-			std::string   rank_names[GUILD_MAX_RANK + 1];
-			Functions     functions[GUILD_MAX_FUNCTIONS + 1];
-			GuildTributeStruct tribute;
-		};
-	virtual BaseGuildManager::GuildInfo* GetGuildByGuildID(uint32 guild_id);
-	uint32 GetGuildTributeTimeRemaining(uint32 guild_id);
+			public:
+				GuildInfo();
+				std::string name;
+				std::string motd;
+				std::string motd_setter;
+				std::string url;
+				std::string channel;
+
+				uint32 leader_char_id;
+				uint8 minstatus;
+				//tribute is not in here on purpose, since it is only valid in world!
+				RankInfo ranks[GUILD_MAX_RANK + 1];
+		};

-	protected:
 		std::map<uint32, GuildInfo *> m_guilds;	//we own the pointers in this map
 		void ClearGuilds();	//clears internal structure

-		Database *m_db;
-		Database *m_content_db;
+		Database *m_db;	//we do not own this

 		bool _StoreGuildDB(uint32 guild_id);
-		GuildInfo* _CreateGuild(uint32 guild_id, std::string guild_name, uint32 leader_char_id, uint8 minstatus, std::string guild_motd, std::string motd_setter, std::string Channel, std::string URL, uint32 favour);
-        GuildsRepository::Guilds CreateGuildRepoFromGuildInfo(uint32 guild_id, BaseGuildManager::GuildInfo& in);
+		GuildInfo *_CreateGuild(uint32 guild_id, const char *guild_name, uint32 account_id, uint8 minstatus, const char *guild_motd, const char *motd_setter, const char *Channel, const char *URL);
+		uint32 _GetFreeGuildID();
 };
+
+
 #endif /*GUILD_BASE_H_*/


@@ -16,71 +16,31 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */

-#ifndef GUILDS_H
-#define GUILDS_H
+#ifndef GUILD_H
+#define GUILD_H

 #include "types.h"

 #define GUILD_NONE		0xFFFFFFFF // user has no guild

-#define GUILD_MAX_RANK                     8 // 0-2 - some places in the code assume a single digit, dont go above 9
-#define GUILD_MAX_FUNCTIONS                30
-#define GUILD_TRIBUTES_MODIFY              1
-#define GUILD_TRIBUTES_SAVE                0
-#define GUILD_TRIBUTES_OFF                 0
-#define GUILD_TRIBUTES_ON                  1
-#define GUILD_INVITE_DECLINE               9
+#define GUILD_MAX_RANK 8 // 0-2 - some places in the code assume a single digit, dont go above 9

 //defines for standard ranks
-#define GUILD_MEMBER_TI	    0
-#define GUILD_OFFICER_TI    1
-#define GUILD_LEADER_TI     2
-#define GUILD_RANK_NONE_TI (GUILD_MAX_RANK + 1)
-
-//defines for standard ranks base on RoF2 definitions
-#define GUILD_RANK_NONE      0
-#define GUILD_LEADER         1
-#define GUILD_SENIOR_OFFICER 2
-#define GUILD_OFFICER        3
-#define GUILD_SENIOR_MEMBER  4
-#define GUILD_MEMBER         5
-#define GUILD_JUNIOR_MEMBER  6
-#define GUILD_INITIATE       7
-#define GUILD_RECRUIT        8
+#define GUILD_MEMBER	0
+#define GUILD_OFFICER	1
+#define GUILD_LEADER	2
+#define GUILD_RANK_NONE (GUILD_MAX_RANK+1)

 typedef enum {
-	GUILD_ACTION_BANNER_CHANGE                        = 1,
-	GUILD_ACTION_BANNER_PLANT                         = 2,
-	GUILD_ACTION_BANNER_REMOVE                        = 3,
-	GUILD_ACTION_DISPLAY_GUILD_NAME                   = 4,
-	GUILD_ACTION_RANKS_CHANGE_PERMISSIONS             = 5,
-	GUILD_ACTION_RANKS_CHANGE_RANK_NAMES              = 6,
-	GUILD_ACTION_MEMBERS_INVITE                       = 7,
-	GUILD_ACTION_MEMBERS_PROMOTE                      = 8,
-	GUILD_ACTION_MEMBERS_DEMOTE                       = 9,
-	GUILD_ACTION_MEMBERS_REMOVE                       = 10,
-	GUILD_ACTION_EDIT_RECRUITING_SETTINGS             = 11,
-	GUILD_ACTION_EDIT_PUBLIC_NOTES                    = 12,
-	GUILD_ACTION_BANK_DEPOSIT_ITEMS                   = 13,
-	GUILD_ACTION_BANK_WITHDRAW_ITEMS                  = 14,
-	GUILD_ACTION_BANK_VIEW_ITEMS                      = 15,
-	GUILD_ACTION_BANK_PROMOTE_ITEMS                   = 16,
-	GUILD_ACTION_BANK_CHANGE_ITEM_PERMISSIONS         = 17,
-	GUILD_ACTION_CHANGE_THE_MOTD                      = 18,
-	GUILD_ACTION_GUILD_CHAT_SEE                       = 19,
-	GUILD_ACTION_GUILD_CHAT_SPEAK_IN                  = 20,
-	GUILD_ACTION_SEND_THE_WHOLE_GUILD_E_MAIL          = 21,
-	GUILD_ACTION_TRIBUTE_CHANGE_FOR_OTHERS            = 22,
-	GUILD_ACTION_TRIBUTE_CHANGE_ACTIVE_BENEFIT        = 23,
-	GUILD_ACTION_TROPHY_TRIBUTE_CHANGE_FOR_OTHERS     = 24,
-	GUILD_ACTION_TROPHY_TRIBUTE_CHANGE_ACTIVE_BENEFIT = 25,
-	GUILD_ACTION_MEMBERS_CHANGE_ALT_FLAG_FOR_OTHER    = 26,
-	GUILD_ACTION_REAL_ESTATE_GUILD_PLOT_BUY           = 27,
-	GUILD_ACTION_REAL_ESTATE_GUILD_PLOT_SELL          = 28,
-	GUILD_ACTION_REAL_ESTATE_MODIFY_TROPHIES          = 29,
-	GUILD_ACTION_MEMBERS_DEMOTE_SELF                  = 30,
+	GUILD_HEAR		= 0,
+	GUILD_SPEAK		= 1,
+	GUILD_INVITE	= 2,
+	GUILD_REMOVE	= 3,
+	GUILD_PROMOTE	= 4,
+	GUILD_DEMOTE	= 5,
+	GUILD_MOTD		= 6,
+	GUILD_WARPEACE	= 7,
+	_MaxGuildAction
 } GuildAction;

-constexpr int format_as(GuildAction action) { return static_cast<int>(action); }
-
 #endif
@@ -1,633 +0,0 @@
-// Copyright (C) 2015 Ben Lewis <benjf5+github@gmail.com>
-// Licensed under the MIT license.
-// https://github.com/ben-zen/uri-library
-
-#pragma once
-
-#include <cctype>
-#include <map>
-#include <string>
-#include <stdexcept>
-#include <utility>
-
-class uri {
-	/* URIs are broadly divided into two categories: hierarchical and
-	 * non-hierarchical. Both hierarchical URIs and non-hierarchical URIs have a
-	 * few elements in common; all URIs have a scheme of one or more alphanumeric
-	 * characters followed by a colon, and they all may optionally have a query
-	 * component preceded by a question mark, and a fragment component preceded by
-	 * an octothorpe (hash mark: '#'). The query consists of stanzas separated by
-	 * either ampersands ('&') or semicolons (';') (but only one or the other),
-	 * and each stanza consists of a key and an optional value; if the value
-	 * exists, the key and value must be divided by an equals sign.
-	 *
-	 * The following is an example from Wikipedia of a hierarchical URI:
-	 * scheme:[//[user:password@]domain[:port]][/]path[?query][#fragment]
-	 */
-
-public:
-
-	enum class scheme_category {
-		Hierarchical,
-		NonHierarchical
-	};
-
-	enum class component {
-		Scheme,
-		Content,
-		Username,
-		Password,
-		Host,
-		Port,
-		Path,
-		Query,
-		Fragment
-	};
-
-	enum class query_argument_separator {
-		ampersand,
-		semicolon
-	};
-
-	uri(
-		char const *uri_text, scheme_category category = scheme_category::Hierarchical,
-		query_argument_separator separator = query_argument_separator::ampersand
-	) :
-		m_category(category),
-		m_path_is_rooted(false),
-		m_port(0),
-		m_separator(separator)
-	{
-		setup(std::string(uri_text), category);
-	};
-
-	uri(
-		std::string const &uri_text, scheme_category category = scheme_category::Hierarchical,
-		query_argument_separator separator = query_argument_separator::ampersand
-	) :
-		m_category(category),
-		m_path_is_rooted(false),
-		m_port(0),
-		m_separator(separator)
-	{
-		setup(uri_text, category);
-	};
-
-	uri(
-		std::map<component, std::string> const &components,
-		scheme_category category,
-		bool rooted_path,
-		query_argument_separator separator = query_argument_separator::ampersand
-	) :
-		m_category(category),
-		m_path_is_rooted(rooted_path),
-		m_separator(separator)
-	{
-		if (components.count(component::Scheme)) {
-			if (components.at(component::Scheme).length() == 0) {
-				throw std::invalid_argument("Scheme cannot be empty.");
-			}
-			m_scheme = components.at(component::Scheme);
-		}
-		else {
-			throw std::invalid_argument("A URI must have a scheme.");
-		}
-
-		if (category == scheme_category::Hierarchical) {
-			if (components.count(component::Content)) {
-				throw std::invalid_argument("The content component is only for use in non-hierarchical URIs.");
-			}
-
-			bool has_username = components.count(component::Username);
-			bool has_password = components.count(component::Password);
-			if (has_username && has_password) {
-				m_username = components.at(component::Username);
-				m_password = components.at(component::Password);
-			}
-			else if ((has_username && !has_password) || (!has_username && has_password)) {
-				throw std::invalid_argument("If a username or password is supplied, both must be provided.");
-			}
-
-			if (components.count(component::Host)) {
-				m_host = components.at(component::Host);
-			}
-
-			if (components.count(component::Port)) {
-				m_port = std::stoul(components.at(component::Port));
-			}
-
-			if (components.count(component::Path)) {
-				m_path = components.at(component::Path);
-			}
-			else {
-				throw std::invalid_argument("A path is required on a hierarchical URI, even an empty path.");
-			}
-		}
-		else {
-			if (components.count(component::Username)
-				|| components.count(component::Password)
-				|| components.count(component::Host)
-				|| components.count(component::Port)
-				|| components.count(component::Path)) {
-				throw std::invalid_argument("None of the hierarchical components are allowed in a non-hierarchical URI.");
-			}
-
-			if (components.count(component::Content)) {
-				m_content = components.at(component::Content);
-			}
-			else {
-				throw std::invalid_argument(
-					"Content is a required component for a non-hierarchical URI, even an empty string."
-				);
-			}
-		}
-
-		if (components.count(component::Query)) {
-			m_query = components.at(component::Query);
-		}
-
-		if (components.count(component::Fragment)) {
-			m_fragment = components.at(component::Fragment);
-		}
-	}
-
-	uri(uri const &other, std::map<component, std::string> const &replacements) :
-		m_category(other.m_category),
-		m_path_is_rooted(other.m_path_is_rooted),
-		m_separator(other.m_separator)
-	{
-		m_scheme = (replacements.count(component::Scheme))
-			? replacements.at(component::Scheme) : other.m_scheme;
-
-		if (m_category == scheme_category::Hierarchical) {
-			m_username = (replacements.count(component::Username))
-				? replacements.at(component::Username) : other.m_username;
-
-			m_password = (replacements.count(component::Password))
-				? replacements.at(component::Password) : other.m_password;
-
-			m_host = (replacements.count(component::Host))
-				? replacements.at(component::Host) : other.m_host;
-
-			m_port = (replacements.count(component::Port))
-				? std::stoul(replacements.at(component::Port)) : other.m_port;
-
-			m_path = (replacements.count(component::Path))
-				? replacements.at(component::Path) : other.m_path;
-		}
-		else {
-			m_content = (replacements.count(component::Content))
-				? replacements.at(component::Content) : other.m_content;
-		}
-
-		m_query = (replacements.count(component::Query))
-			? replacements.at(component::Query) : other.m_query;
-
-		m_fragment = (replacements.count(component::Fragment))
-			? replacements.at(component::Fragment) : other.m_fragment;
-	}
-
-	// Copy constructor; just use the copy assignment operator internally.
-	uri(uri const &other)
-	{
-		*this = other;
-	};
-
-	// Copy assignment operator
-	uri &operator=(uri const &other)
-	{
-		if (this != &other) {
-			m_scheme         = other.m_scheme;
-			m_content        = other.m_content;
-			m_username       = other.m_username;
-			m_password       = other.m_password;
-			m_host           = other.m_host;
-			m_path           = other.m_path;
-			m_query          = other.m_query;
-			m_fragment       = other.m_fragment;
-			m_query_dict     = other.m_query_dict;
-			m_category       = other.m_category;
-			m_port           = other.m_port;
-			m_path_is_rooted = other.m_path_is_rooted;
-			m_separator      = other.m_separator;
-		}
-		return *this;
-	}
-
-	~uri() {};
-
-	std::string const &get_scheme() const
-	{
-		return m_scheme;
-	};
-
-	scheme_category get_scheme_category() const
-	{
-		return m_category;
-	};
-
-	std::string const &get_content() const
-	{
-		if (m_category != scheme_category::NonHierarchical) {
-			throw std::domain_error("The content component is only valid for non-hierarchical URIs.");
-		}
-		return m_content;
-	};
-
-	std::string const &get_username() const
-	{
-		if (m_category != scheme_category::Hierarchical) {
-			throw std::domain_error("The username component is only valid for hierarchical URIs.");
-		}
-		return m_username;
-	};
-
-	std::string const &get_password() const
-	{
-		if (m_category != scheme_category::Hierarchical) {
-			throw std::domain_error("The password component is only valid for hierarchical URIs.");
-		}
-		return m_password;
-	};
-
-	std::string const &get_host() const
-	{
-		if (m_category != scheme_category::Hierarchical) {
-			throw std::domain_error("The host component is only valid for hierarchical URIs.");
-		}
-		return m_host;
-	};
-
-	unsigned long get_port() const
-	{
-		if (m_category != scheme_category::Hierarchical) {
-			throw std::domain_error("The port component is only valid for hierarchical URIs.");
-		}
-		return m_port;
-	};
-
-	std::string const &get_path() const
-	{
-		if (m_category != scheme_category::Hierarchical) {
-			throw std::domain_error("The path component is only valid for hierarchical URIs.");
-		}
-		return m_path;
-	};
-
-	std::string const &get_query() const
-	{
-		return m_query;
-	};
-
-	std::map<std::string, std::string> const &get_query_dictionary() const
-	{
-		return m_query_dict;
-	};
-
-	std::string const &get_fragment() const
-	{
-		return m_fragment;
-	};
-
-	std::string to_string() const
-	{
-		std::string full_uri;
-		full_uri.append(m_scheme);
-		full_uri.append(":");
-
-		if (m_content.length() > m_path.length()) {
-			full_uri.append("//");
-			if (!(m_username.empty() || m_password.empty())) {
-				full_uri.append(m_username);
-				full_uri.append(":");
-				full_uri.append(m_password);
-				full_uri.append("@");
-			}
-
-			full_uri.append(m_host);
-
-			if (m_port != 0) {
-				full_uri.append(":");
-				full_uri.append(std::to_string(m_port));
-			}
-		}
-
-		if (m_path_is_rooted) {
-			full_uri.append("/");
-		}
-		full_uri.append(m_path);
-
-		if (!m_query.empty()) {
-			full_uri.append("?");
-			full_uri.append(m_query);
-		}
-
-		if (!m_fragment.empty()) {
-			full_uri.append("#");
-			full_uri.append(m_fragment);
-		}
-
-		return full_uri;
-	};
-
-private:
-
-	void setup(std::string const &uri_text, scheme_category category)
-	{
-		size_t const uri_length = uri_text.length();
-
-		if (uri_length == 0) {
-			throw std::invalid_argument("URIs cannot be of zero length.");
-		}
-
-		std::string::const_iterator cursor = parse_scheme(
-			uri_text,
-			uri_text.begin());
-		// After calling parse_scheme, *cursor == ':'; none of the following parsers
-		// expect a separator character, so we advance the cursor upon calling them.
-		cursor = parse_content(uri_text, (cursor + 1));
-
-		if ((cursor != uri_text.end()) && (*cursor == '?')) {
-			cursor = parse_query(uri_text, (cursor + 1));
-		}
-
-		if ((cursor != uri_text.end()) && (*cursor == '#')) {
-			cursor = parse_fragment(uri_text, (cursor + 1));
-		}
-
-		init_query_dictionary(); // If the query string is empty, this will be empty too.
-
-	};
-
-	std::string::const_iterator parse_scheme(
-		std::string const &uri_text,
-		std::string::const_iterator scheme_start
-	)
-	{
-		std::string::const_iterator scheme_end = scheme_start;
-		while ((scheme_end != uri_text.end()) && (*scheme_end != ':')) {
-			if (!(std::isalnum(*scheme_end) || (*scheme_end == '-')
-				  || (*scheme_end == '+') || (*scheme_end == '.'))) {
-				throw std::invalid_argument(
-					"Invalid character found in the scheme component. Supplied URI was: \""
-					+ uri_text + "\"."
-				);
-			}
-			++scheme_end;
-		}
-
-		if (scheme_end == uri_text.end()) {
-			throw std::invalid_argument(
-				"End of URI found while parsing the scheme. Supplied URI was: \""
-				+ uri_text + "\"."
-			);
-		}
-
-		if (scheme_start == scheme_end) {
-			throw std::invalid_argument(
-				"Scheme component cannot be zero-length. Supplied URI was: \""
-				+ uri_text + "\"."
-			);
-		}
-
-		m_scheme = std::move(std::string(scheme_start, scheme_end));
-		return scheme_end;
-	};
-
-	std::string::const_iterator parse_content(
-		std::string const &uri_text,
-		std::string::const_iterator content_start
-	)
-	{
-		std::string::const_iterator content_end = content_start;
-		while ((content_end != uri_text.end()) && (*content_end != '?') && (*content_end != '#')) {
-			++content_end;
-		}
-
-		m_content = std::move(std::string(content_start, content_end));
-
-		if ((m_category == scheme_category::Hierarchical) && (m_content.length() > 0)) {
-			// If it's a hierarchical URI, the content should be parsed for the hierarchical components.
-			std::string::const_iterator path_start = m_content.begin();
-			std::string::const_iterator path_end   = m_content.end();
-			if (!m_content.compare(0, 2, "//")) {
-				// In this case an authority component is present.
-				std::string::const_iterator authority_cursor = (m_content.begin() + 2);
-				if (m_content.find_first_of('@') != std::string::npos) {
-					std::string::const_iterator userpass_divider = parse_username(
-						uri_text,
-						m_content,
-						authority_cursor
-					);
-					authority_cursor = parse_password(uri_text, m_content, (userpass_divider + 1));
-					// After this call, *authority_cursor == '@', so we skip over it.
-					++authority_cursor;
-				}
-
-				authority_cursor = parse_host(uri_text, m_content, authority_cursor);
-
-				if ((authority_cursor != m_content.end()) && (*authority_cursor == ':')) {
-					authority_cursor = parse_port(uri_text, m_content, (authority_cursor + 1));
-				}
-
-				if ((authority_cursor != m_content.end()) && (*authority_cursor == '/')) {
-					// Then the path is rooted, and we should note this.
-					m_path_is_rooted = true;
-					path_start       = authority_cursor + 1;
-				}
-
-				// If we've reached the end and no path is present then set path_start
-				// to the end.
-				if (authority_cursor == m_content.end()) {
-					path_start = m_content.end();
-				}
-			}
-			else if (!m_content.compare(0, 1, "/")) {
-				m_path_is_rooted = true;
-				++path_start;
-			}
-
-			// We can now build the path based on what remains in the content string,
-			// since that's all that exists after the host and optional port component.
-			m_path = std::move(std::string(path_start, path_end));
-		}
-		return content_end;
-	};
-
-	std::string::const_iterator parse_username(
-		std::string const &uri_text,
-		std::string const &content,
-		std::string::const_iterator username_start
-	)
-	{
-		std::string::const_iterator username_end = username_start;
-		// Since this is only reachable when '@' was in the content string, we can
-		// ignore the end-of-string case.
-		while (*username_end != ':') {
-			if (*username_end == '@') {
-				throw std::invalid_argument(
-					"Username must be followed by a password. Supplied URI was: \""
-					+ uri_text + "\"."
-				);
-			}
-			++username_end;
-		}
-		m_username = std::move(std::string(username_start, username_end));
-		return username_end;
-	};
-
-	std::string::const_iterator parse_password(
-		std::string const &uri_text,
-		std::string const &content,
-		std::string::const_iterator password_start
-	)
-	{
-		std::string::const_iterator password_end = password_start;
-		while (*password_end != '@') {
-			++password_end;
-		}
-
-		m_password = std::move(std::string(password_start, password_end));
-		return password_end;
-	};
-
-	std::string::const_iterator parse_host(
-		std::string const &uri_text,
-		std::string const &content,
-		std::string::const_iterator host_start
-	)
-	{
-		std::string::const_iterator host_end = host_start;
-		// So, the host can contain a few things. It can be a domain, it can be an
-		// IPv4 address, it can be an IPv6 address, or an IPvFuture literal. In the
-		// case of those last two, it's of the form [...] where what's between the
-		// brackets is a matter of which IPv?? version it is.
-		while (host_end != content.end()) {
-			if (*host_end == '[') {
-				// We're parsing an IPv6 or IPvFuture address, so we should handle that
-				// instead of the normal procedure.
-				while ((host_end != content.end()) && (*host_end != ']')) {
-					++host_end;
-				}
-
-				if (host_end == content.end()) {
-					throw std::invalid_argument(
-						"End of content component encountered "
-						"while parsing the host component. "
-						"Supplied URI was: \""
-						+ uri_text + "\"."
-					);
-				}
-
-				++host_end;
-				break;
-				// We can stop looping, we found the end of the IP literal, which is the
-				// whole of the host component when one's in use.
-			}
-			else if ((*host_end == ':') || (*host_end == '/')) {
-				break;
-			}
-			else {
-				++host_end;
-			}
-		}
-
-		m_host = std::move(std::string(host_start, host_end));
-		return host_end;
-	};
-
-	std::string::const_iterator parse_port(
-		std::string const &uri_text,
-		std::string const &content,
-		std::string::const_iterator port_start
-	)
-	{
-		std::string::const_iterator port_end = port_start;
-		while ((port_end != content.end()) && (*port_end != '/')) {
-			if (!std::isdigit(*port_end)) {
-				throw std::invalid_argument(
-					"Invalid character while parsing the port. "
-					"Supplied URI was: \"" + uri_text + "\"."
-				);
-			}
-
-			++port_end;
-		}
-
-		m_port = std::stoul(std::string(port_start, port_end));
-		return port_end;
-	};
-
-	std::string::const_iterator parse_query(
-		std::string const &uri_text,
-		std::string::const_iterator query_start
-	)
-	{
-		std::string::const_iterator query_end = query_start;
-		while ((query_end != uri_text.end()) && (*query_end != '#')) {
-			// Queries can contain almost any character except hash, which is reserved
-			// for the start of the fragment.
-			++query_end;
-		}
-		m_query = std::move(std::string(query_start, query_end));
-		return query_end;
-	};
-
-	std::string::const_iterator parse_fragment(
-		std::string const &uri_text,
-		std::string::const_iterator fragment_start
-	)
-	{
-		m_fragment = std::move(std::string(fragment_start, uri_text.end()));
-		return uri_text.end();
-	};
-
-	void init_query_dictionary()
-	{
-		if (!m_query.empty()) {
-			// Loop over the query string looking for '&'s, then check each one for
-			// an '=' to find keys and values; if there's not an '=' then the key
-			// will have an empty value in the map.
-			char   separator  = (m_separator == query_argument_separator::ampersand) ? '&' : ';';
-			size_t carat      = 0;
-			size_t stanza_end = m_query.find_first_of(separator);
-			do {
-				std::string stanza            = m_query.substr(
-					carat,
-					((stanza_end != std::string::npos) ? (stanza_end - carat) : std::string::npos));
-				size_t      key_value_divider = stanza.find_first_of('=');
-				std::string key               = stanza.substr(0, key_value_divider);
-				std::string value;
-				if (key_value_divider != std::string::npos) {
-					value = stanza.substr((key_value_divider + 1));
-				}
-
-				if (m_query_dict.count(key) != 0) {
-					throw std::invalid_argument("Bad key in the query string!");
-				}
-
-				m_query_dict.emplace(key, value);
-				carat      = ((stanza_end != std::string::npos) ? (stanza_end + 1)
-					: std::string::npos);
-				stanza_end = m_query.find_first_of(separator, carat);
-			} while ((stanza_end != std::string::npos)
-					 || (carat != std::string::npos));
-		}
-	}
-
-	std::string m_scheme;
-	std::string m_content;
-	std::string m_username;
-	std::string m_password;
-	std::string m_host;
-	std::string m_path;
-	std::string m_query;
-	std::string m_fragment;
-
-	std::map<std::string, std::string> m_query_dict;
-
-	scheme_category          m_category;
-	unsigned long            m_port;
-	bool                     m_path_is_rooted;
-	query_argument_separator m_separator;
-};
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
fryguy	b7eeb3b2f9	[LDoN] Update methods for removing wins/losses	2021-06-02 08:51:24 -04:00
Kinglykrab	d2f8eead1f	Add LDoN remove methods for losses and wins.	2021-06-01 20:57:03 -04:00