Added missed pet summons

.devcontainer/devcontainer.json

@@ -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}"
+	}
+}

.drone.yml

@@ -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
+  - name: server-build
-    image: akkadius/eqemu-server:v14
+    # Source build script https://github.com/Akkadius/akk-stack/blob/master/containers/eqemu-server/Dockerfile#L20
-    environment:
+    image: akkadius/eqemu-server:latest
-      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
     commands:
-      - ./utils/scripts/build/linux-build.sh
+      - sudo chown eqemu:eqemu /drone/src/ * -R
-    volumes:
+      - git submodule init && git submodule update && mkdir -p build && cd build && cmake -DEQEMU_BUILD_LOGIN=ON -DEQEMU_ENABLE_BOTS=ON -DEQEMU_BUILD_LUA=ON -G 'Unix Makefiles' .. && make -j$((`nproc`-4))
-      - 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
-
-

.gitignore

@@ -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/*

.travis.yml

@@ -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

.vscode/c_cpp_properties.json

@@ -0,0 +1,17 @@
+{
+    "configurations": [
+        {
+            "name": "Linux",
+            "includePath": [
+                "${workspaceFolder}/**",
+                "/usr/include/mysql"
+            ],
+            "defines": [],
+            "compilerPath": "/usr/bin/gcc",
+            "cStandard": "c11",
+            "cppStandard": "c++17",
+            "configurationProvider": "ms-vscode.cmake-tools"
+        }
+    ],
+    "version": 4
+}

.vscode/settings.json

@@ -0,0 +1,8 @@
+{
+    "files.associations": {
+        "chrono": "cpp",
+        "xutility": "cpp",
+        "iterator": "cpp",
+        "*.ipp": "cpp"
+    }
+}

.vscode/tasks.json

@@ -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": "mkdir -p build && cd build && make",
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
+            "problemMatcher": [
+                "$gcc"
+            ]
+        },
+        {
+            "label": "make clean",
+            "type": "shell",
+            "command": "mkdir -p build && cd build && make clean", 
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
+            "problemMatcher": [
+                "$gcc"
+            ]
+        },
+        {
+            "label": "cmake",
+            "type": "shell",
+            "command": "mkdir -p build && cd build && rm CMakeCache.txt && cmake -DEQEMU_BUILD_LOGIN=ON -DEQEMU_BUILD_LUA=ON -G 'Unix Makefiles' ..",
+            "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 build && cd build/bin && wget https://codeload.github.com/Akkadius/EQEmuMaps/zip/master -O maps.zip && unzip -o maps.zip && rm ./maps -rf && mv EQEmuMaps-master maps && rm maps.zip",
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
+            "problemMatcher": [
+                "$gcc"
+            ]
+        },
+        {
+            "label": "download quests",
+            "type": "shell",
+            "command": "mkdir -p build && cd build/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 build && cd build/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 build && cd build/bin && docker run -i --rm --privileged -v ${HOST_PROJECT_PATH}/build/bin:/src --network=eqemu -it eqemu/server:0.0.3 bash -c './eqemu_server.pl source_peq_db && ./eqemu_server.pl check_db_updates && ./eqemu_server.pl assets && ./eqemu_server.pl lua_modules && ./eqemu_server.pl opcodes && ./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}/build/bin:/src --ulimit core=10000000 --network=eqemu -p 7000:7000/udp -e LD_LIBRARY_PATH=/src/ eqemu/server:0.0.3 gdb -ex run --args ./zone dynamic_zone7000:7000",
+            "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}/build/bin:/src --ulimit core=10000000 --network=eqemu -p 7001:7001/udp -e LD_LIBRARY_PATH=/src/ eqemu/server:0.0.3 gdb -ex run --args ./zone dynamic_zone7001:7001",
+            "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}/build/bin:/src --ulimit core=10000000 --network=eqemu --name loginserver -p 5999:5999/udp -p 5998:5998/udp -e LD_LIBRARY_PATH=/src/ eqemu/server:0.0.3 gdb -ex run --args ./loginserver",
+            "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}/build/bin:/src --network=eqemu --name sharedmemory eqemu/server:0.0.3 ./shared_memory && docker run --rm -v ${HOST_PROJECT_PATH}/build/bin:/src --ulimit core=10000000 -e LD_LIBRARY_PATH=/src/ --network=eqemu --name world -p 9000:9000 -p 9000:9000/udp -p 9001:9001 -p 9080:9080 eqemu/server:0.0.3 gdb -ex run ./world",
+            "group": {
+                "kind": "test",
+                "isDefault": true
+            }
+        },
+        {
+            "label": "queryserv",
+            "type": "shell",
+            "command": "docker stop queryserv | true && docker run --rm -v ${HOST_PROJECT_PATH}/build/bin:/src --ulimit core=10000000 -e LD_LIBRARY_PATH=/src/ --network=eqemu --name queryserv eqemu/server:0.0.3 gdb -ex run ./queryserv",
+            "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}/build/bin/db:/bitnami/mariadb -p 3306:3306 -e MARIADB_DATABASE=peq -e MARIADB_USER=eqemu -e MARIADB_PASSWORD=eqemupass -e ALLOW_EMPTY_PASSWORD=yes --name mariadb --network=eqemu bitnami/mariadb:latest",
+            "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}/build/bin:/src -p 7778:7778 --name ucs --network=eqemu eqemu/server:0.0.3 gdb -ex run ./ucs",
+            "group": {
+                "kind": "test",
+                "isDefault": true
+            }
+        }
+    ]
+}

BUILD.md

@@ -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
 

CMakeLists.txt

@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 3.12)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.7)
 
 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)
@@ -202,6 +176,10 @@ 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:
@@ -333,10 +311,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 +340,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
+OPTION(EQEMU_BUILD_LOGGING "Build Logging (To speed up compilation)" ON)
-ADD_DEFINITIONS(-DBOOST_BIND_GLOBAL_PLACEHOLDERS)
+IF(EQEMU_BUILD_LOGGING)
+	ADD_DEFINITIONS(-DBUILD_LOGGING)
+ENDIF()
 
 IF(TLS_LIBRARY_ENABLED)
 	SET(SERVER_LIBS ${SERVER_LIBS} ${TLS_LIBRARY_LIBS})
@@ -397,14 +373,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()
 

README.md

@@ -1,7 +1,7 @@
 # EQEmulator Core Server
-| Drone (Linux x64) | Drone (Windows x64)   |
+|Travis CI (Linux)|Appveyor (Windows x86)   |Appveyor (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)   |
+|[![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,11 +18,11 @@
 |**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
@@ -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)

appveyor-bots.yml

@@ -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

appveyor-no-bots.yml

@@ -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

client_files/CMakeLists.txt

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

client_files/export/CMakeLists.txt

@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 3.12)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.2)
 
 SET(export_sources
 	main.cpp

client_files/export/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,11 +80,10 @@ 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();
 
@@ -131,8 +124,7 @@ void ExportSpells(SharedDatabase *db)
 {
 	LogInfo("Exporting Spells");
 
-	std::string file = fmt::format("{}/export/spells_us.txt", path.GetServerPath());
+	FILE *f = fopen("export/spells_us.txt", "w");
-	FILE *f = fopen(file.c_str(), "w");
 	if (!f) {
 		LogError("Unable to open export/spells_us.txt to write, skipping.");
 		return;
@@ -183,7 +175,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 +199,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("export/SkillCaps.txt", "w");
-	FILE *f = fopen(file.c_str(), "w");
 	if (!f) {
 		LogError("Unable to open export/SkillCaps.txt to write, skipping.");
 		return;
@@ -245,8 +236,7 @@ void ExportBaseData(SharedDatabase *db)
 {
 	LogInfo("Exporting Base Data");
 
-	std::string file = fmt::format("{}/export/BaseData.txt", path.GetServerPath());
+	FILE *f = fopen("export/BaseData.txt", "w");
-	FILE *f = fopen(file.c_str(), "w");
 	if (!f) {
 		LogError("Unable to open export/BaseData.txt to write, skipping.");
 		return;
@@ -279,8 +269,7 @@ void ExportDBStrings(SharedDatabase *db)
 {
 	LogInfo("Exporting DB Strings");
 
-	std::string file = fmt::format("{}/export/dbstr_us.txt", path.GetServerPath());
+	FILE *f = fopen("export/dbstr_us.txt", "w");
-	FILE *f = fopen(file.c_str(), "w");
 	if (!f) {
 		LogError("Unable to open export/dbstr_us.txt to write, skipping.");
 		return;

client_files/import/CMakeLists.txt

@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 3.12)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.2)
 
 SET(import_sources
 	main.cpp

client_files/import/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,11 +77,10 @@ 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();
 
@@ -134,10 +125,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("import/spells_us.txt", "r");
-	FILE *f = fopen(file.c_str(), "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 +146,8 @@ void ImportSpells(SharedDatabase *db) {
 			}
 		}
 
-		std::string escaped = ::Strings::Escape(buffer);
+		std::string escaped = ::EscapeString(buffer);
-		auto split = Strings::Split(escaped, '^');
+		auto split = SplitString(escaped, '^');
 		int line_columns = (int)split.size();
 
 		std::string sql;
@@ -224,10 +214,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("import/SkillCaps.txt", "r");
-	FILE *f = fopen(file.c_str(), "r");
 	if(!f) {
-		LogError("Unable to open {} to read, skipping.", file);
+		LogError("Unable to open import/SkillCaps.txt to read, skipping.");
 		return;
 	}
 
@@ -236,17 +225,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());
+		class_id = atoi(split[0].c_str());
-		skill_id = Strings::ToInt(split[1].c_str());
+		skill_id = atoi(split[1].c_str());
-		level = Strings::ToInt(split[2].c_str());
+		level = atoi(split[2].c_str());
-		cap = Strings::ToInt(split[3].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 +246,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());
+	FILE *f = fopen("import/BaseData.txt", "r");
-
+	if(!f) {
-	const auto& file_contents = File::GetContents(file_name);
+		LogError("Unable to open import/BaseData.txt to read, skipping.");
-	if (!file_contents.error.empty()) {
+		return;
-		LogError("{}", file_contents.error);
 	}
 
-	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();
+		if(split.size() < 10) {
-
-	for (const auto& line: Strings::Split(file_contents.contents, "\n")) {
-		const auto& line_data = Strings::Split(line, '^');
-
-		if (line_data.size() < 10) {
 			continue;
 		}
 
-		e.level     = static_cast<uint8_t>(Strings::ToUnsignedInt(line_data[0]));
+		std::string sql;
-		e.class_    = static_cast<uint8_t>(Strings::ToUnsignedInt(line_data[1]));
+		int level, class_id;
-		e.hp        = Strings::ToFloat(line_data[2]);
+		double hp, mana, end, unk1, unk2, hp_fac, mana_fac, end_fac;
-		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]);
 
-		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("import/dbstr_us.txt", "r");
-	FILE *f = fopen(file.c_str(), "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 +318,7 @@ void ImportDBStrings(SharedDatabase *db) {
 			}
 		}
 
-		auto split = Strings::Split(buffer, '^');
+		auto split = SplitString(buffer, '^');
 
 		if(split.size() < 2) {
 			continue;
@@ -336,11 +328,11 @@ void ImportDBStrings(SharedDatabase *db) {
 		int id, type;
 		std::string value;
 
-		id = Strings::ToInt(split[0].c_str());
+		id = atoi(split[0].c_str());
-		type = Strings::ToInt(split[1].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')",

common/CMakeLists.txt

@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 3.12)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.2)
 
 SET(common_sources
 	base_packet.cpp
@@ -7,16 +7,13 @@ SET(common_sources
 	compression.cpp
 	condition.cpp
 	content/world_content_service.cpp
-    discord/discord.cpp
 	crash.cpp
 	crc16.cpp
 	crc32.cpp
 	database/database_dump_service.cpp
 	database.cpp
+	database_conversions.cpp
 	database_instances.cpp
-    database/database_update_manifest.cpp
-    database/database_update_manifest_bots.cpp
-    database/database_update.cpp
 	dbcore.cpp
 	deity.cpp
 	dynamic_zone_base.cpp
@@ -35,13 +32,10 @@ SET(common_sources
 	eq_stream_proxy.cpp
 	eqtime.cpp
 	event_sub.cpp
-    events/player_event_logs.cpp
-    events/player_event_discord_formatter.cpp
 	expedition_lockout_timer.cpp
 	extprofile.cpp
-    discord/discord_manager.cpp
 	faction.cpp
-    file.cpp
+	file_util.cpp
 	guild_base.cpp
 	guilds.cpp
 	inventory_profile.cpp
@@ -65,11 +59,8 @@ SET(common_sources
 	packet_dump.cpp
 	packet_dump_file.cpp
 	packet_functions.cpp
-    path_manager.cpp
 	perl_eqdb.cpp
 	perl_eqdb_res.cpp
-    process/process.cpp
-    process.cpp
 	proc_launcher.cpp
 	profanity_manager.cpp
 	ptimer.cpp
@@ -84,15 +75,13 @@ SET(common_sources
 	shareddb.cpp
 	skills.cpp
 	spdat.cpp
-    strings.cpp
+	string_util.cpp
 	struct_strategy.cpp
 	textures.cpp
 	timer.cpp
 	unix.cpp
 	platform.cpp
-    json/json.hpp
 	json/jsoncpp.cpp
-    zone_store.cpp
 	net/console_server.cpp
 	net/console_server_connection.cpp
 	net/crc32.cpp
@@ -129,9 +118,6 @@ SET(repositories
 	# Criteria
 	repositories/criteria/content_filter_criteria.h
 
-    repositories/base/base_grid_repository.h
-    repositories/base/base_grid_entries_repository.h
-
 	# Base Repositories
 	repositories/base/base_aa_ability_repository.h
 	repositories/base/base_aa_ranks_repository.h
@@ -151,7 +137,6 @@ SET(repositories
 	repositories/base/base_auras_repository.h
 	repositories/base/base_base_data_repository.h
 	repositories/base/base_blocked_spells_repository.h
-    repositories/base/base_books_repository.h
 	repositories/base/base_bugs_repository.h
 	repositories/base/base_bug_reports_repository.h
 	repositories/base/base_buyer_repository.h
@@ -168,7 +153,6 @@ SET(repositories
 	repositories/base/base_character_data_repository.h
 	repositories/base/base_character_disciplines_repository.h
 	repositories/base/base_character_expedition_lockouts_repository.h
-    repositories/base/base_character_exp_modifiers_repository.h
 	repositories/base/base_character_inspect_messages_repository.h
 	repositories/base/base_character_instance_safereturns_repository.h
 	repositories/base/base_character_item_recast_repository.h
@@ -176,37 +160,32 @@ SET(repositories
 	repositories/base/base_character_leadership_abilities_repository.h
 	repositories/base/base_character_material_repository.h
 	repositories/base/base_character_memmed_spells_repository.h
-    repositories/base/base_character_peqzone_flags_repository.h
 	repositories/base/base_character_pet_buffs_repository.h
 	repositories/base/base_character_pet_info_repository.h
 	repositories/base/base_character_pet_inventory_repository.h
 	repositories/base/base_character_potionbelt_repository.h
 	repositories/base/base_character_skills_repository.h
 	repositories/base/base_character_spells_repository.h
-    repositories/base/base_character_tasks_repository.h
 	repositories/base/base_character_task_timers_repository.h
+	repositories/base/base_character_tasks_repository.h
 	repositories/base/base_char_create_combinations_repository.h
 	repositories/base/base_char_create_point_allocations_repository.h
 	repositories/base/base_char_recipe_list_repository.h
-    repositories/base/base_chatchannels_repository.h
-    repositories/base/base_chatchannel_reserved_names_repository.h
-    repositories/base/base_completed_shared_tasks_repository.h
-    repositories/base/base_completed_shared_task_activity_state_repository.h
-    repositories/base/base_completed_shared_task_members_repository.h
 	repositories/base/base_completed_tasks_repository.h
+	repositories/base/base_completed_shared_tasks_repository.h
+	repositories/base/base_completed_shared_task_members_repository.h
+	repositories/base/base_completed_shared_task_activity_state_repository.h
 	repositories/base/base_content_flags_repository.h
 	repositories/base/base_damageshieldtypes_repository.h
 	repositories/base/base_data_buckets_repository.h
 	repositories/base/base_db_str_repository.h
-    repositories/base/base_discord_webhooks_repository.h
 	repositories/base/base_discovered_items_repository.h
 	repositories/base/base_doors_repository.h
 	repositories/base/base_dynamic_zones_repository.h
 	repositories/base/base_dynamic_zone_members_repository.h
-    repositories/base/base_dynamic_zone_templates_repository.h
+	repositories/base/base_eventlog_repository.h
 	repositories/base/base_expeditions_repository.h
 	repositories/base/base_expedition_lockouts_repository.h
-    repositories/base/base_faction_association_repository.h
 	repositories/base/base_faction_base_data_repository.h
 	repositories/base/base_faction_list_repository.h
 	repositories/base/base_faction_list_mod_repository.h
@@ -216,23 +195,25 @@ SET(repositories
 	repositories/base/base_friends_repository.h
 	repositories/base/base_global_loot_repository.h
 	repositories/base/base_gm_ips_repository.h
+	repositories/base/base_goallists_repository.h
 	repositories/base/base_graveyard_repository.h
+	repositories/base/base_grid_repository.h
+	repositories/base/base_grid_entries_repository.h
 	repositories/base/base_ground_spawns_repository.h
 	repositories/base/base_group_id_repository.h
 	repositories/base/base_group_leaders_repository.h
 	repositories/base/base_guilds_repository.h
-    repositories/base/base_guild_ranks_repository.h
-    repositories/base/base_guild_permissions_repository.h
 	repositories/base/base_guild_members_repository.h
-    repositories/base/base_guild_bank_repository.h
+	repositories/base/base_guild_ranks_repository.h
 	repositories/base/base_guild_relations_repository.h
-    repositories/base/base_horses_repository.h
+	repositories/base/base_hackers_repository.h
 	repositories/base/base_instance_list_repository.h
 	repositories/base/base_instance_list_player_repository.h
 	repositories/base/base_inventory_repository.h
 	repositories/base/base_inventory_snapshots_repository.h
 	repositories/base/base_ip_exemptions_repository.h
 	repositories/base/base_items_repository.h
+	repositories/base/base_item_tick_repository.h
 	repositories/base/base_ldon_trap_entries_repository.h
 	repositories/base/base_ldon_trap_templates_repository.h
 	repositories/base/base_level_exp_mods_repository.h
@@ -266,12 +247,10 @@ SET(repositories
 	repositories/base/base_perl_event_export_settings_repository.h
 	repositories/base/base_petitions_repository.h
 	repositories/base/base_pets_repository.h
-    repositories/base/base_pets_beastlord_data_repository.h
 	repositories/base/base_pets_equipmentset_repository.h
 	repositories/base/base_pets_equipmentset_entries_repository.h
 	repositories/base/base_player_titlesets_repository.h
-    repositories/base/base_player_event_log_settings_repository.h
+	repositories/base/base_proximities_repository.h
-    repositories/base/base_player_event_logs_repository.h
 	repositories/base/base_quest_globals_repository.h
 	repositories/base/base_raid_details_repository.h
 	repositories/base/base_raid_members_repository.h
@@ -331,7 +310,6 @@ SET(repositories
 	repositories/auras_repository.h
 	repositories/base_data_repository.h
 	repositories/blocked_spells_repository.h
-    repositories/books_repository.h
 	repositories/bugs_repository.h
 	repositories/bug_reports_repository.h
 	repositories/buyer_repository.h
@@ -348,7 +326,6 @@ SET(repositories
 	repositories/character_data_repository.h
 	repositories/character_disciplines_repository.h
 	repositories/character_expedition_lockouts_repository.h
-    repositories/character_exp_modifiers_repository.h
 	repositories/character_inspect_messages_repository.h
 	repositories/character_instance_safereturns_repository.h
 	repositories/character_item_recast_repository.h
@@ -356,37 +333,32 @@ SET(repositories
 	repositories/character_leadership_abilities_repository.h
 	repositories/character_material_repository.h
 	repositories/character_memmed_spells_repository.h
-    repositories/character_peqzone_flags_repository.h
 	repositories/character_pet_buffs_repository.h
 	repositories/character_pet_info_repository.h
 	repositories/character_pet_inventory_repository.h
 	repositories/character_potionbelt_repository.h
 	repositories/character_skills_repository.h
 	repositories/character_spells_repository.h
-    repositories/character_tasks_repository.h
 	repositories/character_task_timers_repository.h
+	repositories/character_tasks_repository.h
 	repositories/char_create_combinations_repository.h
 	repositories/char_create_point_allocations_repository.h
 	repositories/char_recipe_list_repository.h
-    repositories/chatchannels_repository.h
-    repositories/chatchannel_reserved_names_repository.h
-    repositories/completed_shared_tasks_repository.h
-    repositories/completed_shared_task_activity_state_repository.h
-    repositories/completed_shared_task_members_repository.h
 	repositories/completed_tasks_repository.h
+	repositories/completed_shared_tasks_repository.h
+	repositories/completed_shared_task_members_repository.h
+	repositories/completed_shared_task_activity_state_repository.h
 	repositories/content_flags_repository.h
 	repositories/damageshieldtypes_repository.h
 	repositories/data_buckets_repository.h
 	repositories/db_str_repository.h
-    repositories/discord_webhooks_repository.h
 	repositories/discovered_items_repository.h
 	repositories/doors_repository.h
 	repositories/dynamic_zones_repository.h
 	repositories/dynamic_zone_members_repository.h
-    repositories/dynamic_zone_templates_repository.h
+	repositories/eventlog_repository.h
 	repositories/expeditions_repository.h
 	repositories/expedition_lockouts_repository.h
-    repositories/faction_association_repository.h
 	repositories/faction_base_data_repository.h
 	repositories/faction_list_repository.h
 	repositories/faction_list_mod_repository.h
@@ -396,23 +368,25 @@ SET(repositories
 	repositories/friends_repository.h
 	repositories/global_loot_repository.h
 	repositories/gm_ips_repository.h
+	repositories/goallists_repository.h
 	repositories/graveyard_repository.h
+	repositories/grid_repository.h
+	repositories/grid_entries_repository.h
 	repositories/ground_spawns_repository.h
 	repositories/group_id_repository.h
 	repositories/group_leaders_repository.h
 	repositories/guilds_repository.h
-    repositories/guild_ranks_repository.h
-    repositories/guild_permissions_repository.h
 	repositories/guild_members_repository.h
-    repositories/guild_bank_repository.h
+	repositories/guild_ranks_repository.h
 	repositories/guild_relations_repository.h
-    repositories/horses_repository.h
+	repositories/hackers_repository.h
 	repositories/instance_list_repository.h
 	repositories/instance_list_player_repository.h
 	repositories/inventory_repository.h
 	repositories/inventory_snapshots_repository.h
 	repositories/ip_exemptions_repository.h
 	repositories/items_repository.h
+	repositories/item_tick_repository.h
 	repositories/ldon_trap_entries_repository.h
 	repositories/ldon_trap_templates_repository.h
 	repositories/level_exp_mods_repository.h
@@ -446,12 +420,10 @@ SET(repositories
 	repositories/perl_event_export_settings_repository.h
 	repositories/petitions_repository.h
 	repositories/pets_repository.h
-    repositories/pets_beastlord_data_repository.h
 	repositories/pets_equipmentset_repository.h
 	repositories/pets_equipmentset_entries_repository.h
 	repositories/player_titlesets_repository.h
-    repositories/player_event_log_settings_repository.h
+	repositories/proximities_repository.h
-    repositories/player_event_logs_repository.h
 	repositories/quest_globals_repository.h
 	repositories/raid_details_repository.h
 	repositories/raid_members_repository.h
@@ -492,11 +464,15 @@ SET(repositories
 	repositories/zone_repository.h
 	repositories/zone_points_repository.h
 
-    )
+	# Non-Comformative
+	repositories/character_recipe_list_repository.h
+)
 
 SET(common_headers
 	additive_lagged_fibonacci_engine.h
+	any.h
 	base_packet.h
+	base_data.h
 	bodytypes.h
 	classes.h
 	compression.h
@@ -513,11 +489,8 @@ SET(common_headers
 	data_verification.h
 	database.h
 	database_schema.h
-    database/database_update.h
 	dbcore.h
 	deity.h
-    discord/discord.h
-    discord/discord_manager.h
 	dynamic_zone_base.h
 	emu_constants.h
 	emu_limits.h
@@ -540,14 +513,12 @@ SET(common_headers
 	eq_stream_locator.h
 	eq_stream_proxy.h
 	eqtime.h
-    events/player_event_logs.h
+	errmsg.h
-    events/player_event_discord_formatter.h
-    events/player_events.h
 	event_sub.h
 	expedition_lockout_timer.h
 	extprofile.h
 	faction.h
-    file.h
+	file_util.h
 	features.h
 	fixed_memory_hash_set.h
 	fixed_memory_variable_hash_set.h
@@ -564,9 +535,10 @@ SET(common_headers
 	item_fieldlist.h
 	item_instance.h
 	json_config.h
+	languages.h
 	light_source.h
 	linked_list.h
-    loot.h
+	loottable.h
 	mail_oplist.h
 	md5.h
 	memory_buffer.h
@@ -582,17 +554,13 @@ SET(common_headers
 	packet_dump.h
 	packet_dump_file.h
 	packet_functions.h
-    path_manager.cpp
 	platform.h
-    process/process.h
-    process.h
 	proc_launcher.h
 	profanity_manager.h
 	profiler.h
 	ptimer.h
 	queue.h
 	races.h
-	raid.h
 	random.h
 	rdtsc.h
 	rulesys.h
@@ -607,7 +575,7 @@ SET(common_headers
 	shareddb.h
 	skills.h
 	spdat.h
-    strings.h
+    string_util.h
 	struct_strategy.h
 	tasks.h
 	textures.h
@@ -616,11 +584,10 @@ SET(common_headers
 	unix.h
 	useperl.h
 	version.h
-    zone_store.h
+	zone_numbers.h
 	event/event_loop.h
 	event/task.h
 	event/timer.h
-    json/json_archive_single_line.h
 	json/json.h
 	json/json-forwards.h
 	net/console_server.h
@@ -669,8 +636,6 @@ SET(common_headers
 	patches/uf_limits.h
 	patches/uf_ops.h
 	patches/uf_structs.h
-    termcolor/rang.hpp
-    stacktrace/backward.hpp
 	StackWalker/StackWalker.h
 	util/memory_stream.h
 	util/directory.h
@@ -681,13 +646,13 @@ SOURCE_GROUP(Event FILES
 	event/event_loop.h
 	event/timer.h
 	event/task.h
-    )
+)
 
 SOURCE_GROUP(Json FILES
 	json/json.h
 	json/jsoncpp.cpp
 	json/json-forwards.h
-    )
+)
 
 SOURCE_GROUP(Net FILES
 	net/console_server.cpp
@@ -724,7 +689,7 @@ SOURCE_GROUP(Net FILES
 	net/websocket_server.h
 	net/websocket_server_connection.cpp
 	net/websocket_server_connection.h
-    )
+)
 
 SOURCE_GROUP(Patches FILES
 	patches/patches.h
@@ -768,12 +733,12 @@ SOURCE_GROUP(Patches FILES
 	patches/titanium_limits.cpp
 	patches/uf.cpp
 	patches/uf_limits.cpp
-    )
+)
 
 SOURCE_GROUP(StackWalker FILES
 	StackWalker/StackWalker.h
 	StackWalker/StackWalker.cpp
-    )
+)
 
 SOURCE_GROUP(Util FILES
 	util/memory_stream.h
@@ -781,19 +746,16 @@ SOURCE_GROUP(Util FILES
 	util/directory.h
 	util/uuid.cpp
 	util/uuid.h
-    )
+)
 
 INCLUDE_DIRECTORIES(Patches SocketLib StackWalker)
 
 ADD_LIBRARY(common ${common_sources} ${common_headers} ${repositories})
 
-IF (UNIX)
+IF(UNIX)
 	SET_SOURCE_FILES_PROPERTIES("SocketLib/Mime.cpp" PROPERTY COMPILE_FLAGS -Wno-unused-result)
 	SET_SOURCE_FILES_PROPERTIES("patches/sod.cpp" "patches/sof.cpp" "patches/rof.cpp"  "patches/rof2.cpp" "patches/uf.cpp" PROPERTIES COMPILE_FLAGS -O0)
-ENDIF (UNIX)
+ENDIF(UNIX)
 
-IF (WIN32 AND EQEMU_BUILD_PCH)
-    TARGET_PRECOMPILE_HEADERS(common PRIVATE pch/pch.h)
-ENDIF()
 
 SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)

common/any.h

@@ -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

common/base_data.h

@@ -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

common/base_packet.cpp

@@ -23,18 +23,18 @@
 
 BasePacket::BasePacket(const unsigned char *buf, uint32 len)
 {
-	pBuffer=nullptr;
+	this->pBuffer=nullptr;
-	size=0;
+	this->size=0;
-	_wpos = 0;
+	this->_wpos = 0;
-	_rpos = 0;
+	this->_rpos = 0;
-	timestamp.tv_sec = 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);
 		}
 	}
 }

common/bodytypes.h

@@ -64,6 +64,4 @@ typedef enum {
 } bodyType;
 /* bodytypes above 64 make the mob not show up */
 
-constexpr int format_as(bodyType type) { return static_cast<int>(type); }
-
 #endif

common/classes.h

@@ -19,106 +19,98 @@
 #define CLASSES_CH
 
 #include "../common/types.h"
-#include "../common/rulesys.h"
-#include <string>
-#include <map>
 
-namespace Class {
+#define WARRIOR 1
-	constexpr uint8 None                      = 0;
+#define CLERIC 2
-	constexpr uint8 Warrior                   = 1;
+#define PALADIN 3
-	constexpr uint8 Cleric                    = 2;
+#define RANGER 4
-	constexpr uint8 Paladin                   = 3;
+#define SHADOWKNIGHT 5
-	constexpr uint8 Ranger                    = 4;
+#define DRUID 6
-	constexpr uint8 ShadowKnight              = 5;
+#define MONK 7
-	constexpr uint8 Druid                     = 6;
+#define BARD 8
-	constexpr uint8 Monk                      = 7;
+#define ROGUE 9
-	constexpr uint8 Bard                      = 8;
+#define SHAMAN 10
-	constexpr uint8 Rogue                     = 9;
+#define NECROMANCER 11
-	constexpr uint8 Shaman                    = 10;
+#define WIZARD 12
-	constexpr uint8 Necromancer               = 11;
+#define MAGICIAN 13
-	constexpr uint8 Wizard                    = 12;
+#define ENCHANTER 14
-	constexpr uint8 Magician                  = 13;
+#define BEASTLORD 15
-	constexpr uint8 Enchanter                 = 14;
+#define BERSERKER 16
-	constexpr uint8 Beastlord                 = 15;
+#define WARRIORGM 20
-	constexpr uint8 Berserker                 = 16;
+#define CLERICGM 21
-	constexpr uint8 WarriorGM                 = 20;
+#define PALADINGM 22
-	constexpr uint8 ClericGM                  = 21;
+#define RANGERGM 23
-	constexpr uint8 PaladinGM                 = 22;
+#define SHADOWKNIGHTGM 24
-	constexpr uint8 RangerGM                  = 23;
+#define DRUIDGM 25
-	constexpr uint8 ShadowKnightGM            = 24;
+#define MONKGM 26
-	constexpr uint8 DruidGM                   = 25;
+#define BARDGM 27
-	constexpr uint8 MonkGM                    = 26;
+#define ROGUEGM 28
-	constexpr uint8 BardGM                    = 27;
+#define SHAMANGM 29
-	constexpr uint8 RogueGM                   = 28;
+#define NECROMANCERGM 30
-	constexpr uint8 ShamanGM                  = 29;
+#define WIZARDGM 31
-	constexpr uint8 NecromancerGM             = 30;
+#define MAGICIANGM 32
-	constexpr uint8 WizardGM                  = 31;
+#define ENCHANTERGM 33
-	constexpr uint8 MagicianGM                = 32;
+#define BEASTLORDGM 34
-	constexpr uint8 EnchanterGM               = 33;
+#define BERSERKERGM 35
-	constexpr uint8 BeastlordGM               = 34;
+#define BANKER 40
-	constexpr uint8 BerserkerGM               = 35;
+#define MERCHANT 41
-	constexpr uint8 Banker                    = 40;
+#define DISCORD_MERCHANT 59
-	constexpr uint8 Merchant                  = 41;
+#define ADVENTURERECRUITER 60
-	constexpr uint8 DiscordMerchant           = 59;
+#define ADVENTUREMERCHANT 61
-	constexpr uint8 AdventureRecruiter        = 60;
+#define LDON_TREASURE 62	// objects you can use /open on first seen in LDONs
-	constexpr uint8 AdventureMerchant         = 61;
+#define CORPSE_CLASS 62	// only seen on Danvi's Corpse in Akheva so far..
-	constexpr uint8 LDoNTreasure              = 62;
+#define TRIBUTE_MASTER 63
-	constexpr uint8 TributeMaster             = 63;
+#define GUILD_TRIBUTE_MASTER 64	// not sure
-	constexpr uint8 GuildTributeMaster        = 64;
+#define GUILD_BANKER 66
-	constexpr uint8 GuildBanker               = 66;
+#define NORRATHS_KEEPERS_MERCHANT 67
-	constexpr uint8 NorrathsKeepersMerchant   = 67;
+#define DARK_REIGN_MERCHANT 68
-	constexpr uint8 DarkReignMerchant         = 68;
+#define FELLOWSHIP_MASTER 69
-	constexpr uint8 FellowshipMaster          = 69;
+#define ALT_CURRENCY_MERCHANT 70
-	constexpr uint8 AlternateCurrencyMerchant = 70;
+#define MERCERNARY_MASTER 71
-	constexpr uint8 MercenaryLiaison          = 71;
 
-	constexpr uint8  PLAYER_CLASS_COUNT  = 16;
-	constexpr uint16 ALL_CLASSES_BITMASK = 65535;
-};
 
-static std::map<uint8, uint16> player_class_bitmasks = {
+// player class values
-	{Class::Warrior,      1},
+#define PLAYER_CLASS_UNKNOWN 0
-	{Class::Cleric,       2},
+#define PLAYER_CLASS_WARRIOR 1
-	{Class::Paladin,      4},
+#define PLAYER_CLASS_CLERIC 2
-	{Class::Ranger,       8},
+#define PLAYER_CLASS_PALADIN 3
-	{Class::ShadowKnight, 16},
+#define PLAYER_CLASS_RANGER 4
-	{Class::Druid,        32},
+#define PLAYER_CLASS_SHADOWKNIGHT 5
-	{Class::Monk,         64},
+#define PLAYER_CLASS_DRUID 6
-	{Class::Bard,         128},
+#define PLAYER_CLASS_MONK 7
-	{Class::Rogue,        256},
+#define PLAYER_CLASS_BARD 8
-	{Class::Shaman,       512},
+#define PLAYER_CLASS_ROGUE 9
-	{Class::Necromancer,  1024},
+#define PLAYER_CLASS_SHAMAN 10
-	{Class::Wizard,       2048},
+#define PLAYER_CLASS_NECROMANCER 11
-	{Class::Magician,     4096},
+#define PLAYER_CLASS_WIZARD 12
-	{Class::Enchanter,    8192},
+#define PLAYER_CLASS_MAGICIAN 13
-	{Class::Beastlord,    16384},
+#define PLAYER_CLASS_ENCHANTER 14
-	{Class::Berserker,    32768},
+#define PLAYER_CLASS_BEASTLORD 15
-};
+#define PLAYER_CLASS_BERSERKER 16
 
-static std::string shadow_knight_class_name = (
+#define PLAYER_CLASS_COUNT 16
-	RuleB(World, UseOldShadowKnightClassExport) ?
-	"Shadowknight" :
-	"Shadow Knight"
-);
 
-static std::map<uint8, std::string> class_names = {
+
-	{Class::Warrior,      "Warrior"},
+// player class bits
-	{Class::Cleric,       "Cleric"},
+#define PLAYER_CLASS_UNKNOWN_BIT 0
-	{Class::Paladin,      "Paladin"},
+#define PLAYER_CLASS_WARRIOR_BIT 1
-	{Class::Ranger,       "Ranger"},
+#define PLAYER_CLASS_CLERIC_BIT 2
-	{Class::ShadowKnight, shadow_knight_class_name},
+#define PLAYER_CLASS_PALADIN_BIT 4
-	{Class::Druid,        "Druid"},
+#define PLAYER_CLASS_RANGER_BIT 8
-	{Class::Monk,         "Monk"},
+#define PLAYER_CLASS_SHADOWKNIGHT_BIT 16
-	{Class::Bard,         "Bard"},
+#define PLAYER_CLASS_DRUID_BIT 32
-	{Class::Rogue,        "Rogue"},
+#define PLAYER_CLASS_MONK_BIT 64
-	{Class::Shaman,       "Shaman"},
+#define PLAYER_CLASS_BARD_BIT 128
-	{Class::Necromancer,  "Necromancer"},
+#define PLAYER_CLASS_ROGUE_BIT 256
-	{Class::Wizard,       "Wizard"},
+#define PLAYER_CLASS_SHAMAN_BIT 512
-	{Class::Magician,     "Magician"},
+#define PLAYER_CLASS_NECROMANCER_BIT 1024
-	{Class::Enchanter,    "Enchanter"},
+#define PLAYER_CLASS_WIZARD_BIT 2048
-	{Class::Beastlord,    "Beastlord"},
+#define PLAYER_CLASS_MAGICIAN_BIT 4096
-	{Class::Berserker,    "Berserker"},
+#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);
+uint32 GetPlayerClassValue(uint8 class_id);
-const std::string GetPlayerClassAbbreviation(uint8 class_id);
+uint32 GetPlayerClassBit(uint8 class_id);
 
-uint8 GetPlayerClassValue(uint8 class_id);
+uint8 GetClassIDFromPlayerClassValue(uint32 player_class_value);
-uint16 GetPlayerClassBit(uint8 class_id);
+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);

common/cli/eqemu_command_handler.cpp

@@ -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;
 		}
 	}
@@ -70,21 +70,21 @@ namespace EQEmuCommand {
 		bool arguments_filled = true;
 
 		int index = 2;
-		for (auto &arg: arguments) {
+		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);
 		}

common/content/world_content_service.cpp

@@ -35,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);
@@ -51,8 +47,6 @@ WorldContentService *WorldContentService::SetExpansionContext()
 		GetCurrentExpansion(),
 		GetCurrentExpansionName()
 	);
-
-	return this;
 }
 
 std::string WorldContentService::GetCurrentExpansionName()
@@ -79,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;
 }
@@ -128,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()) {
+	for (auto &flag : GetContentFlags()) {
-		if (f.flag_name == content_flag && f.enabled == true) {
+		if (flag == content_flag) {
 			return true;
 		}
 	}
@@ -139,102 +101,20 @@ bool WorldContentService::IsContentFlagEnabled(const std::string &content_flag)
 	return false;
 }
 
-/**
+void WorldContentService::ReloadContentFlags(Database &db)
- * @param content_flag
- * @return
- */
-bool WorldContentService::IsContentFlagDisabled(const std::string &content_flag)
 {
-	for (auto &f: GetContentFlags()) {
+	std::vector<std::string> set_content_flags;
-		if (f.flag_name == content_flag && f.enabled == false) {
+	auto                     content_flags = ContentFlagsRepository::GetWhere(db, "enabled = 1");
-			return true;
-		}
-	}
 
-	return false;
+	set_content_flags.reserve(content_flags.size());
-}
+	for (auto &flags: content_flags) {
-
+		set_content_flags.push_back(flags.flag_name);
-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 [{}] [{}]",
+		"Enabled content flags [{}]",
-			f.flag_name,
+		implode(", ", set_content_flags)
-			(f.enabled ? "Enabled" : "Disabled")
 	);
-	}
 
 	SetContentFlags(set_content_flags);
 }
-
-Database *WorldContentService::GetDatabase() const
-{
-	return m_database;
-}
-
-WorldContentService *WorldContentService::SetDatabase(Database *database)
-{
-	WorldContentService::m_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)
-	);
-
-	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();
-}

common/content/world_content_service.h

@@ -23,17 +23,9 @@
 
 #include <string>
 #include <vector>
-#include "../repositories/content_flags_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;
@@ -60,7 +52,7 @@ namespace Expansion {
 		VeilOfAlaris,
 		RainOfFear,
 		CallOfTheForsaken,
-		TheDarkenedSea,
+		TheDarkendSea,
 		TheBrokenMirror,
 		EmpiresOfKunark,
 		RingOfScale,
@@ -133,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; }
@@ -161,35 +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;
-
-	void SetContentFlag(const std::string &content_flag_name, bool enabled);
-
 private:
 	int current_expansion{};
-	std::vector<ContentFlagsRepository::ContentFlags> content_flags;
+	std::vector<std::string> content_flags;
-
+public:
-	// reference to database
+	const std::vector<std::string> &GetContentFlags() const;
-	Database *m_database;
+	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;

common/crash.cpp

@@ -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) {
+		for(int i = 0; i < 4096; ++i) {
-			if (szText[i] == 0) {
+			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;
+		EQEmuStackWalker sw; sw.ShowCallstack(GetCurrentThread(), ExceptionInfo->ContextRecord);
-		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);
-		}
 	}
 
 	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();
-	std::string temp_output_file = fmt::format("/tmp/dump-output-{}", Strings::Random(10));
 
-	// check for passwordless sudo if not root
+	std::string temp_output_file = "/tmp/dump-output";
-	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);
-		}
-	}
 
 	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);
 }
 

common/cron/croncpp.h

@@ -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)
 			{

common/database.h

@@ -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;
@@ -86,6 +88,7 @@ public:
 
 	/* Character Creation */
 
+	bool AddToNameFilter(const char *name);
 	bool CreateCharacter(
 		uint32 account_id,
 		char *name,
@@ -106,27 +109,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,
+		std::string source_character_name,
-		const std::string& destination_character_name,
+		std::string destination_character_name,
-		const std::string& destination_account_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	AddBannedIP(char* bannedIP, const char* notes); //Add IP address to the banned_ips table.
-	bool	AddToNameFilter(std::string name);
+	bool	AddGMIP(char* ip_address, char* name);
-	bool	CheckBannedIPs(std::string login_ip); //Check incoming connection against banned IP table.
+	bool	CheckBannedIPs(const char* loginIP); //Check incoming connection against banned IP table.
-	bool	CheckGMIPs(std::string login_ip, uint32 account_id);
+	bool	CheckGMIPs(const char* loginIP, uint32 account_id);
-	bool	CheckNameFilter(std::string name, bool surname = false);
+	bool	CheckNameFilter(const char* name, bool surname = false);
-	bool	CheckUsedName(std::string name);
+	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	GetAccountIDByName(const char* accname, const char *loginserver, int16* status = 0, uint32* lsid = 0);
 	uint32	GetCharacterID(const char *name);
-	uint32	GetCharacterInfo(std::string character_name, uint32 *account_id, uint32 *zone_id, uint32 *instance_id);
+	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);
@@ -136,37 +142,37 @@ public:
 	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 AddClientToInstance(uint16 instance_id, uint32 char_id);
-	bool CheckInstanceByCharID(uint16 instance_id, uint32 character_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);
+	uint16 GetInstanceVersion(uint16 instance_id);
-	uint8_t 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 FlagInstanceByGroupLeader(uint32 zone, int16 version, uint32 charid, uint32 gid);
-	void FlagInstanceByRaidLeader(uint32 zone_id, int16 version, uint32 charid, uint32 raid_id);
+	void FlagInstanceByRaidLeader(uint32 zone, int16 version, uint32 charid, uint32 rid);
-	void GetCharactersInInstance(uint16 instance_id, std::list<uint32> &character_ids);
+	void GetCharactersInInstance(uint16 instance_id, std::list<uint32> &charid_list);
 	void PurgeExpiredInstances();
 	void SetInstanceDuration(uint16 instance_id, uint32 new_duration);
-	void CleanupInstanceCorpses();
 
 	/* Adventure related. */
 
@@ -184,15 +190,13 @@ 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);
@@ -202,7 +206,7 @@ public:
 
 	/* Groups */
 
-	std::string GetGroupLeaderForLogin(std::string character_name);
+	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 +231,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);
+	uint32	GetZoneGraveyardID(uint32 zone_id, uint32 version);
-	uint8	GetMinStatus(uint32 zone_id, uint32 instance_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);
@@ -259,7 +271,7 @@ public:
 	void	ClearInvSnapshots(bool from_now = false);
 
 	void SourceDatabaseTableFromUrl(std::string table_name, std::string url);
-	void SourceSqlFromUrl(std::string url);
+
 
 private:
 

common/database/database_dump_service.cpp

@@ -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 "../file_util.h"
-#include "../process/process.h"
-#include "../termcolor/rang.hpp"
 
 #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={} {}",
+			"mysqldump -u {} -p{} -h {} --port={} {}",
-			CREDENTIALS_FILE,
+			config->ContentDbUsername,
+			config->ContentDbPassword,
+			config->ContentDbHost,
+			config->ContentDbPort,
 			config->ContentDbName
 		);
 	};
 
 	return fmt::format(
-		"mysqldump --defaults-extra-file={} {}",
+		"mysqldump -u {} -p{} -h {} --port={} {}",
-		CREDENTIALS_FILE,
+		config->DatabaseUsername,
+		config->DatabasePassword,
+		config->DatabaseHost,
+		config->DatabasePort,
 		config->DatabaseDB
 	);
 }
 
+/**
+ * @return
+ */
 std::string DatabaseDumpService::GetPlayerTablesList()
 {
-	return Strings::Join(DatabaseSchema::GetPlayerTables(), " ");
+	std::string              tables_list;
-}
+	std::vector<std::string> tables = DatabaseSchema::GetPlayerTables();
-
+	for (const auto          &table : tables) {
-std::string DatabaseDumpService::GetBotTablesList()
+		tables_list += table + " ";
-{
+	}
-	return Strings::Join(DatabaseSchema::GetBotTables(), " ");
+
-}
+	return trim(tables_list);
-
-std::string DatabaseDumpService::GetMercTablesList()
-{
-	return Strings::Join(DatabaseSchema::GetMercTables(), " ");
 }
 
+/**
+ * @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();
+	std::string tables_list;
-	auto version_tables = DatabaseSchema::GetVersionTables();
 
-	system_tables.insert(
+	std::vector<std::string> tables = DatabaseSchema::GetServerTables();
-		std::end(system_tables),
+	for (const auto          &table : tables) {
-		std::begin(version_tables),
+		tables_list += table + " ";
-		std::end(version_tables)
+	}
-	);
 
-	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,25 +356,7 @@ void DatabaseDumpService::DatabaseDump()
 		pipe_file = fmt::format(" > {}.sql", GetDumpFileNameWithPath());
 	}
 
-	if (!File::Exists(GetSetDumpPath()) && !IsDumpOutputToConsole()) {
+	std::string execute_command = fmt::format(
-		File::Makedir(GetSetDumpPath());
-	}
-
-	if (IsDumpDropTableSyntaxOnly()) {
-		std::vector<std::string> tables = Strings::Split(tables_to_dump, ' ');
-
-		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,
@@ -322,50 +364,40 @@ void DatabaseDumpService::DatabaseDump()
 		pipe_file
 	);
 
-		LogInfo("Backing up database [{}]", execute_command);
+	if (!FileUtil::exists(GetSetDumpPath()) && !IsDumpOutputToConsole()) {
-		LogInfo("This can take a few minutes depending on the size of your database");
+		FileUtil::mkdir(GetSetDumpPath());
-		LogInfo("LOADING... PLEASE WAIT...");
+	}
 
-		BuildCredentialsFile();
+	if (IsDumpDropTableSyntaxOnly()) {
-		std::string execution_result = Process::execute(execute_command);
+		std::vector<std::string> tables = SplitString(tables_to_dump, ' ');
-		if (!execution_result.empty() && IsDumpOutputToConsole()) {
+
+		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;
+		}
+	}
+	else {
+		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,78 +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)) {
-		std::filesystem::remove(file);
-	}
-
-	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;
-}

common/database/database_dump_service.h

@@ -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();
 };
 
 

common/database/database_update.cpp

@@ -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");
-	}
-}

common/database/database_update.h

@@ -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

common/database/database_update_manifest_bots.cpp

@@ -1,148 +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`;
-)"
-	}
-// -- 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
-// };

common/database_instances.cpp

@@ -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;
+	auto results = QueryDatabase(query);
-	e.charid = character_id;
 
-	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(
+	std::string query = StringFormat("SELECT charid FROM instance_list_player where id=%u AND charid=%u", instance_id, char_id);
-		*this,
+	auto results = QueryDatabase(query);
-		fmt::format(
+
-			"id = {} AND charid = {}",
+	if (!results.Success())
-			instance_id,
+		return false;
-			character_id
+
-		)
+	if (results.RowCount() != 1)
-	);
-	if (l.empty()) {
 		return false;
-	}
 
 	return true;
 }
 
-bool Database::CheckInstanceExists(uint16 instance_id)
+bool Database::CheckInstanceExists(uint16 instance_id) {
-{
+	std::string query = StringFormat(
-	if (!instance_id) {
+		"SELECT "
-		return false;
+		"`id`  "
-	}
+		"FROM  "
+		"`instance_list`  "
+		"WHERE  "
+		"`id` = %u",
+		instance_id
+		);
+	auto results = QueryDatabase(query);
 
-	auto i = InstanceListRepository::FindOne(*this, instance_id);
+	if (!results.Success())
-	if (!i.id) {
+		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 (results.RowCount() == 0) {
-	if (!i.id) {
 		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;
+	auto results = QueryDatabase(query);
-	e.zone = zone_id;
-	e.version = version;
-	e.start_time = std::time(nullptr);
-	e.duration = duration;
 
-	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
+	std::string query = StringFormat(
-	if (max_reserved_instance_id >= max_instance_id) {
+		"SELECT IFNULL(MAX(id),%u)+1 FROM instance_list WHERE id > %u",
-		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 > {}",
 		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) {
-	// no instances currently used
+		if (max_reserved_instance_id < atoi(row[0])) {
-	if (!row[0]) {
+			instance_id = max_reserved_instance_id;
-		instance_id = max_reserved_instance_id + 1;
 			return true;
 		}
 
-	// check that id is within limits
+		if (max_reserved_instance_id > max) {
-	if (Strings::ToInt(row[0]) <= max_instance_id) {
-		instance_id = Strings::ToInt(row[0]);
-		return true;
-	}
-
-	// no available instance ids
 			instance_id = 0;
 			return false;
+		}
+
+		max_reserved_instance_id++;
+	}
+
+	instance_id = max_reserved_instance_id;
+
+	return true;
 }
 
-bool Database::IsGlobalInstance(uint16 instance_id)
+bool Database::GlobalInstance(uint16 instance_id)
 {
-	if (!instance_id) {
+	std::string query = StringFormat(
-		return false;
+		"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 (!results.Success())
-	if (!i.id) {
 		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(
+	std::string query = StringFormat("DELETE FROM instance_list_player WHERE id=%lu AND charid=%lu",
-		*this,
+		(unsigned long)instance_id, (unsigned long)char_id);
-		fmt::format(
+	auto results = QueryDatabase(query);
-			"id = {} AND charid = {}",
+
-			instance_id,
+	return results.Success();
-			char_id
-		)
-	);
 }
 
+
 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,
+	std::string query = StringFormat("SELECT id FROM instance_list where id=%u AND zone=%u", instance_id, zone_id);
-		fmt::format(
+	auto results = QueryDatabase(query);
-			"id = {} AND zone = {}",
+
-			instance_id,
+	if (!results.Success())
-			zone_id
+		return false;
-		)
+
-	);
+	if (results.RowCount() == 0)
-	if (l.empty()) {
 		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;
-	}
 
-	const auto query = fmt::format(
+	std::string query = StringFormat(
-		"SELECT instance_list.id FROM "
+		"SELECT "
-		"instance_list, instance_list_player WHERE "
+		"instance_list.id "
-		"instance_list.zone = {} AND "
+		"FROM "
-		"instance_list.version = {} AND "
+		"instance_list, "
-		"instance_list.id = instance_list_player.id AND "
+		"instance_list_player "
-		"instance_list_player.charid = {} "
+		"WHERE "
-		"LIMIT 1;",
+		"instance_list.zone = %u "
-		zone_id,
+		"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() || !results.RowCount()) {
+	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;
+	}
+
+	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)
+	if (never_expires == 1)
-{
+	{
-	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) {
 		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);
+	std::string query = StringFormat("SELECT version FROM instance_list where id=%u", instance_id);
-	if (!i.id) {
+	auto results = QueryDatabase(query);
-		return 0;
-	}
 
-	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(
+	uint32 zone_id = ZoneIDFromInstanceID(instance_id);
-		*this,
+	uint16 version = VersionFromInstanceID(instance_id);
-		fmt::format(
+
-			"groupid = {}",
+	std::string query = StringFormat("SELECT `charid` FROM `group_id` WHERE `groupid` = %u", group_id);
-			group_id
+	auto results = QueryDatabase(query);
-		)
+
-	);
+	if (!results.Success())
-	if (l.empty()) {
 		return;
-	}
 
-	for (const auto& e : l) {
+	for (auto row = results.begin(); row != results.end(); ++row)
-		if (!GetInstanceID(zone_id, e.charid, version)) {
+	{
-			AddClientToInstance(instance_id, e.charid);
+		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(
+	uint32 zone_id = ZoneIDFromInstanceID(instance_id);
-		*this,
+	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 = {}",
+			"UPDATE character_corpses SET is_buried = 1, instance_id = 0 WHERE instance_id = {}",
-			raid_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;
 	
-	RespawnTimesRepository::DeleteWhere(*this, fmt::format("instance_id = {}", instance_id));
+	query = StringFormat("DELETE FROM instance_list_player WHERE id=%u", instance_id);
+	QueryDatabase(query);
 
-	SpawnConditionValuesRepository::DeleteWhere(*this, fmt::format("instance_id = {}", instance_id));
+	query = StringFormat("DELETE FROM respawn_times WHERE instance_id=%u", instance_id);
+	QueryDatabase(query);
+
+	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);
+	uint16 id = GetInstanceID(zone, charid, version);
-	if (instance_id) {
+	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);
+	if (l_id == 0)
-	auto group_leader_instance_id = GetInstanceID(zone_id, group_leader_id, version);
-
-	if (!group_leader_instance_id) {
 		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);
+	uint16 id = GetInstanceID(zone, charid, version);
-	if (instance_id) {
+	if (id != 0)
 		return;
-	}
 
-	auto raid_leader_id = GetCharacterID(GetRaidLeaderName(raid_id));
+	uint32 l_charid = GetCharacterID(GetRaidLeaderName(rid));
-	auto raid_leader_instance_id = GetInstanceID(zone_id, raid_leader_id, version);
+	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)
+void Database::GetCharactersInInstance(uint16 instance_id, std::list<uint32> &charid_list) {
-{
-	auto l = InstanceListPlayerRepository::GetWhere(*this, fmt::format("id = {}", instance_id));
-	if (l.empty()) {
-		return;
-	}
 
-	for (const auto& e : l) {
+	std::string query = StringFormat("SELECT `charid` FROM `instance_list_player` WHERE `id` = %u", instance_id);
-		character_ids.push_back(e.charid);
+	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(
+	std::string query =
-		*this,
+		SQL(
-		"(start_time + duration) <= (UNIX_TIMESTAMP() - 86400) AND never_expires = 0"
+			SELECT
+				id
+			FROM
+				instance_list
+			where
+			(start_time + duration) <= (UNIX_TIMESTAMP() - 86400)
+			and never_expires = 0
 		);
-	if (l.empty()) {
+
+	auto results = QueryDatabase(query);
+
+	if (!results.Success()) {
+		return;
+	}
+
+	if (results.RowCount() == 0) {
 		return;
 	}
 
 	std::vector<std::string> instance_ids;
-	for (const auto& e : l) {
+	for (auto row = results.begin(); row != results.end(); ++row) {
-		instance_ids.emplace_back(std::to_string(e.id));
+		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));
+	QueryDatabase(fmt::format("DELETE FROM instance_list WHERE id IN ({})", imploded_instance_ids));
-	InstanceListPlayerRepository::DeleteWhere(*this, fmt::format("id IN ({})", imploded_instance_ids));
+	QueryDatabase(fmt::format("DELETE FROM instance_list_player WHERE id IN ({})", imploded_instance_ids));
-	RespawnTimesRepository::DeleteWhere(*this, fmt::format("instance_id IN ({})", imploded_instance_ids));
+	QueryDatabase(fmt::format("DELETE FROM respawn_times WHERE instance_id IN ({})", imploded_instance_ids));
-	SpawnConditionValuesRepository::DeleteWhere(*this, fmt::format("instance_id IN ({})", imploded_instance_ids));
+	QueryDatabase(fmt::format("DELETE FROM spawn_condition_values WHERE instance_id IN ({})", imploded_instance_ids));
-	CharacterCorpsesRepository::BuryInstances(*this, 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);
+	std::string query = StringFormat("UPDATE `instance_list` SET start_time=UNIX_TIMESTAMP(), "
-	if (!i.id) {
+		"duration=%u WHERE id=%u", new_duration, instance_id);
-		return;
+	auto results = QueryDatabase(query);
-	}
-
-	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);
 }

common/database_schema.h

@@ -62,16 +62,14 @@ 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 +82,7 @@ namespace DatabaseSchema {
 			{"player_titlesets",               "char_id"},
 			{"quest_globals",                  "charid"},
 			{"timers",                         "char_id"},
+			{"titles",                         "char_id"},
 			{"trader",                         "char_id"},
 			{"zone_flags",                     "charID"}
 		};
@@ -131,11 +130,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",
@@ -148,7 +145,6 @@ namespace DatabaseSchema {
 			"guild_members",
 			"guild_ranks",
 			"guild_relations",
-			"guild_tributes",
 			"guilds",
 			"instance_list_player",
 			"inventory",
@@ -162,6 +158,7 @@ namespace DatabaseSchema {
 			"spell_buckets",
 			"spell_globals",
 			"timers",
+			"titles",
 			"trader",
 			"trader_audit",
 			"zone_flags"
@@ -192,14 +189,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",
@@ -228,6 +224,7 @@ namespace DatabaseSchema {
 			"pets_beastlord_data",
 			"pets_equipmentset",
 			"pets_equipmentset_entries",
+			"proximities",
 			"skill_caps",
 			"spawn2",
 			"spawn_conditions",
@@ -259,9 +256,7 @@ namespace DatabaseSchema {
 	{
 		return {
 			"chatchannels",
-			"chatchannel_reserved_names",
 			"command_settings",
-			"command_subsettings",
 			"content_flags",
 			"db_str",
 			"eqtime",
@@ -275,7 +270,6 @@ namespace DatabaseSchema {
 			"perl_event_export_settings",
 			"profanity_list",
 			"rule_sets",
-			"titles",
 			"rule_values",
 			"variables",
 		};
@@ -323,21 +317,20 @@ namespace DatabaseSchema {
 			"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",
+			"hackers",
 			"instance_list",
 			"ip_exemptions",
 			"item_tick",
 			"lfguild",
-			"merc_buffs",
 			"merchantlist_temp",
-			"mercs",
 			"object_contents",
 			"raid_details",
 			"raid_leaders",
@@ -346,9 +339,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",
@@ -385,57 +375,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

common/dbcore.cpp

@@ -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,8 +34,7 @@
 
 DBcore::DBcore()
 {
-	mysql      = mysql_init(nullptr);
+	mysql_init(&mysql);
-	mysqlOwner = true;
 	pHost           = nullptr;
 	pUser           = nullptr;
 	pPassword       = nullptr;
@@ -43,7 +42,6 @@ DBcore::DBcore()
 	pCompress       = false;
 	pSSL            = false;
 	pStatus         = Closed;
-	m_mutex    = new Mutex;
 }
 
 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) {
+	std::string mysql_connection_host;
-		mysql_close(mysql);
+	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);
+	mysql_ping(&mysql);
-	m_mutex->unlock();
+	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 QueryDatabase(query.c_str(), query.length(), retryOnFailureOnce);
-	return r;
 }
 
-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) {
+	if (mysql_real_query(&mysql, query, querylen) != 0) {
-		unsigned int errorNumber = mysql_errno(mysql);
+		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') {
+		if (mysql_errno(&mysql) > 0 && strlen(query) > 0) {
-			LogMySQLError("MySQL Error ({}) [{}] Query [{}]", mysql_errno(mysql), mysql_error(mysql), query);
+			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_field_count(&mysql),
-		(uint32) mysql_insert_id(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_close(&mysql);
-		mysql_init(mysql);        // Initialize structure again
+		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;
-}

common/dbcore.h

@@ -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 QueryDatabase(std::string query, bool retryOnFailureOnce = true);
-	MySQLRequestResult QueryDatabaseMulti(const std::string &query);
 	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);
+	bool DoesTableExist(std::string table_name);
-
-	void SetMySQL(const DBcore &o)
-	{
-		mysql      = o.mysql;
-		mysqlOwner = false;
-	}
-	void SetMutex(Mutex *mutex);
 
 protected:
 	bool Open(
@@ -64,13 +53,10 @@ protected:
 private:
 	bool Open(uint32 *errnum = nullptr, char *errbuf = nullptr);
 
-	MYSQL*  mysql;
+	MYSQL   mysql;
-	bool    mysqlOwner;
+	Mutex   MDatabase;
-	Mutex   *m_mutex;
 	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
+

common/deity.cpp

@@ -19,7 +19,8 @@
 
 #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:
@@ -59,41 +60,90 @@ EQ::deity::DeityTypeBit EQ::deity::GetDeityBitmask(DeityType deity_type)
 		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" }
 	};
-
-	return deity_map;
 }
 
-std::string EQ::deity::GetDeityName(DeityType deity_type)
+EQ::deity::DeityType EQ::deity::ConvertDeityTypeBitToDeityType(DeityTypeBit deity_type_bit)
 {
-
+	switch (deity_type_bit) {
-	if (EQ::deity::GetDeityMap().find(deity_type) != EQ::deity::GetDeityMap().end()) {
+	case bit_DeityAgnostic:
-		return EQ::deity::GetDeityMap().find(deity_type)->second;
+		return DeityAgnostic;
-	}
+	case bit_DeityBertoxxulous:
-
+		return DeityBertoxxulous;
-	return std::string();
+	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";
+	};
 }

common/deity.h

@@ -21,8 +21,6 @@
 #define COMMON_DEITY_H
 
 #include "types.h"
-#include <map>
-#include <string>
 
 
 namespace EQ
@@ -51,6 +49,7 @@ namespace EQ
 		};
 
 		enum DeityTypeBit : uint32 {
+			bit_DeityNone = 0x00000000,
 			bit_DeityAgnostic = 0x00000001,
 			bit_DeityBertoxxulous = 0x00000002,
 			bit_DeityBrellSirilis = 0x00000004,
@@ -68,14 +67,12 @@ namespace EQ
 			bit_DeityTheTribunal = 0x00004000,
 			bit_DeityTunare = 0x00008000,
 			bit_DeityVeeshan = 0x00010000,
-			bit_DeityAll           = UINT32_MAX
+			bit_DeityAll = 0xFFFFFFFF
 		};
 
-		constexpr int format_as(DeityType type) { return static_cast<int>(type); }
+		extern DeityTypeBit ConvertDeityTypeToDeityTypeBit(DeityType deity_type);
-
+		extern DeityType ConvertDeityTypeBitToDeityType(DeityTypeBit deity_type_bit);
-		extern DeityTypeBit GetDeityBitmask(DeityType deity_type);
+		extern const char* DeityName(DeityType deity_type);
-		extern std::string GetDeityName(DeityType deity_type);
-		extern const std::map<DeityType, std::string>& GetDeityMap();
 
 	} /*deity*/
 

common/discord/discord.cpp

@@ -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;
-}

common/discord/discord.h

@@ -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

common/discord/discord_manager.cpp

@@ -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);
-	}
-}

common/discord/discord_manager.h

@@ -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

common/dynamic_zone_base.cpp

@@ -79,7 +79,6 @@ void DynamicZoneBase::LoadRepositoryResult(DynamicZonesRepository::DynamicZoneIn
 	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;
@@ -130,7 +129,6 @@ uint32_t DynamicZoneBase::SaveToDatabase()
 		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;
@@ -318,17 +316,6 @@ 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;
@@ -416,17 +403,6 @@ 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)
 {
@@ -585,9 +561,8 @@ std::string DynamicZoneBase::GetDynamicZoneTypeName(DynamicZoneType dz_type)
 			return "Mission";
 		case DynamicZoneType::Quest:
 			return "Quest";
-		default:
-			return "Unknown";
 	}
+	return "Unknown";
 }
 
 EQ::Net::DynamicPacket DynamicZoneBase::GetSerializedDzPacket()
@@ -622,28 +597,3 @@ void DynamicZoneBase::LoadSerializedDzPacket(char* cereal_data, uint32_t cereal_
 	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;
-}

common/dynamic_zone_base.h

@@ -5,7 +5,6 @@
 #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>
@@ -75,7 +74,6 @@ 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); }
@@ -87,7 +85,6 @@ 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; }
@@ -115,7 +112,6 @@ public:
 	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);
@@ -131,7 +127,6 @@ public:
 	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);
@@ -146,7 +141,6 @@ protected:
 	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;
 
 	void AddInternalMember(const DynamicZoneMember& member);
@@ -159,7 +153,6 @@ protected:
 
 	std::unique_ptr<ServerPacket> CreateServerDzCreatePacket(uint16_t origin_zone_id, uint16_t origin_instance_id);
 	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);
@@ -171,7 +164,6 @@ 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;
@@ -198,7 +190,6 @@ public:
 			m_zone_version,
 			m_min_players,
 			m_max_players,
-			m_dz_switch_id,
 			m_never_expires,
 			m_has_zonein,
 			m_has_member_statuses,

common/emu_constants.cpp

@@ -18,11 +18,8 @@
 */
 
 #include "emu_constants.h"
-#include "bodytypes.h"
+#include "languages.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[] = {
@@ -151,564 +148,52 @@ 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()
+const std::map<int, std::string>& EQ::constants::GetLanguageMap()
 {
-	static const std::map<uint8, std::string> language_map = {
+	static const std::map<int, std::string> language_map = {
-		{ Language::CommonTongue,  "Common Tongue" },
+		{ LANG_COMMON_TONGUE, "Common Tongue" },
-		{ Language::Barbarian,     "Barbarian" },
+		{ LANG_BARBARIAN, "Barbarian" },
-		{ Language::Erudian,       "Erudian" },
+		{ LANG_ERUDIAN, "Erudian" },
-		{ Language::Elvish,        "Elvish" },
+		{ LANG_ELVISH, "Elvish" },
-		{ Language::DarkElvish,    "Dark Elvish" },
+		{ LANG_DARK_ELVISH, "Dark Elvish" },
-		{ Language::Dwarvish,      "Dwarvish" },
+		{ LANG_DWARVISH, "Dwarvish" },
-		{ Language::Troll,         "Troll" },
+		{ LANG_TROLL, "Troll" },
-		{ Language::Ogre,          "Ogre" },
+		{ LANG_OGRE, "Ogre" },
-		{ Language::Gnomish,       "Gnomish" },
+		{ LANG_GNOMISH, "Gnomish" },
-		{ Language::Halfling,      "Halfling" },
+		{ LANG_HALFLING, "Halfling" },
-		{ Language::ThievesCant,   "Thieves Cant" },
+		{ LANG_THIEVES_CANT, "Thieves Cant" },
-		{ Language::OldErudian,    "Old Erudian" },
+		{ LANG_OLD_ERUDIAN, "Old Erudian" },
-		{ Language::ElderElvish,   "Elder Elvish" },
+		{ LANG_ELDER_ELVISH, "Elder Elvish" },
-		{ Language::Froglok,       "Froglok" },
+		{ LANG_FROGLOK, "Froglok" },
-		{ Language::Goblin,        "Goblin" },
+		{ LANG_GOBLIN, "Goblin" },
-		{ Language::Gnoll,         "Gnoll" },
+		{ LANG_GNOLL, "Gnoll" },
-		{ Language::CombineTongue, "Combine Tongue" },
+		{ LANG_COMBINE_TONGUE, "Combine Tongue" },
-		{ Language::ElderTeirDal,  "Elder Teir'Dal" },
+		{ LANG_ELDER_TEIRDAL, "Elder Teirdal" },
-		{ Language::Lizardman,     "Lizardman" },
+		{ LANG_LIZARDMAN, "Lizardman" },
-		{ Language::Orcish,        "Orcish" },
+		{ LANG_ORCISH, "Orcish" },
-		{ Language::Faerie,        "Faerie" },
+		{ LANG_FAERIE, "Faerie" },
-		{ Language::Dragon,        "Dragon" },
+		{ LANG_DRAGON, "Dragon" },
-		{ Language::ElderDragon,   "Elder Dragon" },
+		{ LANG_ELDER_DRAGON, "Elder Dragon" },
-		{ Language::DarkSpeech,    "Dark Speech" },
+		{ LANG_DARK_SPEECH, "Dark Speech" },
-		{ Language::VahShir,       "Vah Shir" },
+		{ LANG_VAH_SHIR, "Vah Shir" },
-		{ Language::Alaran,        "Alaran" },
+		{ LANG_ALARAN, "Alaran" },
-		{ Language::Hadal,         "Hadal" },
+		{ LANG_HADAL, "Hadal" },
-		{ Language::Unknown27,     "Unknown" }
+		{ LANG_UNKNOWN, "Unknown" }
 	};
-
 	return language_map;
 }
 
-std::string EQ::constants::GetLanguageName(uint8 language_id)
+std::string EQ::constants::GetLanguageName(int language_id)
 {
-	if (!EQ::ValueWithin(language_id, Language::CommonTongue, Language::Unknown27)) {
+	if (language_id >= LANG_COMMON_TONGUE && language_id <= LANG_UNKNOWN) {
-		return std::string();
+		auto languages = EQ::constants::GetLanguageMap();
+		return languages[language_id];
 	}
-
-	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" },
-	};
-
-	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();
 }

common/emu_constants.h

@@ -22,7 +22,6 @@
 
 #include "eq_limits.h"
 #include "emu_versions.h"
-#include "bodytypes.h"
 
 #include <string.h>
 
@@ -33,6 +32,10 @@ namespace EQ
 	using RoF2::IINVALID;
 	using RoF2::INULL;
 	
+	namespace inventory {
+		
+	} /*inventory*/
+
 	namespace invtype {
 		using namespace RoF2::invtype::enum_;
 
@@ -217,192 +220,11 @@ 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();
+		extern const std::map<int, std::string>& GetLanguageMap();
-		std::string GetLanguageName(uint8 language_id);
+		std::string GetLanguageName(int 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;
@@ -506,182 +328,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,
-	MAX_SPECIAL_ATTACK        = 56
-};
-
-
-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];
+
+*/

common/emu_opcodes.h

@@ -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

common/emu_oplist.h

@@ -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_DuelResponse),
-N(OP_DuelAccept),
+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_GuildUpdateURLAndChannel),
-N(OP_GuildTributeDonateItem),
-N(OP_GuildTributeDonatePlat),
 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),
@@ -419,8 +396,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 +419,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 +455,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),
@@ -585,7 +558,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),

common/eq_constants.h

@@ -23,61 +23,61 @@
 #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 {
+//SpawnAppearance types: (compared two clients for server-originating types: SoF & RoF2)
-	constexpr uint32 Standing  = 100;
+#define AT_Die 0			// this causes the client to keel over and zone to bind point (default action)
-	constexpr uint32 Freeze    = 102;
+#define AT_WhoLevel 1		// the level that shows up on /who
-	constexpr uint32 Looting   = 105;
+#define AT_HPMax 2			// idk
-	constexpr uint32 Sitting   = 110;
+#define AT_Invis 3			// 0 = visible, 1 = invisible
-	constexpr uint32 Crouching = 111;
+#define AT_PVP 4			// 0 = blue, 1 = pvp (red)
-	constexpr uint32 Lying     = 115;
+#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_AntiCheat 51		// sent by the client randomly telling the server how long since last action has occured
+#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,
@@ -684,53 +684,14 @@ namespace Zones {
 	constexpr uint16 APPRENTICE = 999; // Designer Apprentice
 }
 
-namespace Language {
+//ZoneChange_Struct->success values
-	constexpr uint8 CommonTongue  = 0;
+#define ZONE_ERROR_NOMSG 0
-	constexpr uint8 Barbarian     = 1;
+#define ZONE_ERROR_NOTREADY -1
-	constexpr uint8 Erudian       = 2;
+#define ZONE_ERROR_VALIDPC -2
-	constexpr uint8 Elvish        = 3;
+#define ZONE_ERROR_STORYZONE -3
-	constexpr uint8 DarkElvish    = 4;
+#define ZONE_ERROR_NOEXPANSION -6
-	constexpr uint8 Dwarvish      = 5;
+#define ZONE_ERROR_NOEXPERIENCE -7
-	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 +718,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,
@@ -1048,83 +1009,4 @@ enum StartZoneIndex {
     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;
-}
-
 #endif /*COMMON_EQ_CONSTANTS_H*/

common/eq_limits.cpp

@@ -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();

common/eq_limits.h

@@ -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,

common/eq_packet.cpp

@@ -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));
 }

common/eq_packet.h

@@ -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); }
 

common/eq_packet_structs.h

@@ -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 {
@@ -385,15 +378,15 @@ struct NewZone_Struct {
 // 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;
+/*0704*/	uint32	SuspendBuffs;
-/*0708*/	uint32 fast_regen_hp;
+/*0708*/	uint32	FastRegenHP;
-/*0712*/	uint32 fast_regen_mana;
+/*0712*/	uint32	FastRegenMana;
-/*0716*/	uint32 fast_regen_endurance;
+/*0716*/	uint32	FastRegenEndurance;
-/*0720*/	uint32 npc_aggro_max_dist;
+/*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*/	uint32 lava_damage; // Seen 50
+/*0728*/	uint32	LavaDamage; // Seen 50
-/*0732*/	uint32 min_lava_damage; // Seen 10
+/*0732*/	uint32	MinLavaDamage; // Seen 10
-/*0736*/	float safe_heading;
+/*0736*/
 };
 
 /*
@@ -455,7 +448,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 +624,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 +1664,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
@@ -1789,9 +1713,9 @@ struct GuildJoin_Struct{
 };
 struct GuildInviteAccept_Struct {
 	char inviter[64];
-	char   new_member[64];
+	char newmember[64];
 	uint32 response;
-	uint32 guild_id;
+	uint32 guildeqid;
 };
 struct GuildManageRemove_Struct {
 	uint32 guildeqid;
@@ -1823,14 +1747,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 +1760,9 @@ struct GuildSetRank_Struct
 {
 /*00*/	uint32	Unknown00;
 /*04*/	uint32	Unknown04;
-/*08*/	uint32	rank;
+/*08*/	uint32	Rank;
-/*12*/	char	member_name[64];
+/*12*/	char	MemberName[64];
-/*76*/	uint32	banker;
+/*76*/	uint32	Banker;
 /*80*/
 };
 
@@ -1876,17 +1792,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];
 
@@ -2286,19 +2191,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 +2315,9 @@ struct FaceChange_Struct {
 /*004*/	uint8	hairstyle;
 /*005*/	uint8	beard;
 /*006*/	uint8	face;
-/*007*/ uint8  unused_padding;
+/*007*/ uint32	drakkin_heritage;
-/*008*/ uint32 drakkin_heritage;
+/*011*/ uint32	drakkin_tattoo;
-/*012*/ uint32 drakkin_tattoo;
+/*015*/ uint32	drakkin_details;
-/*016*/ uint32 drakkin_details;
-/*020*/ uint32 entity_id;
-/*024*/
 //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 +2536,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.
+	uint32 invslot;	// Only used in SoF and later clients.
-	int32 target_id;
-	int8 can_cast;
-	int8 can_scribe;
 	char booktext[1]; // Variable Length
 };
 // This is the request to read a book.
@@ -2654,18 +2545,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;
+	uint32 invslot;	// Only used in Sof and later clients;
-	int32 target_id;
+	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 +2561,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 +2761,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 +3288,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 +3314,7 @@ struct GuildUpdate_PublicNote{
 	uint32	unknown0;
 	char	name[64];
 	char	target[64];
-	char	note[256];
+	char	note[1]; //variable length.
-};
-
-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
 };
 
 struct GuildUpdateURLAndChannel_Struct
@@ -3485,7 +3333,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 +3355,6 @@ struct GuildStatus_Struct
 struct GuildDemoteStruct{
 	char	name[64];
 	char	target[64];
-	uint32	rank;
 };
 
 struct GuildRemoveStruct{
@@ -3517,9 +3364,9 @@ struct GuildRemoveStruct{
 	uint32	leaderstatus; //?
 };
 
-struct GuildMakeLeader_Struct{
+struct GuildMakeLeader{
-	char	requestor[64];
+	char	name[64];
-	char	new_leader[64];
+	char	target[64];
 };
 
 struct BugReport_Struct {
@@ -3559,23 +3406,20 @@ struct Make_Pet_Struct { //Simple struct for getting pet info
 	uint32 min_dmg;
 	uint32 max_dmg;
 };
-
+struct Ground_Spawn{
-struct GroundSpawn {
+	float max_x;
-	float       max_x         = 0.0f;
+	float max_y;
-	float       max_y         = 0.0f;
+	float min_x;
-	float       min_x         = 0.0f;
+	float min_y;
-	float       min_y         = 0.0f;
+	float max_z;
-	float       max_z         = 0.0f;
+	float heading;
-	float       heading       = 0.0f;
+	char name[20];
-	std::string name          = std::string();
+	uint32 item;
-	uint32      item_id       = 0;
+	uint32 max_allowed;
-	uint32      max_allowed   = 1;
+	uint32 respawntimer;
-	uint32      respawn_timer = 1;
-	bool        fix_z         = true;
 };
-
+struct Ground_Spawns {
-struct GroundSpawns {
+	struct Ground_Spawn spawn[50]; //Assigned max number to allow
-	struct GroundSpawn spawn[50]; //Assigned max number to allow
 };
 
 //struct PetitionBug_Struct{
@@ -3631,148 +3475,21 @@ struct TributeAbility_Struct {
 	char	name[0];
 };
 
+struct GuildTributeAbility_Struct {
+	uint32	guild_id;
+	TributeAbility_Struct ability;
+};
+
 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];
-};
-
-struct GuildTributeAbility_Struct {
-	uint32                           guild_id;
-	GuildTributeAbilityDetail_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 SelectTributeReply_Struct {
 	uint32	client_id;	//echoed from request.
 	uint32	tribute_id;
-	char   description[0];
+	char		desc[0];
 };
 
 struct TributeInfo_Struct {
@@ -3908,14 +3625,9 @@ struct MerchantList {
 	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;
 };
 
 struct TempMerchantList {
@@ -4365,9 +4077,7 @@ struct UpdateLeadershipAA_Struct {
 
 enum
 {
-	GroupLeadershipAbility_MarkNPC = 0,
+	GroupLeadershipAbility_MarkNPC = 0
-	RaidLeadershipAbility_MarkNPC = 16,
-	RaidLeadershipAbility_MainAssist = 19
 };
 
 struct DoGroupLeadershipAbility_Struct
@@ -4411,9 +4121,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;
+/*64*/	char		leader_name[64];
-/*72*/	char		leader_name[64];
+/*132*/	uint32		parameter;
-/*136*/	uint32		parameter;
 };
 
 struct RaidAddMember_Struct {
@@ -4424,14 +4133,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;
+/*000*/ RaidGeneral_Struct general; // leader_name and action only used
-/*140*/ char motd[1024];
+/*136*/ char motd[0]; // max size is 1024, but reply is variable
 };
 
 struct RaidLeadershipUpdate_Struct {
@@ -4826,7 +4530,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 +4991,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 +5082,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 +5148,10 @@ struct AltCurrencySelectItemReply_Struct {
 /*000*/ uint32	unknown000;
 /*004*/ uint8	unknown004; //0xff
 /*005*/ uint8	unknown005; //0xff
-/*006*/ uint16	unknown006; //0xffff
+/*006*/ uint8	unknown006; //0xff
-/*008*/ uint16	unknown008; //0xffff
+/*007*/ uint8	unknown007; //0xff
-/*010*/ char	item_name[64];
+/*008*/ char	item_name[64];
-/*074*/ uint16	unknown074;
+/*072*/ uint32	unknown074;
 /*076*/ uint32	cost;
 /*080*/ uint32	unknown080;
 /*084*/ uint32	unknown084;
@@ -5788,6 +5494,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 +5530,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,11 +5581,6 @@ struct SayLinkBodyFrame_Struct {
 /*056*/
 };
 
-struct Checksum_Struct {
-    uint64 checksum;
-    uint8  data[2048];
-};
-
 struct UpdateMovementEntry {
 	/* 00 */	float Y;
 	/* 04 */	float X;

common/eq_stream.cpp

@@ -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>

common/eq_stream.h

@@ -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);

common/eq_stream_ident.cpp

@@ -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;
 }
 

common/eq_stream_ident.h

@@ -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();

common/eq_stream_intf.h

@@ -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;

common/eq_stream_proxy.cpp

@@ -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);
-}
-

common/eq_stream_proxy.h

@@ -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;
+	OpcodeManager **const			m_opcodes;	//we do not own this object.
-	//we do not own this object.
 };
 
 #endif /*EQSTREAMPROXY_H_*/

common/eqdb.cpp

@@ -23,6 +23,9 @@
 
 EQDB EQDB::s_EQDB;
 
+EQDB::EQDB() {
+}
+
 unsigned int EQDB::field_count() {
 	return mysql_field_count(mysql_ref);
 }

common/eqdb.h

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

common/eqemu_config.cpp

@@ -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,13 +33,13 @@ 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();
@@ -66,7 +62,7 @@ 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();
 
@@ -88,38 +84,29 @@ void EQEmuConfig::parse_config()
 	//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;
+	 * 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();
-	CheckUcsConfigConversion();
+	MailPort = atoi(_root["server"]["mailserver"].get("port", "7778").asString().c_str());
-
-	m_ucs_host = _root["server"]["ucs"].get("host", "eqchat.eqemulator.net").asString();
-	m_ucs_port = Strings::ToUnsignedInt(_root["server"]["ucs"].get("port", "7778").asString());
 
 	/**
 	 * Database
@@ -127,7 +114,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 +123,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 +138,9 @@ void EQEmuConfig::parse_config()
 	/**
 	 * Zones
 	 */
-	DefaultStatus = Strings::ToUnsignedInt(_root["server"]["zones"].get("defaultstatus", 0).asString());
+	DefaultStatus = atoi(_root["server"]["zones"].get("defaultstatus", 0).asString().c_str());
-	ZonePortLow   = Strings::ToUnsignedInt(_root["server"]["zones"]["ports"].get("low", "7000").asString());
+	ZonePortLow   = atoi(_root["server"]["zones"]["ports"].get("low", "7000").asString().c_str());
-	ZonePortHigh  = Strings::ToUnsignedInt(_root["server"]["zones"]["ports"].get("high", "7999").asString());
+	ZonePortHigh  = atoi(_root["server"]["zones"]["ports"].get("high", "7999").asString().c_str());
 
 	/**
 	 * Files
@@ -183,10 +170,10 @@ void EQEmuConfig::parse_config()
 	/**
 	 * Launcher
 	 */
-	RestartWait      = Strings::ToInt(_root["server"]["launcher"]["timers"].get("restart", "10000").asString());
+	RestartWait      = atoi(_root["server"]["launcher"]["timers"].get("restart", "10000").asString().c_str());
-	TerminateWait    = Strings::ToInt(_root["server"]["launcher"]["timers"].get("reterminate", "10000").asString());
+	TerminateWait    = atoi(_root["server"]["launcher"]["timers"].get("reterminate", "10000").asString().c_str());
-	InitialBootWait  = Strings::ToInt(_root["server"]["launcher"]["timers"].get("initial", "20000").asString());
+	InitialBootWait  = atoi(_root["server"]["launcher"]["timers"].get("initial", "20000").asString().c_str());
-	ZoneBootInterval = Strings::ToInt(_root["server"]["launcher"]["timers"].get("interval", "2000").asString());
+	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 +235,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 +351,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 << "ChatHost = " << ChatHost << std::endl;
-	std::cout << "UCSPort = " << m_ucs_port << 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 +381,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;
-		}
-	}
-}

common/eqemu_config.h

@@ -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;
@@ -147,32 +144,30 @@ 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(
+			std::ifstream fconfig(EQEmuConfig::ConfigFile, std::ifstream::binary);
-				"{}/{}",
-				(file_path.empty() ? path.GetServerPath() : file_path),
-				EQEmuConfig::ConfigFile
-			);
-
-			std::ifstream fconfig(file, std::ifstream::binary);
-
 			try {
 				fconfig >> _config->_root;
 				_config->parse_config();
@@ -184,7 +179,6 @@ class EQEmuConfig
 		}
 
 		void Dump() const;
-		void CheckUcsConfigConversion();
 };
 
 #endif

common/eqemu_logsys.h

@@ -39,7 +39,8 @@
 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
+		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 +54,7 @@ namespace Logs {
 		AI,
 		Aggro,
 		Attack,
-		DeprecatedCS, // deprecated
+		PacketClientServer,
 		Combat,
 		Commands,
 		Crash,
@@ -64,36 +65,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
+		UCSServer,
-		WebInterfaceServer, // deprecated
+		WebInterfaceServer,
-		WorldServer, // deprecated
+		WorldServer,
-		ZoneServer, // deprecated
+		ZoneServer,
 		MySQLError,
 		MySQLQuery,
 		Mercenaries,
 		QuestDebug,
-		DeprecatedSC, // deprecated
+		PacketServerClient,
-		DeprecatedCSU, // deprecated
+		PacketClientServerUnhandled,
-		DeprecatedSCD, // deprecated
+		PacketServerClientWithDump,
-		DeprecatedCSD, // deprecated
+		PacketClientServerWithDump,
-		Loginserver, // deprecated
+		Loginserver,
 		ClientLogin,
-		HeadlessClient, // deprecated
+		HeadlessClient,
 		HPUpdate,
 		FixZ,
 		Food,
@@ -103,10 +104,10 @@ namespace Logs {
 		MobAppearance,
 		Info,
 		Warning,
-		Critical, // deprecated
+		Critical,
-		Emergency, // deprecated
+		Emergency,
-		Alert, // deprecated
+		Alert,
-		Notice, // deprecated
+		Notice,
 		AIScanClose,
 		AIYellForHelp,
 		AICastBeneficialClose,
@@ -126,21 +127,6 @@ namespace Logs {
 		DiaWind,
 		HTTP,
 		Saylink,
-		ChecksumVerification,
-		CombatRecord,
-		Hate,
-		Discord,
-		Faction,
-		PacketServerClient,
-		PacketClientServer,
-		PacketServerToServer,
-		Bugs,
-		QuestErrors,
-		PlayerEvents,
-		DataBuckets,
-		Zoning,
-		EqTime,
-		Corpses,
 		MaxCategoryID /* Don't Remove this */
 	};
 
@@ -153,7 +139,7 @@ namespace Logs {
 		"AI",
 		"Aggro",
 		"Attack",
-		"Deprecated",
+		"Packet :: Client -> Server",
 		"Combat",
 		"Commands",
 		"Crash",
@@ -164,52 +150,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)",
+		"UCS Server",
-		"Web Interface (Deprecated)",
+		"WebInterface Server",
-		"World Server (Deprecated)",
+		"World Server",
-		"Zone Server (Deprecated)",
+		"Zone Server",
-		"QueryErr",
+		"MySQL Error",
-		"Query",
+		"MySQL Query",
 		"Mercenaries",
 		"Quest Debug",
-		"Legacy Packet Logging (Deprecated)",
+		"Packet :: Server -> Client",
-		"Legacy Packet Logging (Deprecated)",
+		"Packet :: Client -> Server Unhandled",
-		"Legacy Packet Logging (Deprecated)",
+		"Packet :: Server -> Client (Dump)",
-		"Legacy Packet Logging (Deprecated)",
+		"Packet :: Client -> Server (Dump)",
-		"Login Server (Deprecated)",
+		"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)",
+		"Critical",
-		"Emergency (Deprecated)",
+		"Emergency",
-		"Alert (Deprecated)",
+		"Alert",
-		"Notice (Deprecated)",
+		"Notice",
-		"AI Scan",
+		"AI Scan Close",
-		"AI Yell",
+		"AI Yell For Help",
-		"AI CastBeneficial",
+		"AI Cast Beneficial Close",
 		"AOE Cast",
 		"Entity Management",
 		"Flee",
@@ -226,21 +212,6 @@ namespace Logs {
 		"DialogueWindow",
 		"HTTP",
 		"Saylink",
-		"ChecksumVer",
-		"CombatRecord",
-		"Hate",
-		"Discord",
-		"Faction",
-		"Packet S->C",
-		"Packet C->S",
-		"Packet S->S",
-		"Bugs",
-		"QuestErrors",
-		"PlayerEvents",
-		"DataBuckets",
-		"Zoning",
-		"EqTime",
-		"Corpses",
 	};
 }
 
@@ -248,8 +219,6 @@ namespace Logs {
 
 class Database;
 
-constexpr uint16 MAX_DISCORD_WEBHOOK_ID = 300;
-
 class EQEmuLogSys {
 public:
 	EQEmuLogSys();
@@ -312,19 +281,9 @@ 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
@@ -332,84 +291,50 @@ public:
 	*/
 	LogSettings log_settings[Logs::LogCategory::MaxCategoryID]{};
 
-	// temporary bucket to re-load after silencing
+	bool file_logs_enabled = false;
-	LogSettings pre_silence_settings[Logs::LogCategory::MaxCategoryID]{};
 
-	struct LogEnabled {
+	int                                                                               log_platform = 0;
-		bool log_to_file_enabled;
+	std::string                                                                       platform_file_name;
-		bool log_to_console_enabled;
-		bool log_to_gmsay_enabled;
-		bool log_to_discord_enabled;
-		bool log_enabled;
-	};
 
-	LogEnabled GetLogsEnabled(const Logs::DebugLevel &debug_level, const uint16 &log_category);
-	bool IsLogEnabled(const Logs::DebugLevel &debug_level, const uint16 &log_category);
-
-	struct DiscordWebhooks {
-		int         id;
-		std::string webhook_name;
-		std::string webhook_url;
-	};
-
-	const DiscordWebhooks *GetDiscordWebhooks() const;
 
 	// gmsay
 	uint16 GetGMSayColorFromCategory(uint16 log_category);
 
-	EQEmuLogSys *SetGMSayHandler(const std::function<void(uint16 log_type, const char *func, const std::string &)>& f)
+	EQEmuLogSys * SetGMSayHandler(std::function<void(uint16 log_type, const std::string &)> f) {
-	{
+		on_log_gmsay_hook = f;
-		m_on_log_gmsay_hook = f;
-		return this;
-	}
-
-	EQEmuLogSys *SetDiscordHandler(std::function<void(uint16 log_category, int webhook_id, const std::string &)> f)
-	{
-		m_on_log_discord_hook = f;
 		return this;
 	}
 
 	// console
 	void SetConsoleHandler(
 		std::function<void(
+			uint16 debug_level,
 			uint16 log_type,
 			const std::string &
 		)> f
-	) { m_on_log_console_hook = f; }
+	) { on_log_console_hook = f; }
 	void SilenceConsoleLogging();
 	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;
 
-	void ProcessConsoleMessage(
+	std::function<void(uint16 log_category, const std::string &)>                     on_log_gmsay_hook;
-		uint16 log_category,
+	std::function<void(uint16 debug_level, uint16 log_category, const std::string &)> on_log_console_hook;
-		const std::string &message,
+
-		const char *file,
+	std::string FormatOutMessageString(uint16 log_category, const std::string &in_message);
-		const char *func,
+	std::string GetLinuxConsoleColorFromCategory(uint16 log_category);
-		int line
+	uint16 GetWindowsConsoleColorFromCategory(uint16 log_category);
-	);
+
-	void ProcessLogWrite(uint16 log_category, const std::string &message);
+	void ProcessConsoleMessage(uint16 debug_level, uint16 log_category, const std::string &message);
-	void InjectTablesIfNotExist();
+	void ProcessGMSay(uint16 debug_level, uint16 log_category, const std::string &message);
+	void ProcessLogWrite(uint16 debug_level, uint16 log_category, const std::string &message);
+	bool IsRfc5424LogCategory(uint16 log_category);
 };
 
 extern EQEmuLogSys LogSys;

common/eqtime.cpp

@@ -46,16 +46,20 @@ EQTime::EQTime()
 	timezone = 0;
 	memset(&eqTime, 0, sizeof(eqTime));
 	//Defaults for time
-	TimeOfDay_Struct t{};
+	TimeOfDay_Struct start;
-	t.day    = 1;
+	start.day = 1;
-	t.hour   = 9;
+	start.hour = 9;
-	t.minute = 0;
+	start.minute = 0;
-	t.month  = 1;
+	start.month = 1;
-	t.year   = 3100;
+	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
@@ -200,47 +204,3 @@ void EQTime::ToString(TimeOfDay_Struct *t, std::string &str) {
 	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;
-}

common/eqtime.h

@@ -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);

common/errmsg.h

@@ -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

common/event/task.h

@@ -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;

common/event/task_scheduler.h

@@ -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> {
+			auto Enqueue(Fn&& fn, Args&&... args) -> std::future<typename std::result_of<Fn(Args...)>::type> {
-				using return_type = typename std::invoke_result<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)...)

common/events/player_event_discord_formatter.h

@@ -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

common/events/player_event_logs.cpp

@@ -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;
-	}
-}

common/events/player_event_logs.h

@@ -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

common/expedition_lockout_timer.cpp

@@ -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>

common/faction.cpp

@@ -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";
+			return ("Kindly");
-		case FACTION_AMIABLY:
+		case FACTION_AMIABLE:
-			return "Amiably";
+			return ("Amiable");
-		case FACTION_INDIFFERENTLY:
+		case FACTION_INDIFFERENT:
-			return "Indifferently";
+			return ("Indifferent");
-		case FACTION_APPREHENSIVELY:
+		case FACTION_APPREHENSIVE:
-			return "Apprehensively";
+			return ("Apprehensive");
-		case FACTION_DUBIOUSLY:
+		case FACTION_DUBIOUS:
-			return "Dubiously";
+			return ("Dubious");
-		case FACTION_THREATENINGLY:
+		case FACTION_THREATENLY:
-			return "Threateningly";
+			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;
 			}
 	}

common/faction.h

@@ -27,11 +27,13 @@ enum FACTION_VALUE {
 	FACTION_ALLY = 1,
 	FACTION_WARMLY = 2,
 	FACTION_KINDLY = 3,
-	FACTION_AMIABLY        = 4,
+	FACTION_AMIABLE = 4,
-	FACTION_INDIFFERENTLY  = 5,
+
-	FACTION_APPREHENSIVELY = 6,
+	FACTION_INDIFFERENT = 5,
-	FACTION_DUBIOUSLY      = 7,
+
-	FACTION_THREATENINGLY  = 8,
+	FACTION_APPREHENSIVE = 6,
+	FACTION_DUBIOUS = 7,
+	FACTION_THREATENLY = 8,
 	FACTION_SCOWLS = 9
 };
 
@@ -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

common/features.h

@@ -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
 
 

common/file.cpp

@@ -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,
-	};
-}

common/file_util.cpp

@@ -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
+}

common/file_util.h

@@ -18,27 +18,15 @@
  *
 */
 
-#ifndef EQEMU_FILE_H
+#ifndef EQEMU_FILE_UTIL_H
-#define EQEMU_FILE_H
+#define EQEMU_FILE_UTIL_H
 
-#include <filesystem>
 
-namespace fs = std::filesystem;
+class FileUtil {
-
-struct FileContentsResult {
-	std::string contents;
-	std::string error;
-};
-
-class File {
 public:
-	static bool Exists(const std::string &name);
+	static bool exists(const std::string &name);
-	static void Makedir(const std::string& directory_name);
+	static void mkdir(const std::string& directory_name);
-	static FileContentsResult GetContents(const std::string &file_name);
-	static std::string FindEqemuConfigPath();
-	static std::string GetCwd();
 };
 
-bool Exists(const std::string& name);
 
-#endif //EQEMU_FILE_H
+#endif //EQEMU_FILE_UTIL_H

common/guild_base.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;
 
@@ -64,7 +28,6 @@ class CharGuildInfo
 		bool	banker;
 		bool	alt;
 		std::string	public_note;
-		bool	    online;
 };
 
 //this object holds guild functionality shared between world and zone.
@@ -81,16 +44,15 @@ class BaseGuildManager
 		}
 
 		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);
+		uint32	CreateGuild(const char* name, uint32 leader_char_id);
-		bool    StoreGuildDB(uint32 guild_id);
 		bool	DeleteGuild(uint32 guild_id);
-		bool	RenameGuild(uint32 guild_id, std::string name);
+		bool	RenameGuild(uint32 guild_id, const char* name);
-		bool	SetGuildMOTD(uint32 guild_id, std::string motd, std::string setter);
+		bool	SetGuildMOTD(uint32 guild_id, const char* motd, const char *setter);
-		bool	SetGuildURL(uint32 guild_id, std::string URL);
+		bool	SetGuildURL(uint32 GuildID, const char* URL);
-		bool	SetGuildChannel(uint32 guild_id, std::string Channel);
+		bool	SetGuildChannel(uint32 GuildID, const char* Channel);
 
 		//character edit actions
 		bool	SetGuildLeader(uint32 guild_id, uint32 leader_char_id);
@@ -100,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	GetBankerFlag(uint32 CharID);
-		bool    GetGuildBankerStatus(uint32 guild_id, uint32 guild_rank);
 		bool	SetTributeFlag(uint32 charid, bool enabled);
-		bool	SetPublicNote(uint32 charid, std::string public_note);
+		bool	SetPublicNote(uint32 charid, const char *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);
 
 		//queries
 		bool	GetCharInfo(const char *char_name, CharGuildInfo &into);
@@ -119,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);
+		const char *GetRankName(uint32 guild_id, uint8 rank) const;
-        bool	GetGuildNameByID(uint32 guild_id, std::string& into) 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;
-        bool	UpdateDbBankerFlag(uint32 charid, bool is_banker);
+//	uint32	Getguild_id(uint32 eqid);
-        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;
+//	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);
-        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);
 
 	protected:
 		//the methods which must be defined by base classes.
@@ -145,35 +101,33 @@ class BaseGuildManager
 		virtual void SendRankUpdate(uint32 CharID) = 0;
 		virtual void SendGuildDelete(uint32 guild_id) = 0;
 
-		uint32	UpdateDbCreateGuild(std::string name, uint32 leader_char_id);
+		uint32	DBCreateGuild(const char* name, uint32 leader_char_id);
-		bool    UpdateDbDeleteGuild(uint32 guild_id, bool local_delete = true, bool db_delete = true);
+		bool	DBDeleteGuild(uint32 guild_id);
-		bool	UpdateDbRenameGuild(uint32 guild_id, std::string name);
+		bool	DBRenameGuild(uint32 guild_id, const char* name);
-		bool	UpdateDbGuildLeader(uint32 guild_id, uint32 leader_char_id);
+		bool	DBSetGuildLeader(uint32 guild_id, uint32 leader_char_id);
-		bool	UpdateDbGuildMOTD(uint32 guild_id, std::string motd, std::string setter);
+		bool	DBSetGuildMOTD(uint32 guild_id, const char* motd, const char *setter);
-		bool	UpdateDbGuildURL(uint32 GuildID, std::string URL);
+		bool	DBSetGuildURL(uint32 GuildID, const char* URL);
-		bool	UpdateDbGuildChannel(uint32 GuildID, std::string Channel);
+		bool	DBSetGuildChannel(uint32 GuildID, const char* Channel);
-		bool	UpdateDbGuild(uint32 charid, uint32 guild_id, uint8 rank);
+		bool	DBSetGuild(uint32 charid, uint32 guild_id, uint8 rank);
-		bool	UpdateDbGuildRank(uint32 charid, uint8 rank);
+		bool	DBSetGuildRank(uint32 charid, uint8 rank);
-		bool	UpdateDbAltFlag(uint32 charid, bool is_alt);
+		bool	DBSetBankerFlag(uint32 charid, bool is_banker);
-		bool	UpdateDbTributeFlag(uint32 charid, bool enabled);
+		bool	DBSetAltFlag(uint32 charid, bool is_alt);
-		bool	UpdateDbPublicNote(uint32 charid, std::string public_note);
+		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;
-		};
-		struct Functions
-		{
-			uint32 id;
-			uint32 perm_id;
-			uint32 guild_id;
-			uint32 perm_value;
-		};
 			public:
-		class GuildInfo {
+				RankInfo();
+				std::string name;
+				bool permissions[_MaxGuildAction];
+		};
+		class GuildInfo
+		{
 			public:
 				GuildInfo();
 				std::string name;
@@ -181,26 +135,24 @@ class BaseGuildManager
 				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);
 
-	protected:
+				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];
+		};
+
 		std::map<uint32, GuildInfo *> m_guilds;	//we own the pointers in this map
 		void ClearGuilds();	//clears internal structure
 
 		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);
+		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();
-        GuildsRepository::Guilds CreateGuildRepoFromGuildInfo(uint32 guild_id, BaseGuildManager::GuildInfo& in);
 };
+
+
 #endif /*GUILD_BASE_H_*/
 
 

common/guilds.h

@@ -16,71 +16,31 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
-#ifndef GUILDS_H
+#ifndef GUILD_H
-#define GUILDS_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
 
 //defines for standard ranks
-#define GUILD_MEMBER_TI	    0
+#define GUILD_MEMBER	0
-#define GUILD_OFFICER_TI    1
+#define GUILD_OFFICER	1
-#define GUILD_LEADER_TI     2
+#define GUILD_LEADER	2
-#define GUILD_RANK_NONE_TI (GUILD_MAX_RANK + 1)
+#define GUILD_RANK_NONE (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
 
 typedef enum {
-	GUILD_ACTION_BANNER_CHANGE                        = 1,
+	GUILD_HEAR		= 0,
-	GUILD_ACTION_BANNER_PLANT                         = 2,
+	GUILD_SPEAK		= 1,
-	GUILD_ACTION_BANNER_REMOVE                        = 3,
+	GUILD_INVITE	= 2,
-	GUILD_ACTION_DISPLAY_GUILD_NAME                   = 4,
+	GUILD_REMOVE	= 3,
-	GUILD_ACTION_RANKS_CHANGE_PERMISSIONS             = 5,
+	GUILD_PROMOTE	= 4,
-	GUILD_ACTION_RANKS_CHANGE_RANK_NAMES              = 6,
+	GUILD_DEMOTE	= 5,
-	GUILD_ACTION_MEMBERS_INVITE                       = 7,
+	GUILD_MOTD		= 6,
-	GUILD_ACTION_MEMBERS_PROMOTE                      = 8,
+	GUILD_WARPEACE	= 7,
-	GUILD_ACTION_MEMBERS_DEMOTE                       = 9,
+	_MaxGuildAction
-	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,
 } GuildAction;
 
-constexpr int format_as(GuildAction action) { return static_cast<int>(action); }
-
 #endif

common/inventory_profile.cpp

@@ -25,7 +25,7 @@
 //#include "races.h"
 //#include "rulesys.h"
 //#include "shareddb.h"
-#include "strings.h"
+#include "string_util.h"
 
 #include "../common/light_source.h"
 
@@ -173,8 +173,7 @@ EQ::ItemInstance* EQ::InventoryProfile::GetItem(int16 slot_id) const
 		result = _GetItem(m_inv, slot_id);
 	}
 	else if ((slot_id >= invslot::EQUIPMENT_BEGIN && slot_id <= invslot::EQUIPMENT_END) ||
-		(slot_id >= invslot::TRIBUTE_BEGIN && slot_id <= invslot::TRIBUTE_END) ||
+		(slot_id >= invslot::TRIBUTE_BEGIN && slot_id <= invslot::TRIBUTE_END)) {
-		(slot_id >= invslot::GUILD_TRIBUTE_BEGIN && slot_id <= invslot::GUILD_TRIBUTE_END)) {
 		// Equippable slots (on body)
 		result = _GetItem(m_worn, slot_id);
 	}
@@ -354,7 +353,7 @@ bool EQ::InventoryProfile::SwapItem(
 				fail_state = swapRaceClass;
 				return false;
 			}
-			if (deity_id && source_item->Deity && !(deity::GetDeityBitmask((deity::DeityType)deity_id) & source_item->Deity)) {
+			if (deity_id && source_item->Deity && !(deity::ConvertDeityTypeToDeityTypeBit((deity::DeityType)deity_id) & source_item->Deity)) {
 				fail_state = swapDeity;
 				return false;
 			}
@@ -380,7 +379,7 @@ bool EQ::InventoryProfile::SwapItem(
 				fail_state = swapRaceClass;
 				return false;
 			}
-			if (deity_id && destination_item->Deity && !(deity::GetDeityBitmask((deity::DeityType)deity_id) & destination_item->Deity)) {
+			if (deity_id && destination_item->Deity && !(deity::ConvertDeityTypeToDeityTypeBit((deity::DeityType)deity_id) & destination_item->Deity)) {
 				fail_state = swapDeity;
 				return false;
 			}
@@ -400,7 +399,7 @@ bool EQ::InventoryProfile::SwapItem(
 }
 
 // Remove item from inventory (with memory delete)
-bool EQ::InventoryProfile::DeleteItem(int16 slot_id, int16 quantity) {
+bool EQ::InventoryProfile::DeleteItem(int16 slot_id, uint8 quantity) {
 	// Pop item out of inventory map (or queue)
 	ItemInstance *item_to_delete = PopItem(slot_id);
 
@@ -413,11 +412,10 @@ bool EQ::InventoryProfile::DeleteItem(int16 slot_id, int16 quantity) {
 		// If there are no charges left on the item,
 		if (item_to_delete->GetCharges() <= 0) {
 			// If the item is stackable (e.g arrows), or
-			// the item is not a charged item, or is expendable, delete it
+			// the item is not stackable, and is not a charged item, or is expendable, delete it
-			if (
+			if (item_to_delete->IsStackable() ||
-				item_to_delete->IsStackable() ||
+				(!item_to_delete->IsStackable() &&
-				item_to_delete->GetItem()->MaxCharges == 0 ||
+				 ((item_to_delete->GetItem()->MaxCharges == 0) || item_to_delete->IsExpendable()))
-				item_to_delete->IsExpendable()
 				) {
 				// Item can now be destroyed
 				InventoryProfile::MarkDirty(item_to_delete);
@@ -466,10 +464,6 @@ EQ::ItemInstance* EQ::InventoryProfile::PopItem(int16 slot_id)
 		p = m_worn[slot_id];
 		m_worn.erase(slot_id);
 	}
-	else if (slot_id >= invslot::GUILD_TRIBUTE_BEGIN && slot_id <= invslot::GUILD_TRIBUTE_END) {
-		p = m_worn[slot_id];
-		m_worn.erase(slot_id);
-	}
 	else if (slot_id >= invslot::BANK_BEGIN && slot_id <= invslot::BANK_END) {
 		p = m_bank[slot_id];
 		m_bank.erase(slot_id);
@@ -596,68 +590,6 @@ bool EQ::InventoryProfile::HasSpaceForItem(const ItemData *ItemToTry, int16 Quan
 // Checks that user has at least 'quantity' number of items in a given inventory slot
 // Returns first slot it was found in, or SLOT_INVALID if not found
 
-bool EQ::InventoryProfile::HasAugmentEquippedByID(uint32 item_id)
-{
-	bool has_equipped = false;
-	ItemInstance* item = nullptr;
-
-	for (int slot_id = EQ::invslot::EQUIPMENT_BEGIN; slot_id <= EQ::invslot::EQUIPMENT_END; ++slot_id) {
-		item = GetItem(slot_id);
-		if (item && item->ContainsAugmentByID(item_id)) {
-			has_equipped = true;
-			break;
-		}
-	}
-
-	return has_equipped;
-}
-
-int EQ::InventoryProfile::CountAugmentEquippedByID(uint32 item_id)
-{
-	int quantity = 0;
-	ItemInstance* item = nullptr;
-
-	for (int slot_id = EQ::invslot::EQUIPMENT_BEGIN; slot_id <= EQ::invslot::EQUIPMENT_END; ++slot_id) {
-		item = GetItem(slot_id);
-		if (item && item->ContainsAugmentByID(item_id)) {
-			quantity += item->CountAugmentByID(item_id);
-		}
-	}
-
-	return quantity;
-}
-
-bool EQ::InventoryProfile::HasItemEquippedByID(uint32 item_id)
-{
-	bool has_equipped = false;
-	ItemInstance* item = nullptr;
-
-	for (int slot_id = EQ::invslot::EQUIPMENT_BEGIN; slot_id <= EQ::invslot::EQUIPMENT_END; ++slot_id) {
-		item = GetItem(slot_id);
-		if (item && item->GetID() == item_id) {
-			has_equipped = true;
-			break;
-		}
-	}
-
-	return has_equipped;
-}
-
-int EQ::InventoryProfile::CountItemEquippedByID(uint32 item_id)
-{
-	int quantity = 0;
-	ItemInstance* item = nullptr;
-
-	for (int slot_id = EQ::invslot::EQUIPMENT_BEGIN; slot_id <= EQ::invslot::EQUIPMENT_END; ++slot_id) {
-		item = GetItem(slot_id);
-		if (item && item->GetID() == item_id) {
-			quantity += item->IsStackable() ? item->GetCharges() : 1;
-		}
-	}
-
-	return quantity;
-}
-
 //This function has a flaw in that it only returns the last stack that it looked at
 //when quantity is greater than 1 and not all of quantity can be found in 1 stack.
 int16 EQ::InventoryProfile::HasItem(uint32 item_id, uint8 quantity, uint8 where)
@@ -806,35 +738,34 @@ int16 EQ::InventoryProfile::HasItemByLoreGroup(uint32 loregroup, uint8 where)
 // Returns slot_id when there's one available, else SLOT_INVALID
 int16 EQ::InventoryProfile::FindFreeSlot(bool for_bag, bool try_cursor, uint8 min_size, bool is_arrow)
 {
-	const int16 last_bag_slot = (RuleI(World, ExpansionSettings) == -1 || RuleI(World, ExpansionSettings) & EQ::expansions::bitHoT) ? EQ::invslot::slotGeneral10 : EQ::invslot::slotGeneral8;
+	// Check basic inventory
-
+	for (int16 i = invslot::GENERAL_BEGIN; i <= invslot::GENERAL_END; i++) {
-	for (int16 i = invslot::GENERAL_BEGIN; i <= last_bag_slot; i++) { // Check basic inventory
+		if ((((uint64)1 << i) & m_lookup->PossessionsBitmask) == 0)
-		if ((((uint64) 1 << i) & m_lookup->PossessionsBitmask) == 0) {
 			continue;
-		}
 
-		if (!GetItem(i)) {
+		if (!GetItem(i))
-			return i; // Found available slot in personal inventory
+			// Found available slot in personal inventory
-		}
+			return i;
 	}
 
 	if (!for_bag) {
-		for (int16 i = invslot::GENERAL_BEGIN; i <= last_bag_slot; i++) {
+		for (int16 i = invslot::GENERAL_BEGIN; i <= invslot::GENERAL_END; i++) {
-			if ((((uint64) 1 << i) & m_lookup->PossessionsBitmask) == 0) {
+			if ((((uint64)1 << i) & m_lookup->PossessionsBitmask) == 0)
+				continue;
+
+			const ItemInstance* inst = GetItem(i);
+			if (inst && inst->IsClassBag() && inst->GetItem()->BagSize >= min_size)
+			{
+				if (inst->GetItem()->BagType == item::BagTypeQuiver && inst->GetItem()->ItemType != item::ItemTypeArrow)
+				{
 					continue;
 				}
 
-			const auto *inst = GetItem(i);
+				int16 base_slot_id = InventoryProfile::CalcSlotId(i, invbag::SLOT_BEGIN);
-			if (inst && inst->IsClassBag() && inst->GetItem()->BagSize >= min_size) {
-				if (inst->GetItem()->BagType == item::BagTypeQuiver &&
-					inst->GetItem()->ItemType != item::ItemTypeArrow) {
-					continue;
-				}
 
-				const int16 base_slot_id = InventoryProfile::CalcSlotId(i, invbag::SLOT_BEGIN);
+				uint8 slots = inst->GetItem()->BagSlots;
-
+				uint8 j;
-				const uint8 slots = inst->GetItem()->BagSlots;
+				for (j = invbag::SLOT_BEGIN; j<slots; j++) {
-				for (uint8 j = invbag::SLOT_BEGIN; j < slots; j++) {
 					if (!GetItem(base_slot_id + j)) {
 						// Found available slot within bag
 						return (base_slot_id + j);
@@ -1424,10 +1355,6 @@ int16 EQ::InventoryProfile::_PutItem(int16 slot_id, ItemInstance* inst)
 		m_worn[slot_id] = inst;
 		result = slot_id;
 	}
-	else if (slot_id >= invslot::GUILD_TRIBUTE_BEGIN && slot_id <= invslot::GUILD_TRIBUTE_END) {
-		m_worn[slot_id] = inst;
-		result = slot_id;
-	}
 	else if (slot_id >= invslot::BANK_BEGIN && slot_id <= invslot::BANK_END) {
 		if (slot_id - EQ::invslot::BANK_BEGIN < m_lookup->InventoryTypeSize.Bank) {
 			m_bank[slot_id] = inst;
@@ -1454,7 +1381,7 @@ int16 EQ::InventoryProfile::_PutItem(int16 slot_id, ItemInstance* inst)
 	}
 	
 	if (result == INVALID_INDEX) {
-		LogError("Invalid slot_id specified ({}) with parent slot id ({})", slot_id, parentSlot);
+		LogError("InventoryProfile::_PutItem: Invalid slot_id specified ({}) with parent slot id ({})", slot_id, parentSlot);
 		InventoryProfile::MarkDirty(inst); // Slot not found, clean up
 	}
 
@@ -1729,17 +1656,3 @@ int16 EQ::InventoryProfile::_HasItemByLoreGroup(ItemInstQueue& iqueue, uint32 lo
 	
 	return EQ::invslot::SLOT_INVALID;
 }
-
-std::vector<uint32> EQ::InventoryProfile::GetAugmentIDsBySlotID(int16 slot_id)
-{
-	std::vector<uint32> augments;
-	const auto* item = GetItem(slot_id);
-
-	if (item) {
-		for (uint8 i = invaug::SOCKET_BEGIN; i <= invaug::SOCKET_END; i++) {
-			augments.push_back(item->GetAugment(i) ? item->GetAugmentItemID(i) : 0);
-		}
-	}
-
-	return augments;
-}

common/inventory_profile.h

@@ -26,11 +26,8 @@
 
 
 #include "item_instance.h"
-#include "classes.h"
-#include "races.h"
 
 #include <list>
-#include <vector>
 
 
 //FatherNitwit: location bits for searching specific
@@ -132,10 +129,10 @@ namespace EQ
 
 		// Swap items in inventory
 		enum SwapItemFailState : int8 { swapInvalid = -1, swapPass = 0, swapNotAllowed, swapNullData, swapRaceClass, swapDeity, swapLevel };
-		bool SwapItem(int16 source_slot, int16 destination_slot, SwapItemFailState& fail_state, uint16 race_id = Race::Doug, uint8 class_id = Class::None, uint16 deity_id = deity::DeityType::DeityUnknown, uint8 level = 0);
+		bool SwapItem(int16 source_slot, int16 destination_slot, SwapItemFailState& fail_state, uint16 race_id = 0, uint8 class_id = 0, uint16 deity_id = 0, uint8 level = 0);
 
 		// Remove item from inventory
-		bool DeleteItem(int16 slot_id, int16 quantity = 0);
+		bool DeleteItem(int16 slot_id, uint8 quantity = 0);
 
 		// Checks All items in a bag for No Drop
 		bool CheckNoDrop(int16 slot_id, bool recurse = true);
@@ -143,21 +140,6 @@ namespace EQ
 		// Remove item from inventory (and take control of memory)
 		ItemInstance* PopItem(int16 slot_id);
 
-		// Check if player has a specific item equipped by Item ID
-		bool HasItemEquippedByID(uint32 item_id);
-
-		// Check how many of a specific item the player has equipped by Item ID
-		int CountItemEquippedByID(uint32 item_id);
-
-		// Check if player has a specific augment equipped by Item ID
-		bool HasAugmentEquippedByID(uint32 item_id);
-
-		// Check how many of a specific augment the player has equipped by Item ID
-		int CountAugmentEquippedByID(uint32 item_id);
-
-		// Get a list of augments from a specific slot ID
-		std::vector<uint32> GetAugmentIDsBySlotID(int16 slot_id);
-
 		// Check whether there is space for the specified number of the specified item.
 		bool HasSpaceForItem(const ItemData *ItemToTry, int16 Quantity);
 
@@ -203,12 +185,12 @@ namespace EQ
 		void dumpBankItems();
 		void dumpSharedBankItems();
 
-		void SetCustomItemData(uint32 character_id, int16 slot_id, const std::string &identifier, const std::string& value);
+		void SetCustomItemData(uint32 character_id, int16 slot_id, std::string identifier, std::string value);
-		void SetCustomItemData(uint32 character_id, int16 slot_id, const std::string &identifier, int value);
+		void SetCustomItemData(uint32 character_id, int16 slot_id, std::string identifier, int value);
-		void SetCustomItemData(uint32 character_id, int16 slot_id, const std::string &identifier, float value);
+		void SetCustomItemData(uint32 character_id, int16 slot_id, std::string identifier, float value);
-		void SetCustomItemData(uint32 character_id, int16 slot_id, const std::string &identifier, bool value);
+		void SetCustomItemData(uint32 character_id, int16 slot_id, std::string identifier, bool value);
-		std::string GetCustomItemData(int16 slot_id, const std::string& identifier);
+		std::string GetCustomItemData(int16 slot_id, std::string identifier);
-		static const int GetItemStatValue(uint32 item_id, const std::string& identifier);
+		static int GetItemStatValue(uint32 item_id, const char* identifier);
 	protected:
 		///////////////////////////////
 		// Protected Methods

common/inventory_slot.cpp

@@ -19,7 +19,7 @@
 
 #include "inventory_slot.h"
 #include "textures.h"
-#include "strings.h"
+#include "string_util.h"
 
 
 int8 EQ::inventory::ConvertEquipmentIndexToTextureIndex(int16 slot_index)

common/ip_util.cpp

@@ -18,17 +18,7 @@
  *
  */
 
-#include <cstring>
-#include <fmt/format.h>
-#include <csignal>
-#include <vector>
 #include "ip_util.h"
-#include "http/httplib.h"
-#include "http/uri.h"
-#include "eqemu_logsys.h"
-#include "event/event_loop.h"
-#include "net/dns.h"
-#include "event/task_scheduler.h"
 
 /**
  * @param ip
@@ -80,148 +70,3 @@ bool IpUtil::IsIpInPrivateRfc1918(const std::string &ip)
 		IpUtil::IsIpInRange(ip, "192.168.0.0", "255.255.0.0")
 	);
 }
-
-/**
- * Gets local address - pings google to inspect what interface was used locally
- * @return
- */
-std::string IpUtil::GetLocalIPAddress()
-{
-	char               my_ip_address[16];
-	unsigned int       my_port;
-	struct sockaddr_in server_address{};
-	struct sockaddr_in my_address{};
-	int                sockfd;
-
-	// Connect to server
-	if ((sockfd = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
-		return "";
-	}
-
-	// Set server_addr
-	memset(&server_address, 0, sizeof(server_address));
-	server_address.sin_family      = AF_INET;
-	server_address.sin_addr.s_addr = inet_addr("172.217.160.99");
-	server_address.sin_port        = htons(80);
-
-	// Connect to server
-	if (connect(sockfd, (struct sockaddr *) &server_address, sizeof(server_address)) < 0) {
-		close(sockfd);
-		return "";
-	}
-
-	// Get my ip address and port
-	memset(&my_address, 0, sizeof(my_address));
-	socklen_t len = sizeof(my_address);
-	getsockname(sockfd, (struct sockaddr *) &my_address, &len);
-	inet_ntop(AF_INET, &my_address.sin_addr, my_ip_address, sizeof(my_ip_address));
-	my_port = ntohs(my_address.sin_port);
-
-	return fmt::format("{}", my_ip_address);
-}
-
-/**
- * Gets public address
- * Uses various websites as options to return raw public IP back to the client
- * @return
- */
-std::string IpUtil::GetPublicIPAddress()
-{
-	std::vector<std::string> endpoints = {
-		"http://ifconfig.me",
-		"http://api.ipify.org",
-		"http://ipinfo.io/ip",
-		"http://ipecho.net/plain",
-	};
-
-	for (auto &s: endpoints) {
-		// http get request
-		uri u(s);
-
-		httplib::Client r(
-			fmt::format(
-				"{}://{}",
-				u.get_scheme(),
-				u.get_host()
-			).c_str()
-		);
-
-		httplib::Headers headers = {
-			{"Content-type", "text/plain; charset=utf-8"},
-			{"User-Agent",   "curl/7.81.0"}
-		};
-
-		r.set_connection_timeout(1, 0);
-		r.set_read_timeout(1, 0);
-		r.set_write_timeout(1, 0);
-
-		if (auto res = r.Get(fmt::format("/{}", u.get_path()).c_str(), headers)) {
-			if (res->status == 200) {
-				if (res->body.find('.') != std::string::npos) {
-					return res->body;
-				}
-			}
-		}
-	}
-
-	return {};
-}
-
-std::string IpUtil::DNSLookupSync(const std::string &addr, int port)
-{
-	auto task_runner = new EQ::Event::TaskScheduler();
-	auto res         = task_runner->Enqueue(
-		[&]() -> std::string {
-			bool        running = true;
-			std::string ret;
-
-			EQ::Net::DNSLookup(
-				addr, port, false, [&](const std::string &addr) {
-					ret = addr;
-					if (addr.empty()) {
-						ret     = "";
-						running = false;
-					}
-
-					return ret;
-				}
-			);
-
-			std::chrono::steady_clock::time_point begin = std::chrono::steady_clock::now();
-
-			auto &loop = EQ::EventLoop::Get();
-			while (running) {
-				if (!ret.empty()) {
-					running = false;
-				}
-
-				std::chrono::steady_clock::time_point end = std::chrono::steady_clock::now();
-				if (std::chrono::duration_cast<std::chrono::milliseconds>(end - begin).count() > 1500) {
-					LogInfo(
-						"Deadline exceeded [{}]",
-						1500
-					);
-					running = false;
-				}
-
-				loop.Process();
-			}
-
-			return ret;
-		}
-	);
-
-	std::string result = res.get();
-	safe_delete(task_runner);
-
-	return result;
-}
-
-bool IpUtil::IsIPAddress(const std::string &ip_address)
-{
-	struct sockaddr_in sa{};
-	int                result = inet_pton(AF_INET, ip_address.c_str(), &(sa.sin_addr));
-	return result != 0;
-}
-
-