Added initial draft of event comments

2026-05-30 03:25:44 +00:00 · 2023-01-12 09:56:21 -08:00
679 changed files with 51274 additions and 47941 deletions
@@ -0,0 +1,21 @@
+// For format details, see https://aka.ms/vscode-remote/devcontainer.json or this file's README at:
+// https://github.com/microsoft/vscode-dev-containers/tree/v0.101.1/containers/ubuntu-18.04-git
+{	
+	"name": "Ubuntu 18.04 EQEMU",
+	// Moved from dockerfile to image so it builds faster
+	"image": "eqemu/devcontainer:0.0.2",
+
+	// Set *default* container specific settings.json values on container create.
+	"settings": { 
+		"terminal.integrated.shell.linux": "/bin/bash"
+	},
+
+	"runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ],
+	
+	// Add the IDs of extensions you want installed when the container is created.
+	"extensions": ["ms-vscode.cpptools", "ms-azuretools.vscode-docker"],
+	"mounts": ["source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind"],
+	"remoteEnv": {
+		"HOST_PROJECT_PATH": "${localWorkspaceFolder}"
+	}
+}
@@ -1,8 +1,7 @@
 ---
-
 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:
@@ -11,88 +10,18 @@ concurrency:
 volumes:
  - name: cache
    host:
-      path: /var/lib/cache-release
+      path: /var/lib/cache

 steps:
-  - name: Build Linux X64
+  - name: server-build
+    # Source build script https://github.com/Akkadius/akk-stack/blob/master/containers/eqemu-server/Dockerfile#L20
    image: akkadius/eqemu-server:v11
-    environment:
-      GITHUB_TOKEN:
-        from_secret: GH_RELEASE_GITHUB_API_TOKEN
-      RCLONE_CONFIG_REMOTE_TYPE: ftp
-      RCLONE_FTP_HOST: drone.akkadius.com
-      RCLONE_FTP_USER: artifacts
-      RCLONE_FTP_PASS:
-        from_secret: RCLONE_FTP_PASS
    commands:
-      - ./utils/scripts/build/linux-build.sh
+      - sudo chown eqemu:eqemu /drone/src/ * -R
+      - sudo chown eqemu:eqemu /home/eqemu/.ccache/ * -R
+      - git submodule init && git submodule update && mkdir -p build && cd build && cmake -DEQEMU_BUILD_TESTS=ON -DEQEMU_BUILD_LOGIN=ON -DEQEMU_ENABLE_BOTS=ON -DEQEMU_BUILD_LUA=ON -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING="-O0 -g -DNDEBUG" -G 'Unix Makefiles' .. && make -j$((`nproc`-4))
+      - curl https://raw.githubusercontent.com/Akkadius/eqemu-install-v2/master/eqemu_config.json --output eqemu_config.json
+      - ./bin/tests
    volumes:
      - name: cache
        path: /home/eqemu/.ccache/
-
---
-
-kind: pipeline
-type: exec
-name: Build Windows
-
-# Limits how many of these builds can run on the drone runner at a time, this isn't about cores
-concurrency:
-  limit: 1
-
-platform:
-  os: windows
-  arch: amd64
-
-steps:
-  - name: Build Windows X64
-    environment:
-      RCLONE_CONFIG_REMOTE_TYPE: ftp
-      RCLONE_FTP_HOST: drone.akkadius.com
-      RCLONE_FTP_USER: artifacts
-      RCLONE_FTP_PASS:
-        from_secret: RCLONE_FTP_PASS
-      GITHUB_TOKEN:
-        from_secret: GH_RELEASE_GITHUB_API_TOKEN
-    commands:
-      - .\utils\scripts\build\windows-build.ps1
-
---
-
-kind: pipeline
-type: docker
-name: Publish Artifacts to Github
-
-steps:
-  - name: Upload Artifacts
-    image: akkadius/eqemu-build-releaser:v3
-    environment:
-      RCLONE_CONFIG_REMOTE_TYPE: ftp
-      RCLONE_FTP_HOST: drone.akkadius.com
-      RCLONE_FTP_USER: artifacts
-      RCLONE_FTP_PASS:
-        from_secret: RCLONE_FTP_PASS
-      GH_RELEASE_GITHUB_API_TOKEN:
-        from_secret: GH_RELEASE_GITHUB_API_TOKEN
-      GITHUB_TOKEN:
-        from_secret: GH_RELEASE_GITHUB_API_TOKEN
-    commands:
-      - ./utils/scripts/build/should-release/should-release
-      - rclone config create remote ftp env_auth true > /dev/null
-      - |
-        rclone copy remote: --include "eqemu-server*.zip" .
-      - gh-release --assets=eqemu-server-linux-x64.zip,eqemu-server-windows-x64.zip -y
-      - |
-        rclone delete remote: --include "eqemu-server*.zip"
-
-trigger:
-  branch:
-    - master
-  event:
-    - push
-
-depends_on:
-  - Build Windows
-  - Build Linux
-
-
@@ -59,15 +59,4 @@ bin/

 # 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/*
+.cache/
@@ -0,0 +1,16 @@
+{
+    "configurations": [
+        {
+            "name": "Linux",
+            "includePath": [
+                "${workspaceFolder}/**",
+                "/usr/include/mysql"
+            ],
+            "defines": [],
+            "compilerPath": "/usr/bin/gcc",
+            "cStandard": "c11",
+            "cppStandard": "c++17"
+        }
+    ],
+    "version": 4
+}
@@ -0,0 +1,5 @@
+{
+    "files.associations": {
+        "*.ipp": "cpp"
+    }
+}
@@ -0,0 +1,164 @@
+{
+    // See https://go.microsoft.com/fwlink/?LinkId=733558
+    // for the documentation about the tasks.json format
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "make",
+            "type": "shell",
+            "command": "cd bin && make",
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
+            "problemMatcher": [
+                "$gcc"
+            ]
+        },
+        {
+            "label": "make clean",
+            "type": "shell",
+            "command": "cd bin && make clean",
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
+            "problemMatcher": [
+                "$gcc"
+            ]
+        },
+        {
+            "label": "cmake",
+            "type": "shell",
+            "command": "mkdir -p bin && cd bin && rm CMakeCache.txt && cmake -DEQEMU_BUILD_LOGIN=ON -DEQEMU_BUILD_LUA=ON -G 'Unix Makefiles' ..",
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
+            "problemMatcher":{
+                "owner": "cpp",
+                "fileLocation": "relative",
+                "pattern":[
+                    {
+                        "regexp": "([\\w+|\\\\]*\\.\\w+)\\((\\d+)\\)\\: (warning|error) (.*)$",
+                        "file": 1,
+                        "location": 2,
+                        "severity": 3,
+                        "message": 4
+                    }
+                ]
+            }
+        },
+        {
+            "label": "download maps",
+            "type": "shell",
+            "command": "mkdir -p bin && cd bin && wget https://codeload.github.com/Akkadius/EQEmuMaps/zip/master -O maps.zip && unzip -o maps.zip && rm ./maps -rf && mv EQEmuMaps-master maps && rm maps.zip",
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
+            "problemMatcher": [
+                "$gcc"
+            ]
+        },
+        {
+            "label": "download quests",
+            "type": "shell",
+            "command": "mkdir -p bin && cd bin && cd server && git -C ./quests pull 2> /dev/null || git clone https://github.com/ProjectEQ/projecteqquests.git quests",
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
+            "problemMatcher": [
+                "$gcc"
+            ]
+        },
+        {
+            "label": "download eqemu_config",
+            "type": "shell",
+            "command": "mkdir -p bin && cd bin && wget --no-check-certificate https://raw.githubusercontent.com/Akkadius/EQEmuInstall/master/eqemu_config_docker.json -O eqemu_config.json",
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
+            "problemMatcher": [
+                "$gcc"
+            ]
+        },
+        {
+            "label": "rebuild database (mariadb must be started)",
+            "type": "shell",
+            "command": "mkdir -p bin && cd bin && docker run -i --rm --privileged -v ${HOST_PROJECT_PATH}/bin:/src --network=eqemu -it eqemu/server:0.0.3 bash -c './eqemu_server.pl source_peq_db && ./eqemu_server.pl check_db_updates && ./eqemu_server.pl linux_login_server_setup'",
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
+            "problemMatcher": [
+                "$gcc"
+            ]
+        },
+        {
+            "label": "zone 7000",
+            "type": "shell",
+            "command": "docker stop zone7000 | true && docker network create eqemu | true && docker run -i --rm --name zone7000 --cap-add=SYS_PTRACE --security-opt seccomp=unconfined --privileged -v ${HOST_PROJECT_PATH}/bin:/src --ulimit core=10000000 --network=eqemu -p 7000:7000/udp -e LD_LIBRARY_PATH=/src/ eqemu/server:0.0.3 gdb -ex run --args ./zone dynamic_zone7000:7000",
+            "group": {
+                "kind": "test",
+                "isDefault": true
+            }
+        },
+        {
+            "label": "zone 7001",
+            "type": "shell",
+            "command": "docker stop zone7001 | true && docker network create eqemu | true && docker run -i --rm --name zone7001 --cap-add=SYS_PTRACE --security-opt seccomp=unconfined --privileged -v ${HOST_PROJECT_PATH}/bin:/src --ulimit core=10000000 --network=eqemu -p 7001:7001/udp -e LD_LIBRARY_PATH=/src/ eqemu/server:0.0.3 gdb -ex run --args ./zone dynamic_zone7001:7001",
+            "group": {
+                "kind": "test",
+                "isDefault": true
+            }
+        },
+        {
+            "label": "loginserver",
+            "type": "shell",
+            "command": "docker stop loginserver | true && docker network create eqemu | true && docker run -i --rm --cap-add=SYS_PTRACE --security-opt seccomp=unconfined --privileged -v ${HOST_PROJECT_PATH}/bin:/src --ulimit core=10000000 --network=eqemu --name loginserver -p 5999:5999/udp -p 5998:5998/udp -e LD_LIBRARY_PATH=/src/ eqemu/server:0.0.3 gdb -ex run --args ./loginserver",
+            "group": {
+                "kind": "test",
+                "isDefault": true
+            }
+        },
+        {
+            "label": "shared_memory, world",
+            "type": "shell",
+            "command": "docker stop sharedmemory | true &&  docker stop world | true && docker network create eqemu | true && docker run --rm -v ${HOST_PROJECT_PATH}/bin:/src --network=eqemu --name sharedmemory eqemu/server:0.0.3 ./shared_memory && docker run --rm -v ${HOST_PROJECT_PATH}/bin:/src --ulimit core=10000000 -e LD_LIBRARY_PATH=/src/ --network=eqemu --name world -p 9000:9000 -p 9000:9000/udp -p 9001:9001 -p 9080:9080 eqemu/server:0.0.3 gdb -ex run ./world",
+            "group": {
+                "kind": "test",
+                "isDefault": true
+            }
+        },
+        {
+            "label": "queryserv",
+            "type": "shell",
+            "command": "docker stop queryserv | true && docker run --rm -v ${HOST_PROJECT_PATH}/bin:/src --ulimit core=10000000 -e LD_LIBRARY_PATH=/src/ --network=eqemu --name queryserv eqemu/server:0.0.3 gdb -ex run ./queryserv",
+            "group": {
+                "kind": "test",
+                "isDefault": true
+            }
+        },
+        {
+            "label": "mariadb",
+            "type": "shell",
+            "command": "docker stop mariadb | true && cd bin && docker network create eqemu | true && docker run --rm -v ${HOST_PROJECT_PATH}/bin/db:/bitnami/mariadb -p 3306:3306 -e MARIADB_DATABASE=peq -e MARIADB_USER=eqemu -e MARIADB_PASSWORD=eqemupass -e ALLOW_EMPTY_PASSWORD=yes --name mariadb --network=eqemu bitnami/mariadb:latest",
+            "group": {
+                "kind": "test",
+                "isDefault": true
+            }
+        },
+        {
+            "label": "ucs",
+            "type": "shell",
+            "command": "docker stop ucs | true && cd bin && docker network create eqemu | true && docker run --rm -v ${HOST_PROJECT_PATH}/bin:/src -p 7778:7778 --name ucs --network=eqemu eqemu/server:0.0.3 gdb -ex run ./ucs",
+            "group": {
+                "kind": "test",
+                "isDefault": true
+            }
+        }
+    ]
+}
@@ -40,14 +40,14 @@ Assuming it is starting in c:/projects/eqemu and the x64 dependencies were extra

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

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

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

 ### Building

@@ -23,7 +23,6 @@ IF(MSVC)
 	ADD_DEFINITIONS(-D_HAS_AUTO_PTR_ETC) # for Luabind on C++17

 	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
-	ADD_DEFINITIONS( "/W0 /D_CRT_SECURE_NO_WARNINGS /wd4005 /wd4996 /nologo /Os")
 ELSE(MSVC)
 	ADD_DEFINITIONS(-DHAS_UNION_SEMUN)
 ENDIF(MSVC)
@@ -123,6 +122,7 @@ ENDIF()
 MESSAGE(STATUS "**************************************************")

 #options
+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)
@@ -176,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:
@@ -339,6 +343,11 @@ INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/websocketpp")
 # silence obnoxious deprecation message
 ADD_DEFINITIONS(-DBOOST_BIND_GLOBAL_PLACEHOLDERS)

+OPTION(EQEMU_BUILD_LOGGING "Build Logging (To speed up compilation)" ON)
+IF(EQEMU_BUILD_LOGGING)
+	ADD_DEFINITIONS(-DBUILD_LOGGING)
+ENDIF()
+
 IF(TLS_LIBRARY_ENABLED)
 	SET(SERVER_LIBS ${SERVER_LIBS} ${TLS_LIBRARY_LIBS})
 	INCLUDE_DIRECTORIES(SYSTEM "${TLS_LIBRARY_INCLUDE}")
@@ -1,7 +1,7 @@
 # EQEmulator Core Server
-| Drone (Linux x64) | Drone (Windows x64)   |
-|:---:|:---:|
-|[![Build Status](http://drone.akkadius.com/api/badges/EQEmu/Server/status.svg)](http://drone.akkadius.com/EQEmu/Server)   |[![Build Status](http://drone.akkadius.com/api/badges/EQEmu/Server/status.svg)](http://drone.akkadius.com/EQEmu/Server)   |
+|Travis CI (Linux)|Appveyor (Windows x86)   |Appveyor (Windows x64)   |
+|:---:|:---:|:---:| 
+|[![Linux CI](https://travis-ci.org/EQEmu/Server.svg?branch=master)](https://travis-ci.org/EQEmu/Server)   |[![Build status](https://ci.appveyor.com/api/projects/status/v3utuu0dttm2cqd0?svg=true)](https://ci.appveyor.com/project/KimLS/server)   |[![Build status](https://ci.appveyor.com/api/projects/status/scr25kmntx36c1ub?svg=true)](https://ci.appveyor.com/project/KimLS/server-87crp)   |

 ***

@@ -0,0 +1,21 @@
+version: 1.0.{build}
+branches:
+  only:
+  - master
+image: Visual Studio 2017
+configuration: RelWithDebInfo
+clone_folder: c:\projects\eqemu
+init:
+- ps: git config --global core.autocrlf input
+cache: c:\tools\vcpkg\installed\
+before_build:
+- ps: "$wc = New-Object System.Net.WebClient\n$wc.DownloadFile(\"http://strawberryperl.com/download/5.26.2.1/strawberry-perl-5.26.2.1-64bit-portable.zip\", \"c:\\projects\\eqemu\\strawberry-perl-5.26.2.1-64bit-portable.zip\")\ncd c:\\projects\\eqemu\n7z x c:/projects/eqemu/strawberry-perl-5.26.2.1-64bit-portable.zip -oc:/projects/eqemu/strawberry-perl-portable -y\n(Get-Content C:/projects/eqemu/strawberry-perl-portable/perl/lib/CORE/config.h).replace('#define PERL_STATIC_INLINE static __inline__', '#define PERL_STATIC_INLINE static __inline') | Set-Content C:/projects/eqemu/strawberry-perl-portable/perl/lib/CORE/config.h\nvcpkg install boost-geometry:x64-windows boost-dynamic-bitset:x64-windows luajit:x64-windows libsodium:x64-windows libmysql:x64-windows openssl:x64-windows zlib:x64-windows \nmkdir build\ncd build\ncmake -G \"Visual Studio 15 2017 Win64\" -DEQEMU_BUILD_TESTS=ON -DEQEMU_BUILD_LOGIN=ON -EQEMU_ENABLE_BOTS=ON -DPERL_EXECUTABLE=\"C:/projects/eqemu/strawberry-perl-portable/perl/bin/perl.exe\" -DPERL_INCLUDE_PATH=\"C:/projects/eqemu/strawberry-perl-portable/perl/lib/CORE\" -DPERL_LIBRARY=\"C:/projects/eqemu/strawberry-perl-portable/perl/lib/CORE/libperl526.a\" -DCMAKE_TOOLCHAIN_FILE=\"c:/tools/vcpkg/scripts/buildsystems/vcpkg.cmake\" .."
+build:
+  project: C:\projects\eqemu\build\EQEmu.sln
+  parallel: true
+  verbosity: minimal
+after_build:
+- cmd: >-
+    7z a build_x64-bots.zip C:\projects\eqemu\build\bin\RelWithDebInfo\*.exe C:\projects\eqemu\build\bin\RelWithDebInfo\*.dll C:\projects\eqemu\build\bin\RelWithDebInfo\*.pdb C:\projects\eqemu\build\libs\zlibng\RelWithDebInfo\*.dll
+
+    appveyor PushArtifact build_x64-bots.zip
@@ -0,0 +1,21 @@
+version: 1.0.{build}
+branches:
+  only:
+  - master
+image: Visual Studio 2017
+configuration: RelWithDebInfo
+clone_folder: c:\projects\eqemu
+init:
+- ps: git config --global core.autocrlf input
+cache: c:\tools\vcpkg\installed\
+before_build:
+- ps: "$wc = New-Object System.Net.WebClient\n$wc.DownloadFile(\"http://strawberryperl.com/download/5.26.2.1/strawberry-perl-5.26.2.1-64bit-portable.zip\", \"c:\\projects\\eqemu\\strawberry-perl-5.26.2.1-64bit-portable.zip\")\ncd c:\\projects\\eqemu\n7z x c:/projects/eqemu/strawberry-perl-5.26.2.1-64bit-portable.zip -oc:/projects/eqemu/strawberry-perl-portable -y\n(Get-Content C:/projects/eqemu/strawberry-perl-portable/perl/lib/CORE/config.h).replace('#define PERL_STATIC_INLINE static __inline__', '#define PERL_STATIC_INLINE static __inline') | Set-Content C:/projects/eqemu/strawberry-perl-portable/perl/lib/CORE/config.h\nvcpkg install boost-geometry:x64-windows boost-dynamic-bitset:x64-windows luajit:x64-windows libsodium:x64-windows libmysql:x64-windows openssl:x64-windows zlib:x64-windows \nmkdir build\ncd build\ncmake -G \"Visual Studio 15 2017 Win64\" -DEQEMU_BUILD_TESTS=ON -DEQEMU_BUILD_LOGIN=ON -EQEMU_ENABLE_BOTS=OFF -DPERL_EXECUTABLE=\"C:/projects/eqemu/strawberry-perl-portable/perl/bin/perl.exe\" -DPERL_INCLUDE_PATH=\"C:/projects/eqemu/strawberry-perl-portable/perl/lib/CORE\" -DPERL_LIBRARY=\"C:/projects/eqemu/strawberry-perl-portable/perl/lib/CORE/libperl526.a\" -DCMAKE_TOOLCHAIN_FILE=\"c:/tools/vcpkg/scripts/buildsystems/vcpkg.cmake\" .."
+build:
+  project: C:\projects\eqemu\build\EQEmu.sln
+  parallel: true
+  verbosity: minimal
+after_build:
+- cmd: >-
+    7z a build_x64-no-bots.zip C:\projects\eqemu\build\bin\RelWithDebInfo\*.exe C:\projects\eqemu\build\bin\RelWithDebInfo\*.dll C:\projects\eqemu\build\bin\RelWithDebInfo\*.pdb C:\projects\eqemu\build\libs\zlibng\RelWithDebInfo\*.dll
+
+    appveyor PushArtifact build_x64-no-bots.zip
@@ -86,7 +86,7 @@ int main(int argc, char **argv)
 			return 1;
 		}
 	} else {
-		content_db.SetMySQL(database);
+		content_db.SetMysql(database.getMySQL());
 	}

 	LogSys.SetDatabase(&database)
@@ -183,7 +183,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,7 +207,7 @@ 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)
@@ -83,7 +83,7 @@ int main(int argc, char **argv) {
 			return 1;
 		}
 	} else {
-		content_db.SetMySQL(database);
+		content_db.SetMysql(database.getMySQL());
 	}

 	LogSys.SetDatabase(&database)
@@ -241,10 +241,10 @@ void ImportSkillCaps(SharedDatabase *db) {
 		}

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

 		std::string sql = StringFormat("INSERT INTO skill_caps(class, skillID, level, cap) VALUES(%d, %d, %d, %d)",
 			class_id, skill_id, level, cap);
@@ -280,16 +280,16 @@ void ImportBaseData(SharedDatabase *db) {
 		int level, class_id;
 		double hp, mana, end, unk1, unk2, hp_fac, mana_fac, end_fac;

-		level = Strings::ToInt(split[0].c_str());
-		class_id = Strings::ToInt(split[1].c_str());
-		hp = Strings::ToFloat(split[2].c_str());
-		mana = Strings::ToFloat(split[3].c_str());
-		end = Strings::ToFloat(split[4].c_str());
-		unk1 = Strings::ToFloat(split[5].c_str());
-		unk2 = Strings::ToFloat(split[6].c_str());
-		hp_fac = Strings::ToFloat(split[7].c_str());
-		mana_fac = Strings::ToFloat(split[8].c_str());
-		end_fac = Strings::ToFloat(split[9].c_str());
+		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)",
@@ -339,8 +339,8 @@ void ImportDBStrings(SharedDatabase *db) {
 		int id, type;
 		std::string value;

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

 		if(split.size() >= 3) {
 			value = ::Strings::Escape(split[2]);
@@ -33,11 +33,9 @@ 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
+    discord_manager.cpp
    faction.cpp
    file.cpp
    guild_base.cpp
@@ -184,8 +182,6 @@ SET(repositories
    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
@@ -200,6 +196,7 @@ SET(repositories
    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
@@ -219,6 +216,7 @@ SET(repositories
    repositories/base/base_guilds_repository.h
    repositories/base/base_guild_ranks_repository.h
    repositories/base/base_guild_relations_repository.h
+    repositories/base/base_hackers_repository.h
    repositories/base/base_horses_repository.h
    repositories/base/base_instance_list_repository.h
    repositories/base/base_instance_list_player_repository.h
@@ -264,8 +262,6 @@ SET(repositories
    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_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
@@ -362,8 +358,6 @@ SET(repositories
    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
@@ -378,6 +372,7 @@ SET(repositories
    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
@@ -397,6 +392,7 @@ SET(repositories
    repositories/guilds_repository.h
    repositories/guild_ranks_repository.h
    repositories/guild_relations_repository.h
+    repositories/hackers_repository.h
    repositories/horses_repository.h
    repositories/instance_list_repository.h
    repositories/instance_list_player_repository.h
@@ -442,8 +438,6 @@ SET(repositories
    repositories/pets_equipmentset_repository.h
    repositories/pets_equipmentset_entries_repository.h
    repositories/player_titlesets_repository.h
-    repositories/player_event_log_settings_repository.h
-    repositories/player_event_logs_repository.h
    repositories/quest_globals_repository.h
    repositories/raid_details_repository.h
    repositories/raid_members_repository.h
@@ -509,7 +503,7 @@ SET(common_headers
    dbcore.h
    deity.h
    discord/discord.h
-    discord/discord_manager.h
+    discord_manager.h
    dynamic_zone_base.h
    emu_constants.h
    emu_limits.h
@@ -532,9 +526,6 @@ SET(common_headers
    eq_stream_locator.h
    eq_stream_proxy.h
    eqtime.h
-    events/player_event_logs.h
-    events/player_event_discord_formatter.h
-    events/player_events.h
    errmsg.h
    event_sub.h
    expedition_lockout_timer.h
@@ -608,11 +599,11 @@ SET(common_headers
    unix.h
    useperl.h
    version.h
+    zone_numbers.h
    zone_store.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
@@ -661,12 +652,12 @@ 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
-    util/uuid.h)
+    util/uuid.h
+    )

 SOURCE_GROUP(Event FILES
    event/event_loop.h
@@ -20,7 +20,6 @@

 #include "../common/types.h"

-#define NO_CLASS 0
 #define WARRIOR 1
 #define CLERIC 2
 #define PALADIN 3
@@ -120,7 +120,7 @@ std::vector<std::string> WorldContentService::GetContentFlagsDisabled()
 /**
 * @param content_flags
 */
-void WorldContentService::SetContentFlags(const std::vector<ContentFlagsRepository::ContentFlags>& content_flags)
+void WorldContentService::SetContentFlags(std::vector<ContentFlagsRepository::ContentFlags> content_flags)
 {
 	WorldContentService::content_flags = content_flags;
 }
@@ -167,7 +167,7 @@ public:
 	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 SetContentFlags(std::vector<ContentFlagsRepository::ContentFlags> content_flags);
 	void ReloadContentFlags();
 	WorldContentService * SetExpansionContext();

@@ -3,96 +3,13 @@
 #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 = {
-		"http://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);
-		httplib::Headers headers = {
-			{"Content-Type", "application/json"}
-		};
-
-		// 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"
@@ -104,30 +21,22 @@ public:
 	EQEmuStackWalker(DWORD dwProcessId, HANDLE hProcess) : StackWalker(dwProcessId, hProcess) { }
 	virtual void OnOutput(LPCSTR szText) {
 		char buffer[4096];
-		for (int i = 0; i < 4096; ++i) {
-			if (szText[i] == 0) {
+		for(int i = 0; i < 4096; ++i) {
+			if(szText[i] == 0) {
 				buffer[i] = '\0';
 				break;
 			}

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

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

 LONG WINAPI windows_exception_handler(EXCEPTION_POINTERS *ExceptionInfo)
@@ -201,20 +110,7 @@ LONG WINAPI windows_exception_handler(EXCEPTION_POINTERS *ExceptionInfo)

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

 	return EXCEPTION_EXECUTE_HANDLER;
@@ -285,18 +181,12 @@ void print_trace()
 	}

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

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

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

@@ -313,7 +313,7 @@ namespace cron
 		{
 			try
 			{
-				return static_cast<cron_int>(Strings::ToUnsignedInt(text.data()));
+				return static_cast<cron_int>(std::stoul(text.data()));
 			}
 			catch (std::exception const & ex)
 			{
@@ -71,11 +71,11 @@ bool Database::Connect(const char* host, const char* user, const char* passwd, c
 	uint32 errnum= 0;
 	char errbuf[MYSQL_ERRMSG_SIZE];
 	if (!Open(host, user, passwd, database, port, &errnum, errbuf)) {
-		LogError("Connection [{}] Failed to connect to database Error [{}]", connection_label, errbuf);
+		LogError("[MySQL] Connection [{}] Failed to connect to database: Error [{}]", connection_label, errbuf);
 		return false;
 	}
 	else {
-		LogInfo("Connected to database [{}] [{}] @ [{}:{}]", connection_label, database, host,port);
+		LogInfo("[MySQL] Connection [{}] database [{}] at [{}]:[{}]", connection_label, database, host,port);
 		return true;
 	}
 }
@@ -121,10 +121,10 @@ uint32 Database::CheckLogin(const char* name, const char* password, const char *

 	auto row = results.begin();

-	auto id = Strings::ToUnsignedInt(row[0]);
+	auto id = std::stoul(row[0]);

 	if (oStatus) {
-		*oStatus = Strings::ToInt(row[1]);
+		*oStatus = std::stoi(row[1]);
 	}

 	return id;
@@ -202,11 +202,11 @@ int16 Database::CheckStatus(uint32 account_id)
 	}

 	auto row = results.begin();
-	int16 status = Strings::ToInt(row[0]);
+	int16 status = std::stoi(row[0]);
 	int32 date_diff = 0;

 	if (row[1]) {
-		date_diff = Strings::ToInt(row[1]);
+		date_diff = std::stoi(row[1]);
 	}

 	if (date_diff > 0) {
@@ -345,7 +345,7 @@ bool Database::ReserveName(uint32 account_id, char* name) {
 	std::string query = StringFormat("SELECT `account_id`, `name` FROM `character_data` WHERE `name` = '%s'", name);
 	auto results = QueryDatabase(query);
 	for (auto row = results.begin(); row != results.end(); ++row) {
-		if (row[0] && Strings::ToInt(row[0]) > 0){
+		if (row[0] && atoi(row[0]) > 0){
 			LogInfo("Account: [{}] tried to request name: [{}], but it is already taken", account_id, name);
 			return false;
 		}
@@ -387,14 +387,19 @@ bool Database::DeleteCharacter(char *character_name)
 	std::string query   = StringFormat("SELECT `id` from `character_data` WHERE `name` = '%s'", character_name);
 	auto        results = QueryDatabase(query);
 	for (auto   row     = results.begin(); row != results.end(); ++row) {
-		character_id = Strings::ToUnsignedInt(row[0]);
+		character_id = atoi(row[0]);
 	}

 	if (character_id <= 0) {
-		LogError("Invalid Character ID [{}]", character_name);
+		LogError("[DeleteCharacter] Invalid Character ID [{}]", character_name);
 		return false;
 	}

+#ifdef BOTS
+	query = StringFormat("DELETE FROM `guild_members` WHERE `char_id` = '%d' AND GetMobTypeById(%i) = 'C'", character_id); // note: only use of GetMobTypeById()
+	QueryDatabase(query);
+#endif
+
 	std::string delete_type = "hard-deleted";
 	if (RuleB(Character, SoftDeletes)) {
 		delete_type = "soft-deleted";
@@ -413,26 +418,21 @@ bool Database::DeleteCharacter(char *character_name)

 		QueryDatabase(query);

-		if (RuleB(Bots, Enabled)) {
-			query = fmt::format(
-				SQL(
-					UPDATE
-					bot_data
-						SET
-					name = SUBSTRING(CONCAT(name, '-deleted-', UNIX_TIMESTAMP()), 1, 64)
-					WHERE
-					owner_id = '{}'
-				),
-				character_id
-			);
-			QueryDatabase(query);
-			LogInfo(
-				"[DeleteCharacter] character_name [{}] ({}) bots are being [{}]",
-				character_name,
-				character_id,
-				delete_type
-			);
-		}
+#ifdef BOTS
+		query = fmt::format(
+			SQL(
+				UPDATE
+				bot_data
+				SET
+				name = SUBSTRING(CONCAT(name, '-deleted-', UNIX_TIMESTAMP()), 1, 64)
+				WHERE
+				owner_id = '{}'
+			),
+			character_id
+		);
+		QueryDatabase(query);
+		LogInfo("[DeleteCharacter] character_name [{}] ({}) bots are being [{}]", character_name, character_id, delete_type);
+#endif

 		return true;
 	}
@@ -444,7 +444,7 @@ bool Database::DeleteCharacter(char *character_name)
 		QueryDatabase(fmt::format("DELETE FROM {} WHERE {} = {}", table_name, character_id_column_name, character_id));
 	}

-	LogInfo("character_name [{}] ({}) is being [{}]", character_name, character_id, delete_type);
+	LogInfo("[DeleteCharacter] character_name [{}] ({}) is being [{}]", character_name, character_id, delete_type);

 	return true;
 }
@@ -787,7 +787,7 @@ uint32 Database::GetCharacterID(const char *name) {
 	auto row = results.begin();
 	if (results.RowCount() == 1)
 	{
-		return Strings::ToUnsignedInt(row[0]);
+		return atoi(row[0]);
 	}
 	return 0;
 }
@@ -812,10 +812,10 @@ uint32 Database::GetAccountIDByChar(const char* charname, uint32* oCharID) {

 	auto row = results.begin();

-	uint32 accountId = Strings::ToUnsignedInt(row[0]);
+	uint32 accountId = atoi(row[0]);

 	if (oCharID)
-		*oCharID = Strings::ToUnsignedInt(row[1]);
+		*oCharID = atoi(row[1]);

 	return accountId;
 }
@@ -832,7 +832,7 @@ uint32 Database::GetAccountIDByChar(uint32 char_id) {
 		return 0;

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

 uint32 Database::GetAccountIDByName(std::string account_name, std::string loginserver, int16* status, uint32* lsid) {
@@ -852,14 +852,14 @@ uint32 Database::GetAccountIDByName(std::string account_name, std::string logins
 	}

 	auto row = results.begin();
-	auto account_id = Strings::ToUnsignedInt(row[0]);
+	auto account_id = std::stoul(row[0]);

 	if (status) {
-		*status = static_cast<int16>(Strings::ToInt(row[1]));
+		*status = static_cast<int16>(std::stoi(row[1]));
 	}

 	if (lsid) {
-		*lsid = row[2] ? Strings::ToUnsignedInt(row[2]) : 0;
+		*lsid = row[2] ? std::stoul(row[2]) : 0;
 	}

 	return account_id;
@@ -880,7 +880,7 @@ void Database::GetAccountName(uint32 accountid, char* name, uint32* oLSAccountID

 	strcpy(name, row[0]);
 	if (row[1] && oLSAccountID) {
-		*oLSAccountID = Strings::ToUnsignedInt(row[1]);
+		*oLSAccountID = atoi(row[1]);
 	}

 }
@@ -968,15 +968,13 @@ bool Database::LoadVariables() {

 	std::string key, value;
 	for (auto row = results.begin(); row != results.end(); ++row) {
-		varcache.last_update = Strings::ToUnsignedInt(row[2]); // ahh should we be comparing if this is newer?
+		varcache.last_update = atoi(row[2]); // ahh should we be comparing if this is newer?
 		key = row[0];
 		value = row[1];
 		std::transform(std::begin(key), std::end(key), std::begin(key), ::tolower); // keys are lower case, DB doesn't have to be
 		varcache.Add(key, value);
 	}

-	LogInfo("Loaded [{}] variable(s)", Strings::Commify(std::to_string(results.RowCount())));
-
 	return true;
 }

@@ -999,7 +997,7 @@ bool Database::GetVariable(std::string varname, std::string &varvalue)
 	return false;
 }

-bool Database::SetVariable(const std::string& varname, const std::string &varvalue)
+bool Database::SetVariable(const std::string varname, const std::string &varvalue)
 {
 	std::string escaped_name = Strings::Escape(varname);
 	std::string escaped_value = Strings::Escape(varvalue);
@@ -1052,15 +1050,15 @@ bool Database::GetZoneGraveyard(const uint32 graveyard_id, uint32* graveyard_zon
 	auto row = results.begin();

 	if(graveyard_zoneid != nullptr)
-		*graveyard_zoneid = Strings::ToUnsignedInt(row[0]);
+		*graveyard_zoneid = atoi(row[0]);
 	if(graveyard_x != nullptr)
-		*graveyard_x = Strings::ToFloat(row[1]);
+		*graveyard_x = atof(row[1]);
 	if(graveyard_y != nullptr)
-		*graveyard_y = Strings::ToFloat(row[2]);
+		*graveyard_y = atof(row[2]);
 	if(graveyard_z != nullptr)
-		*graveyard_z = Strings::ToFloat(row[3]);
+		*graveyard_z = atof(row[3]);
 	if(graveyard_heading != nullptr)
-		*graveyard_heading = Strings::ToFloat(row[4]);
+		*graveyard_heading = atof(row[4]);

 	return true;
 }
@@ -1168,13 +1166,13 @@ uint32 Database::GetAccountIDFromLSID(
 	}

 	for (auto row = results.begin(); row != results.end(); ++row) {
-		account_id = Strings::ToUnsignedInt(row[0]);
+		account_id = std::stoi(row[0]);

 		if (in_account_name) {
 			strcpy(in_account_name, row[1]);
 		}
 		if (in_status) {
-			*in_status = Strings::ToInt(row[2]);
+			*in_status = std::stoi(row[2]);
 		}
 	}

@@ -1198,7 +1196,7 @@ void Database::GetAccountFromID(uint32 id, char* oAccountName, int16* oStatus) {
 	if (oAccountName)
 		strcpy(oAccountName, row[0]);
 	if (oStatus)
-		*oStatus = Strings::ToInt(row[1]);
+		*oStatus = atoi(row[1]);
 }

 void Database::ClearMerchantTemp(){
@@ -1244,7 +1242,7 @@ uint8 Database::GetServerType() {
 		return 0;

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

 bool Database::MoveCharacterToZone(uint32 character_id, uint32 zone_id)
@@ -1281,6 +1279,44 @@ bool Database::MoveCharacterToZone(const char *charname, uint32 zone_id)
 	return results.RowsAffected() != 0;
 }

+bool Database::SetHackerFlag(const char* accountname, const char* charactername, const char* hacked) {
+	std::string query = StringFormat("INSERT INTO `hackers` (account, name, hacked) values('%s','%s','%s')", accountname, charactername, hacked);
+	auto results = QueryDatabase(query);
+
+	if (!results.Success()) {
+		return false;
+	}
+
+	return results.RowsAffected() != 0;
+}
+
+bool Database::SetMQDetectionFlag(const char* accountname, const char* charactername, const char* hacked, const char* zone) {
+	//Utilize the "hacker" table, but also give zone information.
+	std::string query = StringFormat("INSERT INTO hackers(account,name,hacked,zone) values('%s','%s','%s','%s')", accountname, charactername, hacked, zone);
+	auto results = QueryDatabase(query);
+
+	if (!results.Success())
+	{
+		return false;
+	}
+
+	return results.RowsAffected() != 0;
+}
+
+bool Database::SetMQDetectionFlag(const char* accountname, const char* charactername, const std::string &hacked, const char* zone) {
+	//Utilize the "hacker" table, but also give zone information.
+	auto query = fmt::format("INSERT INTO hackers(account, name, hacked, zone) values('{}', '{}', '{}', '{}')",
+				 accountname, charactername, hacked, zone);
+	auto results = QueryDatabase(query);
+
+	if (!results.Success())
+	{
+		return false;
+	}
+
+	return results.RowsAffected() != 0;
+}
+
 uint8 Database::GetRaceSkill(uint8 skillid, uint8 in_race)
 {
 	uint16 race_cap = 0;
@@ -1296,7 +1332,7 @@ uint8 Database::GetRaceSkill(uint8 skillid, uint8 in_race)
 		return 0;

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

 uint8 Database::GetSkillCap(uint8 skillid, uint8 in_race, uint8 in_class, uint16 in_level)
@@ -1312,12 +1348,12 @@ uint8 Database::GetSkillCap(uint8 skillid, uint8 in_race, uint8 in_class, uint16
 	if (results.Success() && results.RowsAffected() != 0)
 	{
 		auto row = results.begin();
-		skill_level = Strings::ToUnsignedInt(row[0]);
-		skill_formula = Strings::ToUnsignedInt(row[1]);
-		skill_cap = Strings::ToUnsignedInt(row[2]);
-		if (Strings::ToUnsignedInt(row[3]) > skill_cap)
-			skill_cap2 = (Strings::ToUnsignedInt(row[3])-skill_cap)/10; //Split the post-50 skill cap into difference between pre-50 cap and post-50 cap / 10 to determine amount of points per level.
-		skill_cap3 = Strings::ToUnsignedInt(row[4]);
+		skill_level = atoi(row[0]);
+		skill_formula = atoi(row[1]);
+		skill_cap = atoi(row[2]);
+		if (atoi(row[3]) > skill_cap)
+			skill_cap2 = (atoi(row[3])-skill_cap)/10; //Split the post-50 skill cap into difference between pre-50 cap and post-50 cap / 10 to determine amount of points per level.
+		skill_cap3 = atoi(row[4]);
 	}

 	int race_skill = GetRaceSkill(skillid,in_race);
@@ -1362,10 +1398,10 @@ uint32 Database::GetCharacterInfo(std::string character_name, uint32 *account_id
 	}

 	auto row = results.begin();
-	auto character_id = Strings::ToUnsignedInt(row[0]);
-	*account_id = Strings::ToUnsignedInt(row[1]);
-	*zone_id = Strings::ToUnsignedInt(row[2]);
-	*instance_id = Strings::ToUnsignedInt(row[3]);
+	auto character_id = std::stoul(row[0]);
+	*account_id = std::stoul(row[1]);
+	*zone_id = std::stoul(row[2]);
+	*instance_id = std::stoul(row[3]);

 	return character_id;
 }
@@ -1488,7 +1524,7 @@ uint32 Database::GetGroupID(const char* name){

 	auto row = results.begin();

-	return Strings::ToUnsignedInt(row[0]);
+	return atoi(row[0]);
 }

 std::string Database::GetGroupLeaderForLogin(std::string character_name) {
@@ -1502,7 +1538,7 @@ std::string Database::GetGroupLeaderForLogin(std::string character_name) {

 	if (results.Success() && results.RowCount()) {
 		auto row = results.begin();
-		group_id = Strings::ToUnsignedInt(row[0]);
+		group_id = std::stoul(row[0]);
 	}

 	if (!group_id) {
@@ -1591,7 +1627,7 @@ char *Database::GetGroupLeadershipInfo(uint32 gid, char* leaderbuf, char* mainta
 		strcpy(mentoree, row[5]);

 	if (mentor_percent)
-		*mentor_percent = Strings::ToInt(row[6]);
+		*mentor_percent = atoi(row[6]);

 	if(GLAA && results.LengthOfColumn(7) == sizeof(GroupLeadershipAA_Struct))
 		memcpy(GLAA, row[7], sizeof(GroupLeadershipAA_Struct));
@@ -1638,7 +1674,7 @@ uint8 Database::GetAgreementFlag(uint32 acctid) {

 	auto row = results.begin();

-	return Strings::ToUnsignedInt(row[0]);
+	return atoi(row[0]);
 }

 void Database::SetAgreementFlag(uint32 acctid) {
@@ -1724,7 +1760,7 @@ uint32 Database::GetRaidID(const char* name)
 	}

 	if (row[0]) // would it ever be possible to have a null here?
-		return Strings::ToUnsignedInt(row[0]);
+		return atoi(row[0]);

 	return 0;
 }
@@ -1807,7 +1843,7 @@ void Database::GetGroupLeadershipInfo(uint32 gid, uint32 rid, char *maintank,
 		strcpy(mentoree, row[4]);

 	if (mentor_percent)
-		*mentor_percent = Strings::ToInt(row[5]);
+		*mentor_percent = atoi(row[5]);

 	if (GLAA && results.LengthOfColumn(6) == sizeof(GroupLeadershipAA_Struct))
 		memcpy(GLAA, row[6], sizeof(GroupLeadershipAA_Struct));
@@ -1980,16 +2016,16 @@ bool Database::GetAdventureStats(uint32 char_id, AdventureStats_Struct *as)

 	auto row = results.begin();

-	as->success.guk = Strings::ToUnsignedInt(row[0]);
-	as->success.mir = Strings::ToUnsignedInt(row[1]);
-	as->success.mmc = Strings::ToUnsignedInt(row[2]);
-	as->success.ruj = Strings::ToUnsignedInt(row[3]);
-	as->success.tak = Strings::ToUnsignedInt(row[4]);
-	as->failure.guk = Strings::ToUnsignedInt(row[5]);
-	as->failure.mir = Strings::ToUnsignedInt(row[6]);
-	as->failure.mmc = Strings::ToUnsignedInt(row[7]);
-	as->failure.ruj = Strings::ToUnsignedInt(row[8]);
-	as->failure.tak = Strings::ToUnsignedInt(row[9]);
+	as->success.guk = atoi(row[0]);
+	as->success.mir = atoi(row[1]);
+	as->success.mmc = atoi(row[2]);
+	as->success.ruj = atoi(row[3]);
+	as->success.tak = atoi(row[4]);
+	as->failure.guk = atoi(row[5]);
+	as->failure.mir = atoi(row[6]);
+	as->failure.mmc = atoi(row[7]);
+	as->failure.ruj = atoi(row[8]);
+	as->failure.tak = atoi(row[9]);
 	as->failure.total = as->failure.guk + as->failure.mir + as->failure.mmc + as->failure.ruj + as->failure.tak;
 	as->success.total = as->success.guk + as->success.mir + as->success.mmc + as->success.ruj + as->success.tak;

@@ -2008,7 +2044,7 @@ uint32 Database::GetGuildIDByCharID(uint32 character_id)
 		return 0;

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

 uint32 Database::GetGroupIDByCharID(uint32 character_id)
@@ -2030,7 +2066,7 @@ uint32 Database::GetGroupIDByCharID(uint32 character_id)
 		return 0;

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

 uint32 Database::GetRaidIDByCharID(uint32 character_id) {
@@ -2043,12 +2079,10 @@ uint32 Database::GetRaidIDByCharID(uint32 character_id) {
 		character_id
 	);
 	auto results = QueryDatabase(query);
-	if (!results.Success() || !results.RowCount()) {
-		return 0;
+	for (auto row = results.begin(); row != results.end(); ++row) {
+		return atoi(row[0]);
 	}
-
-	auto row = results.begin();
-	return Strings::ToUnsignedInt(row[0]);
+	return 0;
 }

 int Database::CountInvSnapshots() {
@@ -2060,7 +2094,7 @@ int Database::CountInvSnapshots() {

 	auto row = results.begin();

-	int64 count = Strings::ToBigInt(row[0]);
+	int64 count = atoll(row[0]);
 	if (count > 2147483647)
 		return -2;
 	if (count < 0)
@@ -2091,17 +2125,17 @@ struct TimeOfDay_Struct Database::LoadTime(time_t &realtime)
 		eqTime.day = 1;
 		eqTime.month = 1;
 		eqTime.year = 3100;
-		realtime = time(nullptr);
+		realtime = time(0);
 	}
 	else{
 		auto row = results.begin();

-		eqTime.minute = Strings::ToUnsignedInt(row[0]);
-		eqTime.hour = Strings::ToUnsignedInt(row[1]);
-		eqTime.day = Strings::ToUnsignedInt(row[2]);
-		eqTime.month = Strings::ToUnsignedInt(row[3]);
-		eqTime.year = Strings::ToUnsignedInt(row[4]);
-		realtime = Strings::ToBigInt(row[5]);
+		eqTime.minute = atoi(row[0]);
+		eqTime.hour = atoi(row[1]);
+		eqTime.day = atoi(row[2]);
+		eqTime.month = atoi(row[3]);
+		eqTime.year = atoi(row[4]);
+		realtime = atoi(row[5]);
 	}

 	return eqTime;
@@ -2128,7 +2162,7 @@ int Database::GetIPExemption(std::string account_ip) {
 	}

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

 void Database::SetIPExemption(std::string account_ip, int exemption_amount) {
@@ -2142,7 +2176,7 @@ void Database::SetIPExemption(std::string account_ip, int exemption_amount) {
 	auto results = QueryDatabase(query);
 	if (results.Success() && results.RowCount()) {
 		auto row = results.begin();
-		exemption_id = Strings::ToUnsignedInt(row[0]);
+		exemption_id = std::stoul(row[0]);
 	}

 	query = fmt::format(
@@ -2168,7 +2202,7 @@ int Database::GetInstanceID(uint32 char_id, uint32 zone_id) {

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

 	return 0;
@@ -2320,7 +2354,7 @@ void Database::SourceDatabaseTableFromUrl(std::string table_name, std::string ur
 		uri request_uri(url);

 		LogHTTP(
-			"parsing url [{}] path [{}] host [{}] query_string [{}] protocol [{}] port [{}]",
+			"[SourceDatabaseTableFromUrl] parsing url [{}] path [{}] host [{}] query_string [{}] protocol [{}] port [{}]",
 			url,
 			request_uri.get_path(),
 			request_uri.get_host(),
@@ -2347,7 +2381,7 @@ void Database::SourceDatabaseTableFromUrl(std::string table_name, std::string ur

 			int sourced_queries = 0;

-			if (auto res = cli.Get(request_uri.get_path())) {
+			if (auto res = cli.Get(request_uri.get_path().c_str())) {
 				if (res->status == 200) {
 					for (auto &s: Strings::Split(res->body, ';')) {
 						if (!Strings::Trim(s).empty()) {
@@ -2374,7 +2408,7 @@ void Database::SourceDatabaseTableFromUrl(std::string table_name, std::string ur

 	}
 	catch (std::invalid_argument iae) {
-		LogError("URI parser error [{}]", iae.what());
+		LogError("[SourceDatabaseTableFromUrl] URI parser error [{}]", iae.what());
 	}
 }

@@ -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;
@@ -106,6 +108,9 @@ 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,
@@ -235,7 +240,7 @@ public:
 	/* 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 */
@@ -118,53 +118,109 @@ std::string DatabaseDumpService::GetBaseMySQLDumpCommand()
 	);
 }

+/**
+ * @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) {
+		tables_list += table + " ";
+	}
+
+	return Strings::Trim(tables_list);
 }

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

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

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

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

-	return Strings::Join(system_tables, " ");
+	tables = DatabaseSchema::GetVersionTables();
+	for (const auto &table : tables) {
+		tables_list += table + " ";
+	}
+
+	return Strings::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 Strings::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 Strings::Trim(tables_list);
 }

 /**
@@ -250,11 +306,6 @@ void DatabaseDumpService::Dump()
 			dump_descriptor += "-bots";
 		}

-		if (IsDumpMercTables()) {
-			tables_to_dump += GetMercTablesList() + " ";
-			dump_descriptor += "-mercs";
-		}
-
 		if (IsDumpSystemTables()) {
 			tables_to_dump += GetSystemTablesList() + " ";
 			dump_descriptor += "-system";
@@ -324,7 +375,7 @@ void DatabaseDumpService::Dump()
 	}

 	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());
@@ -525,13 +576,3 @@ 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;
-}
@@ -55,8 +55,6 @@ public:
 	void SetDumpStateTables(bool dump_state_tables);
 	bool IsDumpBotTables() const;
 	void SetDumpBotTables(bool dump_bot_tables);
-	bool IsDumpMercTables() const;
-	void SetDumpMercTables(bool dump_bot_tables);

 private:
 	bool        dump_all_tables             = false;
@@ -72,7 +70,6 @@ private:
 	bool        dump_output_to_console      = false;
 	bool        dump_drop_table_syntax_only = false;
 	bool        dump_bot_tables             = false;
-	bool        dump_merc_tables            = false;
 	std::string dump_path;
 	std::string dump_file_name;

@@ -81,7 +78,6 @@ private:
 	std::string GetBaseMySQLDumpCommand();
 	std::string GetPlayerTablesList();
 	std::string GetBotTablesList();
-	std::string GetMercTablesList();
 	std::string GetSystemTablesList();
 	std::string GetStateTablesList();
 	std::string GetContentTablesList();
@@ -476,13 +476,6 @@ bool Database::CheckDatabaseConversions() {
 	CheckDatabaseConvertPPDeblob();
 	CheckDatabaseConvertCorpseDeblob();

-	auto *r = RuleManager::Instance();
-	r->LoadRules(this, "default", false);
-	if (!RuleB(Bots, Enabled) && DoesTableExist("bot_data")) {
-		LogInfo("Bot tables found but rule not enabled, enabling");
-		r->SetRule("Bots:Enabled", "true", this, true, true);
-	}
-
 	/* Run EQEmu Server script (Checks for database updates) */

 	const std::string file = fmt::format("{}/eqemu_server.pl", path.GetServerPath());
@@ -499,7 +492,7 @@ bool Database::CheckDatabaseConvertPPDeblob(){
 	ExtendedProfile_Struct* e_pp;
 	uint32 pplen = 0;
 	uint32 i;
-	uint32 character_id = 0;
+	int character_id = 0;
 	int account_id = 0;
 	int number_of_characters = 0;
 	int printppdebug = 0; /* Prints Player Profile */
@@ -530,7 +523,7 @@ bool Database::CheckDatabaseConvertPPDeblob(){
 		rquery = StringFormat("SELECT COUNT(`id`) FROM `character_`");
 		results = QueryDatabase(rquery);
 		for (auto row = results.begin(); row != results.end(); ++row) {
-			number_of_characters = Strings::ToInt(row[0]);
+			number_of_characters = atoi(row[0]);
 			printf("Number of Characters in Database: %i \n", number_of_characters);
 		}

@@ -929,19 +922,19 @@ bool Database::CheckDatabaseConvertPPDeblob(){

 		for (auto row = results.begin(); row != results.end(); ++row) {
 			char_iter_count++;
-			squery = StringFormat("SELECT `id`, `profile`, `name`, `level`, `account_id`, `firstlogon`, `lfg`, `lfp`, `mailkey`, `xtargets`, `inspectmessage`, `extprofile` FROM `character_` WHERE `id` = %i", Strings::ToUnsignedInt(row[0]));
+			squery = StringFormat("SELECT `id`, `profile`, `name`, `level`, `account_id`, `firstlogon`, `lfg`, `lfp`, `mailkey`, `xtargets`, `inspectmessage`, `extprofile` FROM `character_` WHERE `id` = %i", atoi(row[0]));
 			auto results2 = QueryDatabase(squery);
 			auto row2 = results2.begin();
 			pp = (Convert::PlayerProfile_Struct*)row2[1];
 			e_pp = (ExtendedProfile_Struct*)row2[11];
-			character_id = Strings::ToUnsignedInt(row[0]);
-			account_id = Strings::ToInt(row2[4]);
+			character_id = atoi(row[0]);
+			account_id = atoi(row2[4]);
 			/* Convert some data from the character_ table that is still relevant */
-			firstlogon = Strings::ToUnsignedInt(row2[5]);
-			lfg = Strings::ToUnsignedInt(row2[6]);
-			lfp = Strings::ToUnsignedInt(row2[7]);
+			firstlogon = atoi(row2[5]);
+			lfg = atoi(row2[6]);
+			lfp = atoi(row2[7]);
 			mailkey = row2[8];
-			xtargets = Strings::ToUnsignedInt(row2[9]);
+			xtargets = atoi(row2[9]);
 			inspectmessage = row2[10];

 			/* Verify PP Integrity */
@@ -1567,7 +1560,7 @@ bool Database::CheckDatabaseConvertCorpseDeblob(){
 		rquery = StringFormat("SELECT DISTINCT charid FROM character_corpses");
 		results = QueryDatabase(rquery);
 		for (auto row = results.begin(); row != results.end(); ++row) {
-			std::string squery = StringFormat("SELECT id, charname, data, time_of_death, is_rezzed FROM character_corpses WHERE `charid` = %i", Strings::ToUnsignedInt(row[0]));
+			std::string squery = StringFormat("SELECT id, charname, data, time_of_death, is_rezzed FROM character_corpses WHERE `charid` = %i", atoi(row[0]));
 			auto results2 = QueryDatabase(squery);
 			for (auto row2 = results2.begin(); row2 != results2.end(); ++row2) {
 				in_datasize = results2.LengthOfColumn(2);
@@ -1599,7 +1592,7 @@ bool Database::CheckDatabaseConvertCorpseDeblob(){
 					c_type = "NULL";
 					continue;
 				}
-				std::cout << "Converting Corpse: [OK] [" << c_type << "]: " << "ID: " << Strings::ToUnsignedInt(row2[0]) << std::endl;
+				std::cout << "Converting Corpse: [OK] [" << c_type << "]: " << "ID: " << atoi(row2[0]) << std::endl;

 				if (is_sof){
 					scquery = StringFormat("UPDATE `character_corpses` SET \n"
@@ -1670,7 +1663,7 @@ bool Database::CheckDatabaseConvertCorpseDeblob(){
 						dbpc->item_tint[6].color,
 						dbpc->item_tint[7].color,
 						dbpc->item_tint[8].color,
-						Strings::ToUnsignedInt(row2[0])
+						atoi(row2[0])
 						);
 					if (scquery != ""){ auto sc_results = QueryDatabase(scquery); }

@@ -1682,7 +1675,7 @@ bool Database::CheckDatabaseConvertCorpseDeblob(){
 							scquery = StringFormat("REPLACE INTO `character_corpse_items` \n"
 								" (corpse_id, equip_slot, item_id, charges, aug_1, aug_2, aug_3, aug_4, aug_5, aug_6, attuned) \n"
 								" VALUES (%u, %u, %u, %u, %u, %u, %u, %u, %u, %u, %u) \n",
-								Strings::ToUnsignedInt(row2[0]),
+								atoi(row2[0]),
 								dbpc->items[i].equipSlot,
 								dbpc->items[i].item_id,
 								dbpc->items[i].charges,
@@ -1698,7 +1691,7 @@ bool Database::CheckDatabaseConvertCorpseDeblob(){
 						}
 						else{
 							scquery = scquery + StringFormat(", (%u, %u, %u, %u, %u, %u, %u, %u, %u, %u, %u) \n",
-								Strings::ToUnsignedInt(row2[0]),
+								atoi(row2[0]),
 								dbpc->items[i].equipSlot,
 								dbpc->items[i].item_id,
 								dbpc->items[i].charges,
@@ -1778,7 +1771,7 @@ bool Database::CheckDatabaseConvertCorpseDeblob(){
 						dbpc_c->item_tint[6].color,
 						dbpc_c->item_tint[7].color,
 						dbpc_c->item_tint[8].color,
-						Strings::ToUnsignedInt(row2[0])
+						atoi(row2[0])
 						);
 					if (scquery != ""){ auto sc_results = QueryDatabase(scquery); }

@@ -1791,7 +1784,7 @@ bool Database::CheckDatabaseConvertCorpseDeblob(){
 							scquery = StringFormat("REPLACE INTO `character_corpse_items` \n"
 								" (corpse_id, equip_slot, item_id, charges, aug_1, aug_2, aug_3, aug_4, aug_5, aug_6, attuned) \n"
 								" VALUES (%u, %u, %u, %u, %u, %u, %u, %u, %u, %u, %u) \n",
-								Strings::ToUnsignedInt(row2[0]),
+								atoi(row2[0]),
 								dbpc_c->items[i].equipSlot,
 								dbpc_c->items[i].item_id,
 								dbpc_c->items[i].charges,
@@ -1807,7 +1800,7 @@ bool Database::CheckDatabaseConvertCorpseDeblob(){
 						}
 						else{
 							scquery = scquery + StringFormat(", (%u, %u, %u, %u, %u, %u, %u, %u, %u, %u, %u) \n",
-								Strings::ToUnsignedInt(row2[0]),
+								atoi(row2[0]),
 								dbpc_c->items[i].equipSlot,
 								dbpc_c->items[i].item_id,
 								dbpc_c->items[i].charges,
@@ -167,8 +167,8 @@ bool Database::GetUnusedInstanceID(uint16 &instance_id)

 	auto row = results.begin();

-	if (Strings::ToInt(row[0]) <= max) {
-		instance_id = Strings::ToInt(row[0]);
+	if (atoi(row[0]) <= max) {
+		instance_id = atoi(row[0]);

 		return true;
 	}
@@ -194,7 +194,7 @@ bool Database::GetUnusedInstanceID(uint16 &instance_id)
 	max_reserved_instance_id++;

 	for (auto row : results) {
-		if (max_reserved_instance_id < Strings::ToUnsignedInt(row[0])) {
+		if (max_reserved_instance_id < std::stoul(row[0])) {
 			instance_id = max_reserved_instance_id;
 			return true;
 		}
@@ -301,7 +301,7 @@ uint16 Database::GetInstanceID(uint32 zone_id, uint32 character_id, int16 versio

 	auto row = results.begin();

-	return static_cast<uint16>(Strings::ToUnsignedInt(row[0]));
+	return static_cast<uint16>(std::stoul(row[0]));
 }

 std::vector<uint16> Database::GetInstanceIDs(uint32 zone_id, uint32 character_id)
@@ -328,7 +328,7 @@ std::vector<uint16> Database::GetInstanceIDs(uint32 zone_id, uint32 character_id
 	}

 	for (auto row : results) {
-		l.push_back(static_cast<uint16>(Strings::ToUnsignedInt(row[0])));
+		l.push_back(static_cast<uint16>(std::stoul(row[0])));
 	}

 	return l;
@@ -409,7 +409,7 @@ void Database::AssignRaidToInstance(uint32 raid_id, uint32 instance_id)
 	auto zone_id = GetInstanceZoneID(instance_id);
 	auto version = GetInstanceVersion(instance_id);

-	auto l = RaidMembersRepository::GetWhere(
+	auto l = GroupIdRepository::GetWhere(
 		*this,
 		fmt::format(
 			"raidid = {}",
@@ -429,6 +429,8 @@ void Database::AssignRaidToInstance(uint32 raid_id, uint32 instance_id)

 void Database::DeleteInstance(uint16 instance_id)
 {
+	std::string query;
+
 	InstanceListPlayerRepository::DeleteWhere(*this, fmt::format("id = {}", instance_id));

 	RespawnTimesRepository::DeleteWhere(*this, fmt::format("instance_id = {}", instance_id));
@@ -321,18 +321,18 @@ namespace DatabaseSchema {
 			"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",
@@ -341,8 +341,6 @@ namespace DatabaseSchema {
 			"respawn_times",
 			"saylink",
 			"server_scheduled_events",
-			"player_event_log_settings",
-			"player_event_logs",
 			"shared_task_activity_state",
 			"shared_task_dynamic_zones",
 			"shared_task_members",
@@ -408,28 +406,9 @@ namespace DatabaseSchema {
 			"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"
+			"bot_timers",
+			"vw_bot_character_mobs",
+			"vw_bot_groups"
 		};
 	}

@@ -34,16 +34,14 @@

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

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

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

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

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

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

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

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

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

 			auto errorBuffer = new char[MYSQL_ERRMSG_SIZE];

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

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

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

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

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

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

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

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

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

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

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

+void DBcore::SetMysql(MYSQL *mysql)
+{
+	DBcore::mysql = *mysql;
+}
+
 const std::string &DBcore::GetOriginHost() const
 {
 	return origin_host;
@@ -289,19 +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;
-}
@@ -12,7 +12,6 @@

 #include <mysql.h>
 #include <string.h>
-#include <mutex>

 class DBcore {
 public:
@@ -24,26 +23,20 @@ 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);
 	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(std::string table_name);

-	void SetMySQL(const DBcore &o)
-	{
-		mysql      = o.mysql;
-		mysqlOwner = false;
-	}
-	void SetMutex(Mutex *mutex);
-
 protected:
 	bool Open(
 		const char *iHost,
@@ -60,13 +53,10 @@ protected:
 private:
 	bool Open(uint32 *errnum = nullptr, char *errbuf = nullptr);

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

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

 	char   *pHost;
@@ -1,17 +1,22 @@
-#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)) {
+	// validate
+	if (webhook_url.empty()) {
+		LogDiscord("[webhook_url] is empty");
+		return;
+	}
+
+	// validate
+	if (webhook_url.find("http://") == std::string::npos && webhook_url.find("https://") == std::string::npos) {
+		LogDiscord("[webhook_url] [{}] does not contain a valid http/s prefix.", webhook_url);
 		return;
 	}

@@ -23,7 +28,7 @@ void Discord::SendWebhookMessage(const std::string &message, const std::string &
 	std::string endpoint = Strings::Replace(webhook_url, base_url, "");

 	// client
-	httplib::Client cli(base_url);
+	httplib::Client cli(base_url.c_str());
 	cli.set_connection_timeout(0, 15000000); // 15 sec
 	cli.set_read_timeout(15, 0); // 15 seconds
 	cli.set_write_timeout(15, 0); // 15 seconds
@@ -41,7 +46,7 @@ void Discord::SendWebhookMessage(const std::string &message, const std::string &
 	int  retries     = 0;
 	int  retry_timer = 1000;
 	while (retry) {
-		if (auto res = cli.Post(endpoint, payload.str(), "application/json")) {
+		if (auto res = cli.Post(endpoint.c_str(), payload.str(), "application/json")) {
 			if (res->status != 200 && res->status != 204) {
 				LogError("[Discord Client] Code [{}] Error [{}]", res->status, res->body);
 			}
@@ -57,7 +62,7 @@ void Discord::SendWebhookMessage(const std::string &message, const std::string &
 						LogDiscord("JSON serialization failure [{}] via [{}]", ex.what(), res->body);
 					}

-					retry_timer = Strings::ToInt(response["retry_after"].asString()) + 500;
+					retry_timer = std::stoi(response["retry_after"].asString()) + 500;
 				}

 				LogDiscord("Rate limited... retrying message in [{}ms]", retry_timer);
@@ -76,74 +81,6 @@ void Discord::SendWebhookMessage(const std::string &message, const std::string &
 	}
 }

-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
-	httplib::Headers headers = {
-		{"Content-Type", "application/json"}
-	};
-
-	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) {
@@ -152,20 +89,3 @@ std::string Discord::FormatDiscordMessage(uint16 category_id, const std::string

 	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;
-}
@@ -4,16 +4,11 @@

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


@@ -1,6 +1,7 @@
 #include "discord_manager.h"
-#include "../../common/discord/discord.h"
-#include "../events/player_event_logs.h"
+#include "../common/discord/discord.h"
+#include "../common/eqemu_logsys.h"
+#include "../common/strings.h"

 void DiscordManager::QueueWebhookMessage(uint32 webhook_id, const std::string &message)
 {
@@ -54,6 +55,7 @@ void DiscordManager::ProcessMessageQueue()
 				message = "";
 			}
 		}
+
 		// final flush
 		if (!message.empty()) {
 			Discord::SendWebhookMessage(
@@ -65,11 +67,3 @@ void DiscordManager::ProcessMessageQueue()
 	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);
-	}
-}
@@ -4,15 +4,12 @@
 #include <mutex>
 #include <map>
 #include <vector>
-#include "../../common/types.h"
-#include "../repositories/player_event_logs_repository.h"
-#include "../events/player_events.h"
+#include "../common/types.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{};
@@ -197,11 +197,11 @@ const std::map<int, std::string>& EQ::constants::GetLanguageMap()

 std::string EQ::constants::GetLanguageName(int language_id)
 {
-	if (!EQ::ValueWithin(language_id, LANG_COMMON_TONGUE, LANG_UNKNOWN)) {
-		return std::string();
+	if (EQ::ValueWithin(language_id, LANG_COMMON_TONGUE, LANG_UNKNOWN)) {
+		return EQ::constants::GetLanguageMap().find(language_id)->second;
 	}

-	return EQ::constants::GetLanguageMap().find(language_id)->second;
+	return std::string();
 }

 const std::map<uint32, std::string>& EQ::constants::GetLDoNThemeMap()
@@ -220,11 +220,11 @@ const std::map<uint32, std::string>& EQ::constants::GetLDoNThemeMap()

 std::string EQ::constants::GetLDoNThemeName(uint32 theme_id)
 {
-	if (!EQ::ValueWithin(theme_id, LDoNThemes::Unused, LDoNThemes::TAK)) {
-		return std::string();
+	if (EQ::ValueWithin(theme_id, LDoNThemes::Unused, LDoNThemes::TAK)) {
+		return EQ::constants::GetLDoNThemeMap().find(theme_id)->second;
 	}

-	return EQ::constants::GetLDoNThemeMap().find(theme_id)->second;
+	return std::string();
 }

 const std::map<int8, std::string>& EQ::constants::GetFlyModeMap()
@@ -243,11 +243,11 @@ const std::map<int8, std::string>& EQ::constants::GetFlyModeMap()

 std::string EQ::constants::GetFlyModeName(int8 flymode_id)
 {
-	if (!EQ::ValueWithin(flymode_id, GravityBehavior::Ground, GravityBehavior::LevitateWhileRunning)) {
-		return std::string();
+	if (EQ::ValueWithin(flymode_id, GravityBehavior::Ground, GravityBehavior::LevitateWhileRunning)) {
+		return EQ::constants::GetFlyModeMap().find(flymode_id)->second;
 	}

-	return EQ::constants::GetFlyModeMap().find(flymode_id)->second;
+	return std::string();
 }

 const std::map<bodyType, std::string>& EQ::constants::GetBodyTypeMap()
@@ -365,11 +365,11 @@ const std::map<uint8, std::string>& EQ::constants::GetConsiderLevelMap()

 std::string EQ::constants::GetConsiderLevelName(uint8 faction_consider_level)
 {
-	if (!EQ::ValueWithin(faction_consider_level, ConsiderLevel::Ally, ConsiderLevel::Scowls)) {
-		return std::string();;
+	if (EQ::constants::GetConsiderLevelMap().find(faction_consider_level) != EQ::constants::GetConsiderLevelMap().end()) {
+		return EQ::constants::GetConsiderLevelMap().find(faction_consider_level)->second;
 	}

-	return EQ::constants::GetConsiderLevelMap().find(faction_consider_level)->second;
+	return std::string();
 }

 const std::map<uint8, std::string>& EQ::constants::GetEnvironmentalDamageMap()
@@ -386,11 +386,11 @@ const std::map<uint8, std::string>& EQ::constants::GetEnvironmentalDamageMap()

 std::string EQ::constants::GetEnvironmentalDamageName(uint8 damage_type)
 {
-	if (!EQ::ValueWithin(damage_type, EnvironmentalDamage::Lava, EnvironmentalDamage::Trap)) {
-		return std::string();
+	if (EQ::ValueWithin(damage_type, EnvironmentalDamage::Lava, EnvironmentalDamage::Trap)) {
+		return EQ::constants::GetEnvironmentalDamageMap().find(damage_type)->second;
 	}

-	return EQ::constants::GetEnvironmentalDamageMap().find(damage_type)->second;
+	return std::string();
 }

 const std::map<uint8, std::string>& EQ::constants::GetStuckBehaviorMap()
@@ -407,11 +407,11 @@ const std::map<uint8, std::string>& EQ::constants::GetStuckBehaviorMap()

 std::string EQ::constants::GetStuckBehaviorName(uint8 behavior_id)
 {
-	if (!EQ::ValueWithin(behavior_id, StuckBehavior::RunToTarget, StuckBehavior::EvadeCombat)) {
-		return std::string();
+	if (EQ::ValueWithin(behavior_id, StuckBehavior::RunToTarget, StuckBehavior::EvadeCombat)) {
+		return EQ::constants::GetStuckBehaviorMap().find(behavior_id)->second;
 	}

-	return EQ::constants::GetStuckBehaviorMap().find(behavior_id)->second;
+	return std::string();
 }

 const std::map<uint8, std::string>& EQ::constants::GetSpawnAnimationMap()
@@ -429,11 +429,11 @@ const std::map<uint8, std::string>& EQ::constants::GetSpawnAnimationMap()

 std::string EQ::constants::GetSpawnAnimationName(uint8 animation_id)
 {
-	if (!EQ::ValueWithin(animation_id, SpawnAnimations::Standing, SpawnAnimations::Looting)) {
-		return std::string();
+	if (EQ::ValueWithin(animation_id, SpawnAnimations::Standing, SpawnAnimations::Looting)) {
+		return EQ::constants::GetSpawnAnimationMap().find(animation_id)->second;
 	}

-	return EQ::constants::GetSpawnAnimationMap().find(animation_id)->second;
+	return std::string();
 }

 const std::map<int, std::string>& EQ::constants::GetObjectTypeMap()
@@ -507,12 +507,11 @@ const std::map<int, std::string>& EQ::constants::GetObjectTypeMap()

 std::string EQ::constants::GetObjectTypeName(int object_type)
 {
-	if (!EQ::ValueWithin(object_type, ObjectTypes::SmallBag, ObjectTypes::NoDeposit)) {
-		return std::string();
-
+	if (EQ::ValueWithin(object_type, ObjectTypes::SmallBag, ObjectTypes::NoDeposit)) {
+		return EQ::constants::GetObjectTypeMap().find(object_type)->second;
 	}

-	return EQ::constants::GetObjectTypeMap().find(object_type)->second;
+	return std::string();
 }

 const std::map<uint8, std::string> &EQ::constants::GetWeatherTypeMap()
@@ -528,11 +527,11 @@ const std::map<uint8, std::string> &EQ::constants::GetWeatherTypeMap()

 std::string EQ::constants::GetWeatherTypeName(uint8 weather_type)
 {
-	if (!EQ::ValueWithin(weather_type, WeatherTypes::None, WeatherTypes::Snowing)) {
-		return std::string();
+	if (EQ::ValueWithin(weather_type, WeatherTypes::None, WeatherTypes::Snowing)) {
+		return EQ::constants::GetWeatherTypeMap().find(weather_type)->second;
 	}

-	return EQ::constants::GetWeatherTypeMap().find(weather_type)->second;
+	return std::string();
 }

 const std::map<uint8, std::string> &EQ::constants::GetEmoteEventTypeMap()
@@ -554,11 +553,11 @@ const std::map<uint8, std::string> &EQ::constants::GetEmoteEventTypeMap()

 std::string EQ::constants::GetEmoteEventTypeName(uint8 emote_event_type)
 {
-	if (!EQ::ValueWithin(emote_event_type, EmoteEventTypes::LeaveCombat, EmoteEventTypes::OnDespawn)) {
-		return std::string();
+	if (EQ::ValueWithin(emote_event_type, EmoteEventTypes::LeaveCombat, EmoteEventTypes::OnDespawn)) {
+		return EQ::constants::GetEmoteEventTypeMap().find(emote_event_type)->second;
 	}

-	return EQ::constants::GetEmoteEventTypeMap().find(emote_event_type)->second;
+	return std::string();
 }

 const std::map<uint8, std::string> &EQ::constants::GetEmoteTypeMap()
@@ -574,9 +573,9 @@ const std::map<uint8, std::string> &EQ::constants::GetEmoteTypeMap()

 std::string EQ::constants::GetEmoteTypeName(uint8 emote_type)
 {
-	if (!EQ::ValueWithin(emote_type, EmoteTypes::Emote, EmoteTypes::Proximity)) {
-		return std::string();
+	if (EQ::ValueWithin(emote_type, EmoteTypes::Emote, EmoteTypes::Proximity)) {
+		return EQ::constants::GetEmoteTypeMap().find(emote_type)->second;
 	}

-	return EQ::constants::GetEmoteTypeMap().find(emote_type)->second;
+	return std::string();
 }
@@ -593,29 +593,4 @@ enum class ApplySpellType {
 	Raid
 };

-
-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*/
@@ -79,8 +79,6 @@
 #define	ANIM_DEATH		0x73
 #define ANIM_LOOT		0x69

-constexpr int16 RECAST_TYPE_UNLINKED_ITEM = -1;
-
 typedef enum {
 	eaStanding = 0,
 	eaSitting,		//1
@@ -1017,32 +1015,15 @@ enum Anonymity : uint8
 	Roleplaying
 };

-enum ZoningMessage : int8 {
-	ZoneNoMessage    = 0,
-	ZoneSuccess      = 1,
-	ZoneNotReady     = -1,
-	ZoneValidPC      = -2,
-	ZoneStoryZone    = -3,
-	ZoneNoExpansion  = -6,
+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
-};
-
 #endif /*COMMON_EQ_CONSTANTS_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,
@@ -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;
@@ -3632,19 +3632,17 @@ struct LevelAppearance_Struct { //Sends a little graphic on level up
 };

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

 struct TempMerchantList {
@@ -4547,7 +4545,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*/
 };

@@ -5522,11 +5520,7 @@ struct ServerLootItem_Struct {
 	uint32 aug_4;		  // uint32	aug_4;
 	uint32 aug_5;		  // uint32	aug_5;
 	uint32 aug_6;		  // uint32	aug_5;
-	bool attuned;
-	std::string custom_data;
-	uint32 ornamenticon {};
-	uint32 ornamentidfile {};
-	uint32 ornament_hero_model {};
+	uint8  attuned;
 	uint16 trivial_min_level;
 	uint16 trivial_max_level;
 	uint16 npc_min_level;
@@ -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;
 }

@@ -19,7 +19,6 @@
 #include "../common/global_define.h"
 #include "eqemu_config.h"
 #include "misc_functions.h"
-#include "strings.h"

 #include <iostream>
 #include <sstream>
@@ -34,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();
@@ -63,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();

@@ -86,15 +85,15 @@ void EQEmuConfig::parse_config()
 	Locked = false;
 	if (_root["server"]["world"].get("locked", "false").asString() == "true") { Locked = 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") {
@@ -109,9 +108,9 @@ void EQEmuConfig::parse_config()
 	 * UCS
 	 */
 	ChatHost = _root["server"]["chatserver"].get("host", "eqchat.eqemulator.net").asString();
-	ChatPort = Strings::ToUnsignedInt(_root["server"]["chatserver"].get("port", "7778").asString());
+	ChatPort = atoi(_root["server"]["chatserver"].get("port", "7778").asString().c_str());
 	MailHost = _root["server"]["mailserver"].get("host", "eqmail.eqemulator.net").asString();
-	MailPort = Strings::ToUnsignedInt(_root["server"]["mailserver"].get("port", "7778").asString());
+	MailPort = atoi(_root["server"]["mailserver"].get("port", "7778").asString().c_str());

 	/**
 	 * Database
@@ -119,7 +118,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();

 	/**
@@ -128,14 +127,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();
@@ -143,9 +142,9 @@ void EQEmuConfig::parse_config()
 	/**
 	 * Zones
 	 */
-	DefaultStatus = Strings::ToUnsignedInt(_root["server"]["zones"].get("defaultstatus", 0).asString());
-	ZonePortLow   = Strings::ToUnsignedInt(_root["server"]["zones"]["ports"].get("low", "7000").asString());
-	ZonePortHigh  = Strings::ToUnsignedInt(_root["server"]["zones"]["ports"].get("high", "7999").asString());
+	DefaultStatus = atoi(_root["server"]["zones"].get("defaultstatus", 0).asString().c_str());
+	ZonePortLow   = atoi(_root["server"]["zones"]["ports"].get("low", "7000").asString().c_str());
+	ZonePortHigh  = atoi(_root["server"]["zones"]["ports"].get("high", "7999").asString().c_str());

 	/**
 	 * Files
@@ -175,10 +174,10 @@ void EQEmuConfig::parse_config()
 	/**
 	 * Launcher
 	 */
-	RestartWait      = Strings::ToInt(_root["server"]["launcher"]["timers"].get("restart", "10000").asString());
-	TerminateWait    = Strings::ToInt(_root["server"]["launcher"]["timers"].get("reterminate", "10000").asString());
-	InitialBootWait  = Strings::ToInt(_root["server"]["launcher"]["timers"].get("initial", "20000").asString());
-	ZoneBootInterval = Strings::ToInt(_root["server"]["launcher"]["timers"].get("interval", "2000").asString());
+	RestartWait      = atoi(_root["server"]["launcher"]["timers"].get("restart", "10000").asString().c_str());
+	TerminateWait    = atoi(_root["server"]["launcher"]["timers"].get("reterminate", "10000").asString().c_str());
+	InitialBootWait  = atoi(_root["server"]["launcher"]["timers"].get("initial", "20000").asString().c_str());
+	ZoneBootInterval = atoi(_root["server"]["launcher"]["timers"].get("interval", "2000").asString().c_str());
 #ifdef WIN32
 	ZoneExe = _root["server"]["launcher"].get("exe", "zone.exe").asString();
 #else
@@ -22,19 +22,21 @@
 #include "rulesys.h"
 #include "platform.h"
 #include "strings.h"
+#include "misc.h"
+#include "discord/discord.h"
 #include "repositories/discord_webhooks_repository.h"
 #include "repositories/logsys_categories_repository.h"
-#include "termcolor/rang.hpp"

 #include <iostream>
+#include <fstream>
 #include <string>
+#include <iomanip>
 #include <time.h>
 #include <sys/stat.h>
+#include <algorithm>

 std::ofstream process_log;

-#include <filesystem>
-
 #ifdef _WINDOWS
 #include <direct.h>
 #include <conio.h>
@@ -50,12 +52,46 @@ std::ofstream process_log;

 #endif

+/**
+ * Linux ANSI console color defines
+ */
+#define LC_RESET   "\033[0m"
+#define LC_BLACK   "\033[30m" /* Black */
+#define LC_RED     "\033[31m" /* Red */
+#define LC_GREEN   "\033[32m" /* Green */
+#define LC_YELLOW  "\033[33m" /* Yellow */
+#define LC_BLUE    "\033[34m" /* Blue */
+#define LC_MAGENTA "\033[35m" /* Magenta */
+#define LC_CYAN    "\033[36m" /* Cyan */
+#define LC_WHITE   "\033[37m" /* White */
+
+namespace Console {
+	enum Color {
+		Black        = 0,
+		Blue         = 1,
+		Green        = 2,
+		Cyan         = 3,
+		Red          = 4,
+		Magenta      = 5,
+		Brown        = 6,
+		LightGray    = 7,
+		DarkGray     = 8,
+		LightBlue    = 9,
+		LightGreen   = 10,
+		LightCyan    = 11,
+		LightRed     = 12,
+		LightMagenta = 13,
+		Yellow       = 14,
+		White        = 15
+	};
+}
+
 /**
 * EQEmuLogSys Constructor
 */
 EQEmuLogSys::EQEmuLogSys()
 {
-	m_on_log_gmsay_hook   = [](uint16 log_type, const char *func, const std::string &) {};
+	m_on_log_gmsay_hook   = [](uint16 log_type, const std::string &) {};
 	m_on_log_console_hook = [](uint16 log_type, const std::string &) {};
 }

@@ -84,8 +120,14 @@ EQEmuLogSys *EQEmuLogSys::LoadLogSettingsDefaults()
 	/**
 	 * Set Defaults
 	 */
+	log_settings[Logs::WorldServer].log_to_console          = static_cast<uint8>(Logs::General);
+	log_settings[Logs::ZoneServer].log_to_console           = static_cast<uint8>(Logs::General);
+	log_settings[Logs::QSServer].log_to_console             = static_cast<uint8>(Logs::General);
+	log_settings[Logs::UCSServer].log_to_console            = static_cast<uint8>(Logs::General);
 	log_settings[Logs::Crash].log_to_console                = static_cast<uint8>(Logs::General);
 	log_settings[Logs::MySQLError].log_to_console           = static_cast<uint8>(Logs::General);
+	log_settings[Logs::Loginserver].log_to_console          = static_cast<uint8>(Logs::General);
+	log_settings[Logs::HeadlessClient].log_to_console       = static_cast<uint8>(Logs::General);
 	log_settings[Logs::NPCScaling].log_to_gmsay             = static_cast<uint8>(Logs::General);
 	log_settings[Logs::HotReload].log_to_gmsay              = static_cast<uint8>(Logs::General);
 	log_settings[Logs::HotReload].log_to_console            = static_cast<uint8>(Logs::General);
@@ -104,8 +146,12 @@ EQEmuLogSys *EQEmuLogSys::LoadLogSettingsDefaults()
 	/**
 	 * RFC 5424
 	 */
+	log_settings[Logs::Emergency].log_to_console = static_cast<uint8>(Logs::General);
+	log_settings[Logs::Alert].log_to_console     = static_cast<uint8>(Logs::General);
+	log_settings[Logs::Critical].log_to_console  = static_cast<uint8>(Logs::General);
 	log_settings[Logs::Error].log_to_console     = static_cast<uint8>(Logs::General);
 	log_settings[Logs::Warning].log_to_console   = static_cast<uint8>(Logs::General);
+	log_settings[Logs::Notice].log_to_console    = static_cast<uint8>(Logs::General);
 	log_settings[Logs::Info].log_to_console      = static_cast<uint8>(Logs::General);

 	/**
@@ -150,6 +196,24 @@ EQEmuLogSys *EQEmuLogSys::LoadLogSettingsDefaults()
 	return this;
 }

+/**
+ * @param log_category
+ * @return
+ */
+bool EQEmuLogSys::IsRfc5424LogCategory(uint16 log_category)
+{
+	return (
+		log_category == Logs::Emergency ||
+		log_category == Logs::Alert ||
+		log_category == Logs::Critical ||
+		log_category == Logs::Error ||
+		log_category == Logs::Warning ||
+		log_category == Logs::Notice ||
+		log_category == Logs::Info ||
+		log_category == Logs::Debug
+	);
+}
+
 /**
 * @param debug_level
 * @param log_category
@@ -180,6 +244,66 @@ void EQEmuLogSys::ProcessLogWrite(
 	}
 }

+/**
+ * @param log_category
+ * @return
+ */
+uint16 EQEmuLogSys::GetWindowsConsoleColorFromCategory(uint16 log_category)
+{
+	switch (log_category) {
+		case Logs::Status:
+		case Logs::Normal:
+			return Console::Color::Yellow;
+		case Logs::MySQLError:
+		case Logs::Error:
+		case Logs::QuestErrors:
+			return Console::Color::LightRed;
+		case Logs::MySQLQuery:
+		case Logs::Debug:
+			return Console::Color::LightGreen;
+		case Logs::Quests:
+			return Console::Color::LightCyan;
+		case Logs::Commands:
+		case Logs::Mercenaries:
+			return Console::Color::LightMagenta;
+		case Logs::Crash:
+			return Console::Color::LightRed;
+		default:
+			return Console::Color::Yellow;
+	}
+}
+
+/**
+ * @param log_category
+ * @return
+ */
+std::string EQEmuLogSys::GetLinuxConsoleColorFromCategory(uint16 log_category)
+{
+	switch (log_category) {
+		case Logs::Status:
+		case Logs::Normal:
+			return LC_YELLOW;
+		case Logs::MySQLError:
+		case Logs::QuestErrors:
+		case Logs::Warning:
+		case Logs::Critical:
+		case Logs::Error:
+			return LC_RED;
+		case Logs::MySQLQuery:
+		case Logs::Debug:
+			return LC_GREEN;
+		case Logs::Quests:
+			return LC_CYAN;
+		case Logs::Commands:
+		case Logs::Mercenaries:
+			return LC_MAGENTA;
+		case Logs::Crash:
+			return LC_RED;
+		default:
+			return LC_YELLOW;
+	}
+}
+
 /**
 * @param log_category
 * @return
@@ -187,10 +311,12 @@ void EQEmuLogSys::ProcessLogWrite(
 uint16 EQEmuLogSys::GetGMSayColorFromCategory(uint16 log_category)
 {
 	switch (log_category) {
-		case Logs::Crash:
-		case Logs::Error:
+		case Logs::Status:
+		case Logs::Normal:
+			return Chat::Yellow;
 		case Logs::MySQLError:
 		case Logs::QuestErrors:
+		case Logs::Error:
 			return Chat::Red;
 		case Logs::MySQLQuery:
 		case Logs::Debug:
@@ -200,149 +326,35 @@ uint16 EQEmuLogSys::GetGMSayColorFromCategory(uint16 log_category)
 		case Logs::Commands:
 		case Logs::Mercenaries:
 			return Chat::Magenta;
+		case Logs::Crash:
+			return Chat::Red;
 		default:
 			return Chat::Yellow;
 	}
 }

-
 /**
 * @param debug_level
 * @param log_category
 * @param message
 */
-void EQEmuLogSys::ProcessConsoleMessage(
-	uint16 log_category,
-	const std::string &message,
-	const char *file,
-	const char *func,
-	int line
-)
+void EQEmuLogSys::ProcessConsoleMessage(uint16 log_category, const std::string &message)
 {
-	bool is_error = (
-		log_category == Logs::LogCategory::Error ||
-		log_category == Logs::LogCategory::MySQLError ||
-		log_category == Logs::LogCategory::Crash ||
-		log_category == Logs::LogCategory::QuestErrors
-	);
-	bool is_warning = (
-		log_category == Logs::LogCategory::Warning
-	);
-
-	(!is_error ? std::cout : std::cerr)
-		<< ""
-		<< rang::fgB::black
-		<< rang::style::bold
-		<< fmt::format("{:>6}", GetPlatformName().substr(0, 6))
-		<< rang::style::reset
-		<< rang::fgB::gray
-		<< " | "
-		<< ((is_error || is_warning) ? rang::fgB::red : rang::fgB::gray)
-		<< rang::style::bold
-		<< fmt::format("{:^10}", fmt::format("{}", Logs::LogCategoryName[log_category]).substr(0, 10))
-		<< rang::style::reset
-		<< rang::fgB::gray
-		<< " | "
-		<< rang::fgB::gray
-		<< rang::style::bold
-		<< fmt::format("{}", func)
-		<< rang::style::reset
-		<< rang::fgB::gray
-		<< " ";
-
-	if (RuleB(Logging, PrintFileFunctionAndLine)) {
-		(!is_error ? std::cout : std::cerr)
-			<< ""
-			<< rang::fgB::green
-			<< rang::style::bold
-			<< fmt::format("{:}", fmt::format("{}:{}:{}", std::filesystem::path(file).filename().string(), func, line))
-			<< rang::style::reset
-			<< " | ";
-	}
-
-	if (log_category == Logs::LogCategory::MySQLQuery) {
-		auto        s     = Strings::Split(message, "--");
-		if (s.size() > 1) {
-			std::string query = Strings::Trim(s[0]);
-			std::string meta  = Strings::Trim(s[1]);
-
-			std::cout <<
-					  rang::fgB::green
-					  <<
-					  query
-					  <<
-					  rang::style::reset;
-
-			std::cout <<
-					  rang::fgB::black
-					  <<
-					  " -- "
-					  <<
-					  meta
-					  <<
-					  rang::style::reset;
-		}
-	}
-	else if (Strings::Contains(message, "[")) {
-		for (auto &e: Strings::Split(message, " ")) {
-			if (Strings::Contains(e, "[") && Strings::Contains(e, "]")) {
-				e = Strings::Replace(e, "[", "");
-				e = Strings::Replace(e, "]", "");
-
-				bool is_upper = false;
-
-				for (int i = 0; i < strlen(e.c_str()); i++) {
-					if (isupper(e[i])) {
-						is_upper = true;
-					}
-				}
-
-				if (!is_upper) {
-					(!is_error ? std::cout : std::cerr)
-						<< rang::fgB::gray
-						<< "["
-						<< rang::style::bold
-						<< rang::fgB::yellow
-						<< e
-						<< rang::fgB::gray
-						<< "] "
-						;
-				}
-				else {
-					(!is_error ? std::cout : std::cerr) << rang::fgB::gray << "[" << e << "] ";
-				}
-			}
-			else {
-				(!is_error ? std::cout : std::cerr)
-					<< (is_error ? rang::fgB::red : rang::fgB::gray)
-					<< e
-					<< " ";
-			}
-		}
-	}
-	else {
-		(!is_error ? std::cout : std::cerr)
-			<< (is_error ? rang::fgB::red : rang::fgB::gray)
-			<< message
-			<< " ";
-	}
-
-	if (!origination_info.zone_short_name.empty()) {
-		(!is_error ? std::cout : std::cerr)
-			<<
-			rang::fgB::black
-			<<
-			"-- "
-			<<
-			fmt::format(
-				"[{}] ({}) inst_id [{}]",
-				origination_info.zone_short_name,
-				origination_info.zone_long_name,
-				origination_info.instance_id
-			);
-	}
-
-	(!is_error ? std::cout : std::cerr) << rang::style::reset << std::endl;
+#ifdef _WINDOWS
+	HANDLE  console_handle;
+	console_handle = GetStdHandle(STD_OUTPUT_HANDLE);
+	CONSOLE_FONT_INFOEX info = { 0 };
+	info.cbSize = sizeof(info);
+	info.dwFontSize.Y = 12; // leave X as zero
+	info.FontWeight = FW_NORMAL;
+	wcscpy(info.FaceName, L"Lucida Console");
+	SetCurrentConsoleFontEx(console_handle, NULL, &info);
+	SetConsoleTextAttribute(console_handle, EQEmuLogSys::GetWindowsConsoleColorFromCategory(log_category));
+	std::cout << message << "\n";
+	SetConsoleTextAttribute(console_handle, Console::Color::White);
+#else
+	std::cout << EQEmuLogSys::GetLinuxConsoleColorFromCategory(log_category) << message << LC_RESET << std::endl;
+#endif

 	m_on_log_console_hook(log_category, message);
 }
@@ -356,6 +368,33 @@ constexpr const char *str_end(const char *str)
 	return *str ? str_end(str + 1) : str;
 }

+/**
+ * @param str
+ * @return
+ */
+constexpr bool str_slant(const char *str)
+{
+	return *str == '/' ? true : (*str ? str_slant(str + 1) : false);
+}
+
+/**
+ * @param str
+ * @return
+ */
+constexpr const char *r_slant(const char *str)
+{
+	return *str == '/' ? (str + 1) : r_slant(str - 1);
+}
+
+/**
+ * @param str
+ * @return
+ */
+constexpr const char *base_file_name(const char *str)
+{
+	return str_slant(str) ? r_slant(str_end(str)) : str;
+}
+
 /**
 * Core logging function
 *
@@ -383,7 +422,7 @@ void EQEmuLogSys::Out(

 	std::string prefix;
 	if (RuleB(Logging, PrintFileFunctionAndLine)) {
-		prefix = fmt::format("[{0}::{1}:{2}] ", std::filesystem::path(file).filename().string(), func, line);
+		prefix = fmt::format("[{0}::{1}:{2}] ", base_file_name(file), func, line);
 	}

 	// remove this when we remove all legacy logs
@@ -406,14 +445,11 @@ void EQEmuLogSys::Out(
 	if (l.log_to_console_enabled) {
 		EQEmuLogSys::ProcessConsoleMessage(
 			log_category,
-			output_message,
-			file,
-			func,
-			line
+			fmt::format("[{}] [{}] {}", GetPlatformName(), Logs::LogCategoryName[log_category], prefix + output_message)
 		);
 	}
 	if (l.log_to_gmsay_enabled) {
-		m_on_log_gmsay_hook(log_category, func, output_message);
+		m_on_log_gmsay_hook(log_category, output_message);
 	}
 	if (l.log_to_file_enabled) {
 		EQEmuLogSys::ProcessLogWrite(
@@ -527,8 +563,6 @@ void EQEmuLogSys::SilenceConsoleLogging()
 		log_settings[log_index].log_to_console      = 0;
 		log_settings[log_index].is_category_enabled = 0;
 	}
-
-	log_settings[Logs::Crash].log_to_console = static_cast<uint8>(Logs::General);
 }

 /**
@@ -633,11 +667,6 @@ EQEmuLogSys *EQEmuLogSys::LoadLogDatabaseSettings()
 		LogInfo("Loaded [{}] Discord webhooks", webhooks.size());
 	}

-	// force override this setting
-	log_settings[Logs::Crash].log_to_console = static_cast<uint8>(Logs::General);
-	log_settings[Logs::Crash].log_to_gmsay   = static_cast<uint8>(Logs::General);
-	log_settings[Logs::Crash].log_to_file    = static_cast<uint8>(Logs::General);
-
 	return this;
 }

@@ -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
+		DeprecatedCS,
 		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
-		WebInterfaceServer, // deprecated
-		WorldServer, // deprecated
-		ZoneServer, // deprecated
+		UCSServer,
+		WebInterfaceServer,
+		WorldServer,
+		ZoneServer,
 		MySQLError,
 		MySQLQuery,
 		Mercenaries,
 		QuestDebug,
-		DeprecatedSC, // deprecated
-		DeprecatedCSU, // deprecated
-		DeprecatedSCD, // deprecated
-		DeprecatedCSD, // deprecated
-		Loginserver, // deprecated
+		DeprecatedSC,
+		DeprecatedCSU,
+		DeprecatedSCD,
+		DeprecatedCSD,
+		Loginserver,
 		ClientLogin,
-		HeadlessClient, // deprecated
+		HeadlessClient,
 		HPUpdate,
 		FixZ,
 		Food,
@@ -103,10 +104,10 @@ namespace Logs {
 		MobAppearance,
 		Info,
 		Warning,
-		Critical, // deprecated
-		Emergency, // deprecated
-		Alert, // deprecated
-		Notice, // deprecated
+		Critical,
+		Emergency,
+		Alert,
+		Notice,
 		AIScanClose,
 		AIYellForHelp,
 		AICastBeneficialClose,
@@ -136,7 +137,6 @@ namespace Logs {
 		PacketServerToServer,
 		Bugs,
 		QuestErrors,
-		PlayerEvents,
 		MaxCategoryID /* Don't Remove this */
 	};

@@ -160,52 +160,52 @@ namespace Logs {
 		"Inventory",
 		"Launcher",
 		"Netcode",
-		"Normal (Deprecated)",
+		"Normal",
 		"Object",
 		"Pathing",
-		"QS Server (Deprecated)",
+		"QS Server",
 		"Quests",
 		"Rules",
 		"Skills",
 		"Spawns",
 		"Spells",
-		"Status (Deprecated)",
+		"Status",
 		"TCP Connection",
 		"Tasks",
 		"Tradeskills",
 		"Trading",
 		"Tribute",
-		"UCS Server (Deprecated)",
-		"Web Interface (Deprecated)",
-		"World Server (Deprecated)",
-		"Zone Server (Deprecated)",
-		"QueryErr",
-		"Query",
+		"UCS Server",
+		"WebInterface Server",
+		"World Server",
+		"Zone Server",
+		"MySQL Error",
+		"MySQL Query",
 		"Mercenaries",
 		"Quest Debug",
-		"Legacy Packet Logging (Deprecated)",
-		"Legacy Packet Logging (Deprecated)",
-		"Legacy Packet Logging (Deprecated)",
-		"Legacy Packet Logging (Deprecated)",
-		"Login Server (Deprecated)",
+		"Deprecated",
+		"Deprecated",
+		"Deprecated",
+		"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)",
-		"Emergency (Deprecated)",
-		"Alert (Deprecated)",
-		"Notice (Deprecated)",
-		"AI Scan",
-		"AI Yell",
-		"AI CastBeneficial",
+		"Critical",
+		"Emergency",
+		"Alert",
+		"Notice",
+		"AI Scan Close",
+		"AI Yell For Help",
+		"AI Cast Beneficial Close",
 		"AOE Cast",
 		"Entity Management",
 		"Flee",
@@ -222,17 +222,16 @@ namespace Logs {
 		"DialogueWindow",
 		"HTTP",
 		"Saylink",
-		"ChecksumVer",
+		"ChecksumVerification",
 		"CombatRecord",
 		"Hate",
 		"Discord",
 		"Faction",
-		"Packet S->C",
-		"Packet C->S",
-		"Packet S->S",
+		"Packet-S->C",
+		"Packet-C->S",
+		"Packet-S->S",
 		"Bugs",
-		"QuestErrors",
-		"PlayerEvents",
+		"QuestErrors"
 	};
 }

@@ -346,7 +345,7 @@ public:
 	// 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)
 	{
 		m_on_log_gmsay_hook = f;
 		return this;
@@ -377,24 +376,22 @@ public:
 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;
+	Database                                                                      *m_database;
+	std::function<void(uint16 log_category, 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(
-		uint16 log_category,
-		const std::string &message,
-		const char *file,
-		const char *func,
-		int line
-	);
+	std::string GetLinuxConsoleColorFromCategory(uint16 log_category);
+	uint16 GetWindowsConsoleColorFromCategory(uint16 log_category);
+
+	void ProcessConsoleMessage(uint16 log_category, const std::string &message);
 	void ProcessLogWrite(uint16 log_category, const std::string &message);
+	bool IsRfc5424LogCategory(uint16 log_category);
 	void InjectTablesIfNotExist();
 };

@@ -21,6 +21,8 @@
 #ifndef EQEMU_EQEMU_LOGSYS_LOG_ALIASES_H
 #define EQEMU_EQEMU_LOGSYS_LOG_ALIASES_H

+#ifdef BUILD_LOGGING
+
 #define LogAA(message, ...) do {\
    if (LogSys.IsLogEnabled(Logs::General, Logs::AA))\
        OutF(LogSys, Logs::General, Logs::AA, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
@@ -36,6 +38,11 @@
        OutF(LogSys, Logs::General, Logs::AI, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
 } while (0)

+#define LogAIModerate(message, ...) do {\
+    if (LogSys.IsLogEnabled(Logs::Moderate, Logs::AI))\
+        OutF(LogSys, Logs::Moderate, Logs::AI, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
 #define LogAIDetail(message, ...) do {\
    if (LogSys.IsLogEnabled(Logs::Detail, Logs::AI))\
        OutF(LogSys, Logs::Detail, Logs::AI, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
@@ -76,6 +83,11 @@
        OutF(LogSys, Logs::General, Logs::Combat, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
 } while (0)

+#define LogCombatModerate(message, ...) do {\
+    if (LogSys.IsLogEnabled(Logs::Moderate, Logs::Combat))\
+        OutF(LogSys, Logs::Moderate, Logs::Combat, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
 #define LogCombatDetail(message, ...) do {\
    if (LogSys.IsLogEnabled(Logs::Detail, Logs::Combat))\
        OutF(LogSys, Logs::Detail, Logs::Combat, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
@@ -201,6 +213,16 @@
        OutF(LogSys, Logs::Detail, Logs::Pathing, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
 } while (0)

+#define LogQSServer(message, ...) do {\
+    if (LogSys.IsLogEnabled(Logs::General, Logs::QSServer))\
+        OutF(LogSys, Logs::General, Logs::QSServer, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogQSServerDetail(message, ...) do {\
+    if (LogSys.IsLogEnabled(Logs::Detail, Logs::QSServer))\
+        OutF(LogSys, Logs::Detail, Logs::QSServer, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
 #define LogQuests(message, ...) do {\
    if (LogSys.IsLogEnabled(Logs::General, Logs::Quests))\
        OutF(LogSys, Logs::General, Logs::Quests, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
@@ -246,6 +268,11 @@
        OutF(LogSys, Logs::General, Logs::Spells, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
 } while (0)

+#define LogSpellsModerate(message, ...) do {\
+    if (LogSys.IsLogEnabled(Logs::Moderate, Logs::Spells))\
+        OutF(LogSys, Logs::Moderate, Logs::Spells, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
 #define LogSpellsDetail(message, ...) do {\
    if (LogSys.IsLogEnabled(Logs::Detail, Logs::Spells))\
        OutF(LogSys, Logs::Detail, Logs::Spells, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
@@ -311,6 +338,46 @@
        OutF(LogSys, Logs::Detail, Logs::Tribute, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
 } while (0)

+#define LogUCSServer(message, ...) do {\
+    if (LogSys.IsLogEnabled(Logs::General, Logs::UCSServer))\
+        OutF(LogSys, Logs::General, Logs::UCSServer, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogUCSServerDetail(message, ...) do {\
+    if (LogSys.IsLogEnabled(Logs::Detail, Logs::UCSServer))\
+        OutF(LogSys, Logs::Detail, Logs::UCSServer, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogWebInterfaceServer(message, ...) do {\
+    if (LogSys.IsLogEnabled(Logs::General, Logs::WebInterfaceServer))\
+        OutF(LogSys, Logs::General, Logs::WebInterfaceServer, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogWebInterfaceServerDetail(message, ...) do {\
+    if (LogSys.IsLogEnabled(Logs::Detail, Logs::WebInterfaceServer))\
+        OutF(LogSys, Logs::Detail, Logs::WebInterfaceServer, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogWorldServer(message, ...) do {\
+    if (LogSys.IsLogEnabled(Logs::General, Logs::WorldServer))\
+        OutF(LogSys, Logs::General, Logs::WorldServer, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogWorldServerDetail(message, ...) do {\
+    if (LogSys.IsLogEnabled(Logs::Detail, Logs::WorldServer))\
+        OutF(LogSys, Logs::Detail, Logs::WorldServer, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogZoneServer(message, ...) do {\
+    if (LogSys.IsLogEnabled(Logs::General, Logs::ZoneServer))\
+        OutF(LogSys, Logs::General, Logs::ZoneServer, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogZoneServerDetail(message, ...) do {\
+    if (LogSys.IsLogEnabled(Logs::Detail, Logs::ZoneServer))\
+        OutF(LogSys, Logs::Detail, Logs::ZoneServer, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
 #define LogMySQLError(message, ...) do {\
    if (LogSys.IsLogEnabled(Logs::General, Logs::MySQLError))\
        OutF(LogSys, Logs::General, Logs::MySQLError, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
@@ -382,6 +449,16 @@
        OutF(LogSys, Logs::Detail, Logs::ClientLogin, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
 } while (0)

+#define LogHeadlessClient(message, ...) do {\
+    if (LogSys.IsLogEnabled(Logs::General, Logs::HeadlessClient))\
+        OutF(LogSys, Logs::General, Logs::HeadlessClient, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogHeadlessClientDetail(message, ...) do {\
+    if (LogSys.IsLogEnabled(Logs::Detail, Logs::HeadlessClient))\
+        OutF(LogSys, Logs::Detail, Logs::HeadlessClient, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
 #define LogHPUpdate(message, ...) do {\
    if (LogSys.IsLogEnabled(Logs::General, Logs::HPUpdate))\
        OutF(LogSys, Logs::General, Logs::HPUpdate, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
@@ -517,6 +594,11 @@
        OutF(LogSys, Logs::General, Logs::AIScanClose, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
 } while (0)

+#define LogAIScanCloseModerate(message, ...) do {\
+    if (LogSys.IsLogEnabled(Logs::Moderate, Logs::AIScanClose))\
+        OutF(LogSys, Logs::Moderate, Logs::AIScanClose, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
 #define LogAIScanCloseDetail(message, ...) do {\
    if (LogSys.IsLogEnabled(Logs::Detail, Logs::AIScanClose))\
        OutF(LogSys, Logs::Detail, Logs::AIScanClose, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
@@ -764,6 +846,11 @@

 // manually created

+#define LogExpeditionsModerate(message, ...) do {\
+    if (LogSys.IsLogEnabled(Logs::Moderate, Logs::Expeditions))\
+        OutF(LogSys, Logs::Moderate, Logs::Expeditions, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
 #define LogBugs(message, ...) do {\
    if (LogSys.IsLogEnabled(Logs::General, Logs::Bugs))\
        OutF(LogSys, Logs::General, Logs::Bugs, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
@@ -784,16 +871,6 @@
        OutF(LogSys, Logs::Detail, Logs::QuestErrors, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
 } while (0)

-#define LogPlayerEvents(message, ...) do {\
-    if (LogSys.IsLogEnabled(Logs::General, Logs::PlayerEvents))\
-        OutF(LogSys, Logs::General, Logs::PlayerEvents, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
-} while (0)
-
-#define LogPlayerEventsDetail(message, ...) do {\
-    if (LogSys.IsLogEnabled(Logs::Detail, Logs::PlayerEvents))\
-        OutF(LogSys, Logs::Detail, Logs::PlayerEvents, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
-} while (0)
-
 #define Log(debug_level, log_category, message, ...) do {\
    if (LogSys.IsLogEnabled(debug_level, log_category))\
        LogSys.Out(debug_level, log_category, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
@@ -804,5 +881,469 @@
        OutF(LogSys, debug_level, log_category, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
 } while (0)

+#else
+#define LogEmergency(message, ...) do {\
+} while (0)
+
+#define LogAlert(message, ...) do {\
+} while (0)
+
+#define LogCritical(message, ...) do {\
+} while (0)
+
+#define LogError(message, ...) do {\
+} while (0)
+
+#define LogWarning(message, ...) do {\
+} while (0)
+
+#define LogNotice(message, ...) do {\
+} while (0)
+
+#define LogInfo(message, ...) do {\
+} while (0)
+
+#define LogDebug(message, ...) do {\
+} while (0)
+
+/**
+ * Category
+ */
+
+#define LogAA(message, ...) do {\
+} while (0)
+
+#define LogAADetail(message, ...) do {\
+} while (0)
+
+#define LogAI(message, ...) do {\
+} while (0)
+
+#define LogAIModerate(message, ...) do {\
+} while (0)
+
+#define LogAIDetail(message, ...) do {\
+} while (0)
+
+#define LogAggro(message, ...) do {\
+} while (0)
+
+#define LogAggroDetail(message, ...) do {\
+} while (0)
+
+#define LogAttack(message, ...) do {\
+} while (0)
+
+#define LogAttackDetail(message, ...) do {\
+} while (0)
+
+#define LogPacketClientServer(message, ...) do {\
+} while (0)
+
+#define LogPacketClientServerDetail(message, ...) do {\
+} while (0)
+
+#define LogCombat(message, ...) do {\
+} while (0)
+
+#define LogCombatModerate(message, ...) do {\
+} while (0)
+
+#define LogCombatDetail(message, ...) do {\
+} while (0)
+
+#define LogCommands(message, ...) do {\
+} while (0)
+
+#define LogCommandsDetail(message, ...) do {\
+} while (0)
+
+#define LogCrash(message, ...) do {\
+} while (0)
+
+#define LogCrashDetail(message, ...) do {\
+} while (0)
+
+#define LogDoors(message, ...) do {\
+} while (0)
+
+#define LogDoorsDetail(message, ...) do {\
+} while (0)
+
+#define LogGroup(message, ...) do {\
+} while (0)
+
+#define LogGroupDetail(message, ...) do {\
+} while (0)
+
+#define LogGuilds(message, ...) do {\
+} while (0)
+
+#define LogGuildsDetail(message, ...) do {\
+} while (0)
+
+#define LogInventory(message, ...) do {\
+} while (0)
+
+#define LogInventoryDetail(message, ...) do {\
+} while (0)
+
+#define LogLauncher(message, ...) do {\
+} while (0)
+
+#define LogLauncherDetail(message, ...) do {\
+} while (0)
+
+#define LogNetcode(message, ...) do {\
+} while (0)
+
+#define LogNetcodeDetail(message, ...) do {\
+} while (0)
+
+#define LogNormal(message, ...) do {\
+} while (0)
+
+#define LogNormalDetail(message, ...) do {\
+} while (0)
+
+#define LogObject(message, ...) do {\
+} while (0)
+
+#define LogObjectDetail(message, ...) do {\
+} while (0)
+
+#define LogPathing(message, ...) do {\
+} while (0)
+
+#define LogPathingDetail(message, ...) do {\
+} while (0)
+
+#define LogQSServer(message, ...) do {\
+} while (0)
+
+#define LogQSServerDetail(message, ...) do {\
+} while (0)
+
+#define LogQuests(message, ...) do {\
+} while (0)
+
+#define LogQuestsDetail(message, ...) do {\
+} while (0)
+
+#define LogRules(message, ...) do {\
+} while (0)
+
+#define LogRulesDetail(message, ...) do {\
+} while (0)
+
+#define LogSkills(message, ...) do {\
+} while (0)
+
+#define LogSkillsDetail(message, ...) do {\
+} while (0)
+
+#define LogSpawns(message, ...) do {\
+} while (0)
+
+#define LogSpawnsDetail(message, ...) do {\
+} while (0)
+
+#define LogSpells(message, ...) do {\
+} while (0)
+
+#define LogSpellsModerate(message, ...) do {\
+} while (0)
+
+#define LogSpellsDetail(message, ...) do {\
+} while (0)
+
+#define LogTCPConnection(message, ...) do {\
+} while (0)
+
+#define LogTCPConnectionDetail(message, ...) do {\
+} while (0)
+
+#define LogTasks(message, ...) do {\
+} while (0)
+
+#define LogTasksDetail(message, ...) do {\
+} while (0)
+
+#define LogTradeskills(message, ...) do {\
+} while (0)
+
+#define LogTradeskillsDetail(message, ...) do {\
+} while (0)
+
+#define LogTrading(message, ...) do {\
+} while (0)
+
+#define LogTradingDetail(message, ...) do {\
+} while (0)
+
+#define LogTribute(message, ...) do {\
+} while (0)
+
+#define LogTributeDetail(message, ...) do {\
+} while (0)
+
+#define LogMySQLError(message, ...) do {\
+} while (0)
+
+#define LogMySQLErrorDetail(message, ...) do {\
+} while (0)
+
+#define LogMySQLQuery(message, ...) do {\
+} while (0)
+
+#define LogMySQLQueryDetail(message, ...) do {\
+} while (0)
+
+#define LogMercenaries(message, ...) do {\
+} while (0)
+
+#define LogMercenariesDetail(message, ...) do {\
+} while (0)
+
+#define LogQuestDebug(message, ...) do {\
+} while (0)
+
+#define LogQuestDebugDetail(message, ...) do {\
+} while (0)
+
+#define LogLoginserver(message, ...) do {\
+} while (0)
+
+#define LogLoginserverDetail(message, ...) do {\
+} while (0)
+
+#define LogClientLogin(message, ...) do {\
+} while (0)
+
+#define LogClientLoginDetail(message, ...) do {\
+} while (0)
+
+#define LogHeadlessClient(message, ...) do {\
+} while (0)
+
+#define LogHeadlessClientDetail(message, ...) do {\
+} while (0)
+
+#define LogHPUpdate(message, ...) do {\
+} while (0)
+
+#define LogHPUpdateDetail(message, ...) do {\
+} while (0)
+
+#define LogFixZ(message, ...) do {\
+} while (0)
+
+#define LogFixZDetail(message, ...) do {\
+} while (0)
+
+#define LogFood(message, ...) do {\
+} while (0)
+
+#define LogFoodDetail(message, ...) do {\
+} while (0)
+
+#define LogTraps(message, ...) do {\
+} while (0)
+
+#define LogTrapsDetail(message, ...) do {\
+} while (0)
+
+#define LogNPCRoamBox(message, ...) do {\
+} while (0)
+
+#define LogNPCRoamBoxDetail(message, ...) do {\
+} while (0)
+
+#define LogNPCScaling(message, ...) do {\
+} while (0)
+
+#define LogNPCScalingDetail(message, ...) do {\
+} while (0)
+
+#define LogMobAppearance(message, ...) do {\
+} while (0)
+
+#define LogMobAppearanceDetail(message, ...) do {\
+} while (0)
+
+#define LogStatus(message, ...) do {\
+} while (0)
+
+#define LogStatusDetail(message, ...) do {\
+} while (0)
+
+#define LogAIScanClose(message, ...) do {\
+} while (0)
+
+#define LogAIScanCloseModerate(message, ...) do {\
+} while (0)
+
+#define LogAIScanCloseDetail(message, ...) do {\
+} while (0)
+
+#define LogAIYellForHelp(message, ...) do {\
+} while (0)
+
+#define LogAIYellForHelpDetail(message, ...) do {\
+} while (0)
+
+#define LogAICastBeneficialClose(message, ...) do {\
+} while (0)
+
+#define LogAICastBeneficialCloseDetail(message, ...) do {\
+} while (0)
+
+#define LogAoeCast(message, ...) do {\
+} while (0)
+
+#define LogAoeCastDetail(message, ...) do {\
+} while (0)
+
+#define LogEntityManagement(message, ...) do {\
+} while (0)
+
+#define LogEntityManagementDetail(message, ...) do {\
+} while (0)
+
+#define LogFlee(message, ...) do {\
+} while (0)
+
+#define LogFleeDetail(message, ...) do {\
+} while (0)
+
+#define LogAura(message, ...) do {\
+} while (0)
+
+#define LogAuraDetail(message, ...) do {\
+} while (0)
+
+#define LogHotReload(message, ...) do {\
+} while (0)
+
+#define LogHotReloadDetail(message, ...) do {\
+} while (0)
+
+#define LogMerchants(message, ...) do {\
+} while (0)
+
+#define LogMerchantsDetail(message, ...) do {\
+} while (0)
+
+#define LogZonePoints(message, ...) do {\
+} while (0)
+
+#define LogZonePointsDetail(message, ...) do {\
+} while (0)
+
+#define LogExpeditions(message, ...) do {\
+} while (0)
+
+#define LogExpeditionsModerate(message, ...) do {\
+} while (0)
+
+#define LogExpeditionsDetail(message, ...) do {\
+} while (0)
+
+#define LogDynamicZones(message, ...) do {\
+} while (0)
+
+#define LogDynamicZonesDetail(message, ...) do {\
+} while (0)
+
+#define LogCheatList(message, ...) do {\
+} while (0)
+
+#define LogCheatDetail(message, ...) do {\
+} while (0)
+
+#define LogClientList(message, ...) do {\
+} while (0)
+
+#define LogClientListDetail(message, ...) do {\
+} while (0)
+
+#define LogDiaWind(message, ...) do {\
+} while (0)
+
+#define LogDiaWindDetail(message, ...) do {\
+} while (0)
+
+#define LogHTTP(message, ...) do {\
+} while (0)
+
+#define LogHTTPDetail(message, ...) do {\
+} while (0)
+
+#define LogSaylink(message, ...) do {\
+} while (0)
+
+#define LogSaylinkDetail(message, ...) do {\
+} while (0)
+
+#define LogScheduler(message, ...) do {\
+} while (0)
+
+#define LogSchedulerDetail(message, ...) do {\
+} while (0)
+
+#define LogCheat(message, ...) do {\
+} while (0)
+
+#define LogCheatDetail(message, ...) do {\
+} while (0)
+
+#define LogLoot(message, ...) do {\
+} while (0)
+
+#define LogLootDetail(message, ...) do {\
+} while (0)
+
+#define LogFood(message, ...) do {\
+} while (0)
+
+#define LogFoodDetail(message, ...) do {\
+} while (0)
+
+#define LogChecksumVerification(message, ...) do {\
+} while (0)
+
+#define LogChecksumVerificationDetail(message, ...) do {\
+} while (0)
+
+#define LogCombatRecord(message, ...) do {\
+} while (0)
+
+#define LogCombatRecordDetail(message, ...) do {\
+} while (0)
+
+#define LogHate(message, ...) do {\
+} while (0)
+
+#define LogHateDetail(message, ...) do {\
+} while (0)
+
+#define LogFaction(message, ...) do {\
+} while (0)
+
+#define LogFactionDetail(message, ...) do {\
+} while (0)
+
+#define LogBugs(message, ...) do {\
+} while (0)
+
+#define LogBugsDetail(message, ...) do {\
+} while (0)
+
+#define Log(debug_level, log_category, message, ...) do {\
+} while (0)
+
+#define LogF(debug_level, log_category, message, ...) do {\
+} while (0)
+#endif

 #endif //EQEMU_EQEMU_LOGSYS_LOG_ALIASES_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)));
 				}
 			}
 			
@@ -1,214 +0,0 @@
-#ifndef EQEMU_PLAYER_EVENT_DISCORD_FORMATTER_H
-#define EQEMU_PLAYER_EVENT_DISCORD_FORMATTER_H
-
-#include <string>
-#include "player_events.h"
-#include "../repositories/base/base_player_event_logs_repository.h"
-#include <cereal/archives/json.hpp>
-#include <cereal/types/vector.hpp>
-
-struct DiscordField {
-	std::string name;
-	std::string value;
-	bool        is_inline;
-
-	// cereal
-	template<class Archive>
-	void serialize(Archive &ar)
-	{
-		ar(
-			CEREAL_NVP(name),
-			CEREAL_NVP(value),
-			cereal::make_nvp("inline", is_inline)
-		);
-	}
-};
-
-struct DiscordAuthor {
-	std::string name;
-	std::string icon_url;
-	std::string url;
-
-	// cereal
-	template<class Archive>
-	void serialize(Archive &ar)
-	{
-		ar(
-			CEREAL_NVP(name),
-			CEREAL_NVP(icon_url),
-			CEREAL_NVP(url)
-		);
-	}
-};
-
-struct DiscordEmbed {
-	std::vector<DiscordField> fields;
-	std::string               title;
-	std::string               description;
-	std::string               timestamp;
-	DiscordAuthor             author;
-
-
-	// cereal
-	template<class Archive>
-	void serialize(Archive &ar)
-	{
-		ar(
-			CEREAL_NVP(fields),
-			CEREAL_NVP(title),
-			CEREAL_NVP(description),
-			CEREAL_NVP(timestamp),
-			CEREAL_NVP(author)
-		);
-	}
-};
-
-struct DiscordWebhook {
-	std::vector<DiscordEmbed> embeds;
-	std::string               content;
-	std::string               avatar_url;
-
-	// cereal
-	template<class Archive>
-	void serialize(Archive &ar)
-	{
-		ar(
-			CEREAL_NVP(embeds),
-			CEREAL_NVP(avatar_url),
-			CEREAL_NVP(content)
-		);
-	}
-};
-
-
-class PlayerEventDiscordFormatter {
-public:
-	static std::string GetCurrentTimestamp();
-	static std::string FormatEventSay(const PlayerEvent::PlayerEventContainer &c, const PlayerEvent::SayEvent &e);
-	static std::string
-	FormatGMCommand(const PlayerEvent::PlayerEventContainer &c, const PlayerEvent::GMCommandEvent &e);
-	static void BuildDiscordField(
-		std::vector<DiscordField> *f,
-		const std::string &name,
-		const std::string &value,
-		bool is_inline = true
-	);
-	static void BuildBaseEmbed(
-		std::vector<DiscordEmbed> *e,
-		const std::vector<DiscordField> &f,
-		PlayerEvent::PlayerEventContainer c
-	);
-	static std::string FormatWithNodata(const PlayerEvent::PlayerEventContainer &c);
-
-	static std::string FormatAAGainedEvent(
-		const PlayerEvent::PlayerEventContainer &c,
-		const PlayerEvent::AAGainedEvent &e
-	);
-	static std::string FormatAAPurchasedEvent(
-		const PlayerEvent::PlayerEventContainer &c,
-		const PlayerEvent::AAPurchasedEvent &e
-	);
-	static std::string FormatDeathEvent(
-		const PlayerEvent::PlayerEventContainer &c,
-		const PlayerEvent::DeathEvent &e
-	);
-	static std::string FormatFishSuccessEvent(
-		const PlayerEvent::PlayerEventContainer &c,
-		const PlayerEvent::FishSuccessEvent &e
-	);
-	static std::string FormatForageSuccessEvent(
-		const PlayerEvent::PlayerEventContainer &c,
-		const PlayerEvent::ForageSuccessEvent &e
-	);
-	static std::string FormatDestroyItemEvent(
-		const PlayerEvent::PlayerEventContainer &c,
-		const PlayerEvent::DestroyItemEvent &e
-	);
-	static std::string FormatDiscoverItemEvent(
-		const PlayerEvent::PlayerEventContainer &c,
-		const PlayerEvent::DiscoverItemEvent &e
-	);
-	static std::string FormatDroppedItemEvent(
-		const PlayerEvent::PlayerEventContainer &c,
-		const PlayerEvent::DroppedItemEvent &e
-	);
-	static std::string FormatLevelGainedEvent(
-		const PlayerEvent::PlayerEventContainer &c,
-		const PlayerEvent::LevelGainedEvent &e
-	);
-	static std::string FormatLevelLostEvent(
-		const PlayerEvent::PlayerEventContainer &c,
-		const PlayerEvent::LevelLostEvent &e
-	);
-	static std::string FormatLootItemEvent(
-		const PlayerEvent::PlayerEventContainer &c,
-		const PlayerEvent::LootItemEvent &e
-	);
-	static std::string FormatGroundSpawnPickupEvent(
-		const PlayerEvent::PlayerEventContainer &c,
-		const PlayerEvent::GroundSpawnPickupEvent &e
-	);
-	static std::string FormatMerchantPurchaseEvent(
-		const PlayerEvent::PlayerEventContainer &c,
-		const PlayerEvent::MerchantPurchaseEvent &e
-	);
-	static std::string FormatMerchantSellEvent(
-		const PlayerEvent::PlayerEventContainer &c,
-		const PlayerEvent::MerchantSellEvent &e
-	);
-	static std::string FormatNPCHandinEvent(
-		const PlayerEvent::PlayerEventContainer &c,
-		const PlayerEvent::HandinEvent &e
-	);
-	static std::string FormatSkillUpEvent(
-		const PlayerEvent::PlayerEventContainer &c,
-		const PlayerEvent::SkillUpEvent &e
-	);
-	static std::string FormatTaskAcceptEvent(
-		const PlayerEvent::PlayerEventContainer &c,
-		const PlayerEvent::TaskAcceptEvent &e
-	);
-	static std::string FormatTaskCompleteEvent(
-		const PlayerEvent::PlayerEventContainer &c,
-		const PlayerEvent::TaskCompleteEvent &e
-	);
-	static std::string FormatTaskUpdateEvent(
-		const PlayerEvent::PlayerEventContainer &c,
-		const PlayerEvent::TaskUpdateEvent &e
-	);
-	static std::string FormatTradeEvent(
-		const PlayerEvent::PlayerEventContainer &c,
-		const PlayerEvent::TradeEvent &e
-	);
-	static std::string FormatTraderPurchaseEvent(
-		const PlayerEvent::PlayerEventContainer &c,
-		const PlayerEvent::TraderPurchaseEvent &e
-	);
-	static std::string FormatTraderSellEvent(
-		const PlayerEvent::PlayerEventContainer &c,
-		const PlayerEvent::TraderSellEvent &e
-	);
-	static std::string FormatResurrectAcceptEvent(
-		const PlayerEvent::PlayerEventContainer &c,
-		const PlayerEvent::ResurrectAcceptEvent &e
-	);
-	static std::string FormatSplitMoneyEvent(
-		const PlayerEvent::PlayerEventContainer &c,
-		const PlayerEvent::SplitMoneyEvent &e
-	);
-	static std::string FormatCombineEvent(
-		const PlayerEvent::PlayerEventContainer &c,
-		const PlayerEvent::CombineEvent &e
-	);
-	static std::string FormatZoningEvent(
-		const PlayerEvent::PlayerEventContainer &c,
-		const PlayerEvent::ZoningEvent &e
-	);
-	static DiscordWebhook BuildDiscordWebhook(
-		const PlayerEvent::PlayerEventContainer &p,
-		std::vector<DiscordEmbed> &embeds
-	);
-};
-
-
-#endif //EQEMU_PLAYER_EVENT_DISCORD_FORMATTER_H
@@ -1,708 +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);
-	}
-
-	// 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;
-			PlayerEventLogSettingsRepository::InsertOne(*m_database, c);
-		}
-	}
-
-	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: {
-			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_FAILURE: {
-			payload = PlayerEventDiscordFormatter::FormatWithNodata(e);
-			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::WENT_ONLINE:
-		case PlayerEvent::WENT_OFFLINE: {
-			payload = PlayerEventDiscordFormatter::FormatWithNodata(e);
-			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()
-{
-	LogInfo("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;
-
-	for (int i = PlayerEvent::GM_COMMAND; i != PlayerEvent::MAX; i++) {
-		m_settings[i].retention_days = RETENTION_DAYS_DEFAULT;
-	}
-}
@@ -1,85 +0,0 @@
-#ifndef EQEMU_PLAYER_EVENT_LOGS_H
-#define EQEMU_PLAYER_EVENT_LOGS_H
-
-#include "../repositories/player_event_log_settings_repository.h"
-#include "player_events.h"
-#include "../servertalk.h"
-#include "../repositories/player_event_logs_repository.h"
-#include "../timer.h"
-#include "../json/json_archive_single_line.h"
-#include <cereal/archives/json.hpp>
-#include <mutex>
-
-class PlayerEventLogs {
-public:
-	void Init();
-	void ReloadSettings();
-	PlayerEventLogs *SetDatabase(Database *db);
-	bool ValidateDatabaseConnection();
-	bool IsEventEnabled(PlayerEvent::EventType event);
-
-	void Process();
-
-	// batch queue
-	void AddToQueue(const PlayerEventLogsRepository::PlayerEventLogs &logs);
-
-	// main event record generic function
-	// can ingest any struct event types
-	template<typename T>
-	std::unique_ptr<ServerPacket> RecordEvent(
-		PlayerEvent::EventType t,
-		const PlayerEvent::PlayerEvent &p,
-		T e
-	)
-	{
-		auto n = PlayerEventLogsRepository::NewEntity();
-		FillPlayerEvent(p, n);
-		n.event_type_id = t;
-
-		std::stringstream ss;
-		{
-			cereal::JSONOutputArchiveSingleLine ar(ss);
-			e.serialize(ar);
-		}
-
-		n.event_type_name = PlayerEvent::EventName[t];
-		n.event_data      = Strings::Contains(ss.str(), "noop") ? "{}" : ss.str();
-		n.created_at      = std::time(nullptr);
-
-		auto c = PlayerEvent::PlayerEventContainer{
-			.player_event = p,
-			.player_event_log = n
-		};
-
-		return BuildPlayerEventPacket(c);
-	}
-
-	[[nodiscard]] const PlayerEventLogSettingsRepository::PlayerEventLogSettings *GetSettings() const;
-	bool IsEventDiscordEnabled(int32_t event_type_id);
-	std::string GetDiscordWebhookUrlFromEventType(int32_t event_type_id);
-
-	static std::string GetDiscordPayloadFromEvent(const PlayerEvent::PlayerEventContainer &e);
-private:
-	Database                                                 *m_database; // reference to database
-	PlayerEventLogSettingsRepository::PlayerEventLogSettings m_settings[PlayerEvent::EventType::MAX]{};
-
-	// batch queue is used to record events in batch
-	std::vector<PlayerEventLogsRepository::PlayerEventLogs> m_record_batch_queue{};
-	static void FillPlayerEvent(const PlayerEvent::PlayerEvent &p, PlayerEventLogsRepository::PlayerEventLogs &n);
-	static std::unique_ptr<ServerPacket>
-	BuildPlayerEventPacket(const PlayerEvent::PlayerEventContainer &e);
-
-	// timers
-	Timer m_process_batch_events_timer; // events processing timer
-	Timer m_process_retention_truncation_timer; // timer for truncating events based on retention settings
-
-	// processing
-	std::mutex m_batch_queue_lock{};
-	void ProcessBatchQueue();
-	void ProcessRetentionTruncation();
-	void SetSettingsDefaults();
-};
-
-extern PlayerEventLogs player_event_logs;
-
-#endif //EQEMU_PLAYER_EVENT_LOGS_H
@@ -1,971 +0,0 @@
-#ifndef EQEMU_PLAYER_EVENTS_H
-#define EQEMU_PLAYER_EVENTS_H
-
-#include <string>
-#include <cereal/cereal.hpp>
-#include "../types.h"
-#include "../repositories/player_event_logs_repository.h"
-
-namespace PlayerEvent {
-
-	enum EventType {
-		GM_COMMAND = 1,
-		ZONING,
-		AA_GAIN,
-		AA_PURCHASE,
-		FORAGE_SUCCESS,
-		FORAGE_FAILURE,
-		FISH_SUCCESS,
-		FISH_FAILURE,
-		ITEM_DESTROY,
-		WENT_ONLINE,
-		WENT_OFFLINE,
-		LEVEL_GAIN,
-		LEVEL_LOSS,
-		LOOT_ITEM,
-		MERCHANT_PURCHASE,
-		MERCHANT_SELL,
-		GROUP_JOIN, // unimplemented
-		GROUP_LEAVE, // unimplemented
-		RAID_JOIN, // unimplemented
-		RAID_LEAVE, // unimplemented
-		GROUNDSPAWN_PICKUP,
-		NPC_HANDIN,
-		SKILL_UP,
-		TASK_ACCEPT,
-		TASK_UPDATE,
-		TASK_COMPLETE,
-		TRADE,
-		GIVE_ITEM, // unimplemented
-		SAY,
-		REZ_ACCEPTED,
-		DEATH,
-		COMBINE_FAILURE,
-		COMBINE_SUCCESS,
-		DROPPED_ITEM,
-		SPLIT_MONEY,
-		DZ_JOIN, // unimplemented
-		DZ_LEAVE, // unimplemented
-		TRADER_PURCHASE,
-		TRADER_SELL,
-		BANDOLIER_CREATE, // unimplemented
-		BANDOLIER_SWAP, // unimplemented
-		DISCOVER_ITEM,
-		POSSIBLE_HACK,
-		KILLED_NPC,
-		KILLED_NAMED_NPC,
-		KILLED_RAID_NPC,
-		ITEM_CREATION,
-		MAX // dont remove
-	};
-
-	// Don't ever remove items, even if they are deprecated
-	// If event is deprecated just tag (Deprecated) in the name
-	// If event is unimplemented just tag (Unimplemented) in the name
-	// Events don't get saved to the database if unimplemented or deprecated
-	// Events tagged as deprecated will get automatically removed
-	static const char *EventName[PlayerEvent::MAX] = {
-		"None",
-		"GM Command",
-		"Zoning",
-		"AA Gain",
-		"AA Purchase",
-		"Forage Success",
-		"Forage Failure",
-		"Fish Success",
-		"Fish Failure",
-		"Item Destroy",
-		"Went Online",
-		"Went Offline",
-		"Level Gain",
-		"Level Loss",
-		"Loot Item",
-		"Merchant Purchase",
-		"Merchant Sell",
-		"Group Join (Unimplemented)",
-		"Group Leave (Unimplemented)",
-		"Raid Join (Unimplemented)",
-		"Raid Leave (Unimplemented)",
-		"Groundspawn Pickup",
-		"NPC Handin",
-		"Skill Up",
-		"Task Accept",
-		"Task Update",
-		"Task Complete",
-		"Trade",
-		"Given Item (Unimplemented)",
-		"Say",
-		"Rez Accepted",
-		"Death",
-		"Combine Failure",
-		"Combine Success",
-		"Dropped Item",
-		"Split Money",
-		"DZ Join (Unimplemented)",
-		"DZ Leave (Unimplemented)",
-		"Trader Purchase",
-		"Trader Sell",
-		"Bandolier Create (Unimplemented)",
-		"Bandolier Swap (Unimplemented)",
-		"Discover Item",
-		"Possible Hack",
-		"Killed NPC",
-		"Killed Named NPC",
-		"Killed Raid NPC",
-		"Item Creation"
-	};
-
-	// Generic struct used by all events
-	struct PlayerEvent {
-		int64       account_id;
-		std::string account_name;
-		int64       character_id;
-		std::string character_name;
-		int64       guild_id;
-		std::string guild_name;
-		int         zone_id;
-		std::string zone_short_name;
-		std::string zone_long_name;
-		int         instance_id;
-		float       x;
-		float       y;
-		float       z;
-		float       heading;
-
-		// cereal
-		template<class Archive>
-		void serialize(Archive &ar)
-		{
-			ar(
-				CEREAL_NVP(account_id),
-				CEREAL_NVP(account_name),
-				CEREAL_NVP(character_id),
-				CEREAL_NVP(character_name),
-				CEREAL_NVP(guild_id),
-				CEREAL_NVP(guild_name),
-				CEREAL_NVP(zone_id),
-				CEREAL_NVP(zone_short_name),
-				CEREAL_NVP(zone_long_name),
-				CEREAL_NVP(instance_id),
-				CEREAL_NVP(x),
-				CEREAL_NVP(y),
-				CEREAL_NVP(z),
-				CEREAL_NVP(heading)
-			);
-		}
-	};
-
-	// contains metadata in use for things like log/discord formatters
-	// along with the actual event to be persisted
-	struct PlayerEventContainer {
-		PlayerEvent                                player_event;
-		PlayerEventLogsRepository::PlayerEventLogs player_event_log;
-
-		// cereal
-		template<class Archive>
-		void serialize(Archive &ar)
-		{
-			ar(
-				CEREAL_NVP(player_event),
-				CEREAL_NVP(player_event_log)
-			);
-		}
-	};
-
-	// used in events with no extra data
-	struct EmptyEvent {
-		std::string noop; // noop, gets discard upstream
-
-		// cereal
-		template<class Archive>
-		void serialize(Archive &ar)
-		{
-			ar(
-				CEREAL_NVP(noop)
-			);
-		}
-	};
-
-	// used in Trade event
-	struct ItemCreationEvent {
-		int64       item_id;
-		std::string item_name;
-		uint16      to_slot;
-		int16       charges;
-		uint32      aug1;
-		uint32      aug2;
-		uint32      aug3;
-		uint32      aug4;
-		uint32      aug5;
-		uint32      aug6;
-		bool        attuned;
-
-		// cereal
-		template<class Archive>
-		void serialize(Archive &ar)
-		{
-			ar(
-				CEREAL_NVP(item_id),
-				CEREAL_NVP(item_name),
-				CEREAL_NVP(to_slot),
-				CEREAL_NVP(charges),
-				CEREAL_NVP(aug1),
-				CEREAL_NVP(aug2),
-				CEREAL_NVP(aug3),
-				CEREAL_NVP(aug4),
-				CEREAL_NVP(aug5),
-				CEREAL_NVP(aug6),
-				CEREAL_NVP(attuned)
-			);
-		}
-	};
-
-	// used in Trade event
-	struct TradeItem {
-		int64       item_id;
-		std::string item_name;
-		int32       slot;
-
-		// cereal
-		template<class Archive>
-		void serialize(Archive &ar)
-		{
-			ar(
-				CEREAL_NVP(item_id),
-				CEREAL_NVP(item_name),
-				CEREAL_NVP(slot)
-			);
-		}
-	};
-
-	// used in Trade event
-	class TradeItemEntry {
-	public:
-		uint16      slot;
-		uint32      item_id;
-		std::string item_name;
-		uint16      charges;
-		uint32      aug_1_item_id;
-		std::string aug_1_item_name;
-		uint32      aug_2_item_id;
-		std::string aug_2_item_name;
-		uint32      aug_3_item_id;
-		std::string aug_3_item_name;
-		uint32      aug_4_item_id;
-		std::string aug_4_item_name;
-		uint32      aug_5_item_id;
-		std::string aug_5_item_name;
-		uint32      aug_6_item_id;
-		std::string aug_6_item_name;
-		bool        in_bag;
-
-		// cereal
-		template<class Archive>
-		void serialize(Archive &ar)
-		{
-			ar(
-				CEREAL_NVP(slot),
-				CEREAL_NVP(item_id),
-				CEREAL_NVP(charges),
-				CEREAL_NVP(aug_1_item_id),
-				CEREAL_NVP(aug_2_item_id),
-				CEREAL_NVP(aug_3_item_id),
-				CEREAL_NVP(aug_4_item_id),
-				CEREAL_NVP(aug_5_item_id),
-				CEREAL_NVP(in_bag)
-			);
-		}
-	};
-
-	/**
-	 * Events
-	 */
-	struct Money {
-		int32 platinum;
-		int32 gold;
-		int32 silver;
-		int32 copper;
-
-		// cereal
-		template<class Archive>
-		void serialize(Archive &ar)
-		{
-			ar(
-				CEREAL_NVP(platinum),
-				CEREAL_NVP(gold),
-				CEREAL_NVP(silver),
-				CEREAL_NVP(copper)
-			);
-		}
-	};
-
-	struct TradeEvent {
-		uint32                      character_1_id;
-		std::string                 character_1_name;
-		uint32                      character_2_id;
-		std::string                 character_2_name;
-		Money                       character_1_give_money;
-		Money                       character_2_give_money;
-		std::vector<TradeItemEntry> character_1_give_items;
-		std::vector<TradeItemEntry> character_2_give_items;
-
-		// cereal
-		template<class Archive>
-		void serialize(Archive &ar)
-		{
-			ar(
-				CEREAL_NVP(character_1_id),
-				CEREAL_NVP(character_1_name),
-				CEREAL_NVP(character_2_id),
-				CEREAL_NVP(character_2_name),
-				CEREAL_NVP(character_1_give_money),
-				CEREAL_NVP(character_2_give_money),
-				CEREAL_NVP(character_1_give_items),
-				CEREAL_NVP(character_2_give_items)
-			);
-		}
-	};
-
-	struct GMCommandEvent {
-		std::string message;
-		std::string target;
-
-		// cereal
-		template<class Archive>
-		void serialize(Archive &ar)
-		{
-			ar(
-				CEREAL_NVP(message),
-				CEREAL_NVP(target)
-			);
-		}
-	};
-
-	struct ZoningEvent {
-		std::string from_zone_long_name;
-		std::string from_zone_short_name;
-		int32       from_zone_id;
-		int32       from_instance_id;
-		int32       from_instance_version;
-		std::string to_zone_long_name;
-		std::string to_zone_short_name;
-		int32       to_zone_id;
-		int32       to_instance_id;
-		int32       to_instance_version;
-
-		// cereal
-		template<class Archive>
-		void serialize(Archive &ar)
-		{
-			ar(
-				CEREAL_NVP(from_zone_long_name),
-				CEREAL_NVP(from_zone_short_name),
-				CEREAL_NVP(from_zone_id),
-				CEREAL_NVP(from_instance_id),
-				CEREAL_NVP(from_instance_version),
-				CEREAL_NVP(to_zone_long_name),
-				CEREAL_NVP(to_zone_short_name),
-				CEREAL_NVP(to_zone_id),
-				CEREAL_NVP(to_instance_id),
-				CEREAL_NVP(to_instance_version)
-			);
-		}
-	};
-
-	struct AAGainedEvent {
-		uint32 aa_gained;
-
-		// cereal
-		template<class Archive>
-		void serialize(Archive &ar)
-		{
-			ar(CEREAL_NVP(aa_gained));
-		}
-	};
-
-	struct AAPurchasedEvent {
-		uint32 aa_id;
-		int32 aa_cost;
-		int32 aa_previous_id;
-		int32 aa_next_id;
-
-		// cereal
-		template<class Archive>
-		void serialize(Archive &ar)
-		{
-			ar(
-				CEREAL_NVP(aa_id),
-				CEREAL_NVP(aa_cost),
-				CEREAL_NVP(aa_previous_id),
-				CEREAL_NVP(aa_next_id)
-			);
-		}
-	};
-
-	struct ForageSuccessEvent {
-		uint32      item_id;
-		std::string item_name;
-
-		// cereal
-		template<class Archive>
-		void serialize(Archive &ar)
-		{
-			ar(
-				CEREAL_NVP(item_id),
-				CEREAL_NVP(item_name)
-			);
-		}
-	};
-
-	struct FishSuccessEvent {
-		uint32      item_id;
-		std::string item_name;
-
-		// cereal
-		template<class Archive>
-		void serialize(Archive &ar)
-		{
-			ar(
-				CEREAL_NVP(item_id),
-				CEREAL_NVP(item_name)
-			);
-		}
-	};
-
-	struct DestroyItemEvent {
-		uint32      item_id;
-		std::string item_name;
-		int16       charges;
-		std::string reason;
-
-		// cereal
-		template<class Archive>
-		void serialize(Archive &ar)
-		{
-			ar(
-				CEREAL_NVP(item_id),
-				CEREAL_NVP(item_name),
-				CEREAL_NVP(reason),
-				CEREAL_NVP(charges)
-			);
-		}
-	};
-
-	struct LevelGainedEvent {
-		uint32 from_level;
-		uint8  to_level;
-		int    levels_gained;
-
-		// cereal
-		template<class Archive>
-		void serialize(Archive &ar)
-		{
-			ar(
-				CEREAL_NVP(from_level),
-				CEREAL_NVP(to_level),
-				CEREAL_NVP(levels_gained)
-			);
-		}
-	};
-
-	struct LevelLostEvent {
-		uint32 from_level;
-		uint8  to_level;
-		int    levels_lost;
-
-		// cereal
-		template<class Archive>
-		void serialize(Archive &ar)
-		{
-			ar(
-				CEREAL_NVP(from_level),
-				CEREAL_NVP(to_level),
-				CEREAL_NVP(levels_lost)
-			);
-		}
-	};
-
-	struct LootItemEvent {
-		uint32      item_id;
-		std::string item_name;
-		int16       charges;
-		uint32      npc_id;
-		std::string corpse_name;
-
-		// cereal
-		template<class Archive>
-		void serialize(Archive &ar)
-		{
-			ar(
-				CEREAL_NVP(item_id),
-				CEREAL_NVP(item_name),
-				CEREAL_NVP(charges),
-				CEREAL_NVP(npc_id),
-				CEREAL_NVP(corpse_name)
-			);
-		}
-	};
-
-	struct MerchantPurchaseEvent {
-		uint32      npc_id;
-		std::string merchant_name;
-		uint32      merchant_type;
-		uint32      item_id;
-		std::string item_name;
-		int16       charges;
-		uint32      cost;
-		uint32      alternate_currency_id;
-		uint64      player_money_balance;
-		uint64      player_currency_balance;
-
-		// cereal
-		template<class Archive>
-		void serialize(Archive &ar)
-		{
-			ar(
-				CEREAL_NVP(npc_id),
-				CEREAL_NVP(merchant_name),
-				CEREAL_NVP(merchant_type),
-				CEREAL_NVP(item_id),
-				CEREAL_NVP(item_name),
-				CEREAL_NVP(charges),
-				CEREAL_NVP(cost),
-				CEREAL_NVP(alternate_currency_id),
-				CEREAL_NVP(player_money_balance),
-				CEREAL_NVP(player_currency_balance)
-			);
-		}
-	};
-
-	struct MerchantSellEvent {
-		uint32      npc_id;
-		std::string merchant_name;
-		uint32      merchant_type;
-		uint32      item_id;
-		std::string item_name;
-		int16       charges;
-		uint32      cost;
-		uint32      alternate_currency_id;
-		uint64      player_money_balance;
-		uint64      player_currency_balance;
-
-		// cereal
-		template<class Archive>
-		void serialize(Archive &ar)
-		{
-			ar(
-				CEREAL_NVP(npc_id),
-				CEREAL_NVP(merchant_name),
-				CEREAL_NVP(merchant_type),
-				CEREAL_NVP(item_id),
-				CEREAL_NVP(item_name),
-				CEREAL_NVP(charges),
-				CEREAL_NVP(cost),
-				CEREAL_NVP(alternate_currency_id),
-				CEREAL_NVP(player_money_balance),
-				CEREAL_NVP(player_currency_balance)
-			);
-		}
-	};
-
-	struct SkillUpEvent {
-		uint32      skill_id;
-		int         value;
-		int16       max_skill;
-		std::string against_who;
-
-		// cereal
-		template<class Archive>
-		void serialize(Archive &ar)
-		{
-			ar(
-				CEREAL_NVP(skill_id),
-				CEREAL_NVP(value),
-				CEREAL_NVP(max_skill),
-				CEREAL_NVP(against_who)
-			);
-		}
-	};
-
-	struct TaskAcceptEvent {
-		uint32      npc_id;
-		std::string npc_name;
-		uint32      task_id;
-		std::string task_name;
-
-		// cereal
-		template<class Archive>
-		void serialize(Archive &ar)
-		{
-			ar(
-				CEREAL_NVP(npc_id),
-				CEREAL_NVP(npc_name),
-				CEREAL_NVP(task_id),
-				CEREAL_NVP(task_name)
-			);
-		}
-	};
-
-	struct TaskUpdateEvent {
-		uint32      task_id;
-		std::string task_name;
-		uint32      activity_id;
-		uint32      done_count;
-
-		// cereal
-		template<class Archive>
-		void serialize(Archive &ar)
-		{
-			ar(
-				CEREAL_NVP(task_id),
-				CEREAL_NVP(task_name),
-				CEREAL_NVP(activity_id),
-				CEREAL_NVP(done_count)
-			);
-		}
-	};
-
-	struct TaskCompleteEvent {
-		uint32      task_id;
-		std::string task_name;
-		uint32      activity_id;
-		uint32      done_count;
-
-		// cereal
-		template<class Archive>
-		void serialize(Archive &ar)
-		{
-			ar(
-				CEREAL_NVP(task_id),
-				CEREAL_NVP(task_name),
-				CEREAL_NVP(activity_id),
-				CEREAL_NVP(done_count)
-			);
-		}
-	};
-
-	struct GroundSpawnPickupEvent {
-		uint32      item_id;
-		std::string item_name;
-
-		// cereal
-		template<class Archive>
-		void serialize(Archive &ar)
-		{
-			ar(
-				CEREAL_NVP(item_id),
-				CEREAL_NVP(item_name)
-			);
-		}
-	};
-
-	struct SayEvent {
-		std::string message;
-		std::string target;
-
-		// cereal
-		template<class Archive>
-		void serialize(Archive &ar)
-		{
-			ar(
-				CEREAL_NVP(message),
-				CEREAL_NVP(target)
-			);
-		}
-	};
-
-	struct ResurrectAcceptEvent {
-		std::string resurrecter_name;
-		std::string spell_name;
-		uint32      spell_id;
-
-		// cereal
-		template<class Archive>
-		void serialize(Archive &ar)
-		{
-			ar(
-				CEREAL_NVP(resurrecter_name),
-				CEREAL_NVP(spell_name),
-				CEREAL_NVP(spell_id)
-			);
-		}
-	};
-
-	struct CombineEvent {
-		uint32      recipe_id;
-		std::string recipe_name;
-		uint32      made_count;
-		uint32      tradeskill_id;
-
-		// cereal
-		template<class Archive>
-		void serialize(Archive &ar)
-		{
-			ar(
-				CEREAL_NVP(recipe_id),
-				CEREAL_NVP(recipe_name),
-				CEREAL_NVP(made_count),
-				CEREAL_NVP(tradeskill_id)
-			);
-		}
-	};
-
-	struct DroppedItemEvent {
-		uint32      item_id;
-		std::string item_name;
-		int16       slot_id;
-		uint32      charges;
-
-		// cereal
-		template<class Archive>
-		void serialize(Archive &ar)
-		{
-			ar(
-				CEREAL_NVP(item_id),
-				CEREAL_NVP(item_name),
-				CEREAL_NVP(slot_id),
-				CEREAL_NVP(charges)
-			);
-		}
-	};
-
-	struct DeathEvent {
-		uint32      killer_id;
-		std::string killer_name;
-		int64       damage;
-		uint32      spell_id;
-		std::string spell_name;
-		int         skill_id;
-		std::string skill_name;
-
-		// cereal
-		template<class Archive>
-		void serialize(Archive &ar)
-		{
-			ar(
-				CEREAL_NVP(killer_id),
-				CEREAL_NVP(killer_name),
-				CEREAL_NVP(damage),
-				CEREAL_NVP(spell_id),
-				CEREAL_NVP(spell_name),
-				CEREAL_NVP(skill_id),
-				CEREAL_NVP(skill_name)
-			);
-		}
-	};
-
-	struct SplitMoneyEvent {
-		uint32 copper;
-		uint32 silver;
-		uint32 gold;
-		uint32 platinum;
-		uint64 player_money_balance;
-
-		// cereal
-		template<class Archive>
-		void serialize(Archive &ar)
-		{
-			ar(
-				CEREAL_NVP(copper),
-				CEREAL_NVP(silver),
-				CEREAL_NVP(gold),
-				CEREAL_NVP(platinum),
-				CEREAL_NVP(player_money_balance)
-			);
-		}
-	};
-
-	struct TraderPurchaseEvent {
-		uint32      item_id;
-		std::string item_name;
-		uint32      trader_id;
-		std::string trader_name;
-		uint32      price;
-		uint32      charges;
-		uint32      total_cost;
-		uint64      player_money_balance;
-
-
-		// cereal
-		template<class Archive>
-		void serialize(Archive &ar)
-		{
-			ar(
-				CEREAL_NVP(item_id),
-				CEREAL_NVP(item_name),
-				CEREAL_NVP(trader_id),
-				CEREAL_NVP(trader_name),
-				CEREAL_NVP(price),
-				CEREAL_NVP(charges),
-				CEREAL_NVP(total_cost),
-				CEREAL_NVP(player_money_balance)
-			);
-		}
-	};
-
-	struct TraderSellEvent {
-		uint32      item_id;
-		std::string item_name;
-		uint32      buyer_id;
-		std::string buyer_name;
-		uint32      price;
-		uint32      charges;
-		uint32      total_cost;
-		uint64      player_money_balance;
-
-
-		// cereal
-		template<class Archive>
-		void serialize(Archive &ar)
-		{
-			ar(
-				CEREAL_NVP(item_id),
-				CEREAL_NVP(item_name),
-				CEREAL_NVP(buyer_id),
-				CEREAL_NVP(buyer_name),
-				CEREAL_NVP(price),
-				CEREAL_NVP(charges),
-				CEREAL_NVP(total_cost),
-				CEREAL_NVP(player_money_balance)
-			);
-		}
-	};
-
-	struct DiscoverItemEvent {
-		uint32      item_id;
-		std::string item_name;
-
-		// cereal
-		template<class Archive>
-		void serialize(Archive &ar)
-		{
-			ar(
-				CEREAL_NVP(item_id),
-				CEREAL_NVP(item_name)
-			);
-		}
-	};
-
-	class HandinEntry {
-	public:
-		uint32      item_id;
-		std::string item_name;
-		uint16      charges;
-		bool        attuned;
-
-		// cereal
-		template<class Archive>
-		void serialize(Archive &ar)
-		{
-			ar(
-				CEREAL_NVP(item_id),
-				CEREAL_NVP(item_name),
-				CEREAL_NVP(charges),
-				CEREAL_NVP(attuned)
-			);
-		}
-	};
-
-	class HandinMoney {
-	public:
-		uint32 copper;
-		uint32 silver;
-		uint32 gold;
-		uint32 platinum;
-
-		// cereal
-		template<class Archive>
-		void serialize(Archive &ar)
-		{
-			ar(
-				CEREAL_NVP(copper),
-				CEREAL_NVP(silver),
-				CEREAL_NVP(gold),
-				CEREAL_NVP(platinum)
-			);
-		}
-	};
-
-	struct HandinEvent {
-		uint32                   npc_id;
-		std::string              npc_name;
-		std::vector<HandinEntry> handin_items;
-		HandinMoney              handin_money;
-		std::vector<HandinEntry> return_items;
-		HandinMoney              return_money;
-
-		// cereal
-		template<class Archive>
-		void serialize(Archive &ar)
-		{
-			ar(
-				CEREAL_NVP(npc_id),
-				CEREAL_NVP(npc_name),
-				CEREAL_NVP(handin_items),
-				CEREAL_NVP(handin_money),
-				CEREAL_NVP(return_items),
-				CEREAL_NVP(return_money)
-			);
-		}
-	};
-
-	struct PossibleHackEvent {
-		std::string message;
-
-		// cereal
-		template<class Archive>
-		void serialize(Archive &ar)
-		{
-			ar(
-				CEREAL_NVP(message)
-			);
-		}
-	};
-
-	struct KilledNPCEvent {
-		uint32      npc_id;
-		std::string npc_name;
-		uint32      combat_time_seconds;
-		uint64      total_damage_per_second_taken;
-		uint64      total_heal_per_second_taken;
-
-		// cereal
-		template<class Archive>
-		void serialize(Archive &ar)
-		{
-			ar(
-				CEREAL_NVP(npc_id),
-				CEREAL_NVP(npc_name),
-				CEREAL_NVP(combat_time_seconds),
-				CEREAL_NVP(total_damage_per_second_taken),
-				CEREAL_NVP(total_heal_per_second_taken)
-			);
-		}
-	};
-}
-
-#endif //EQEMU_PLAYER_EVENTS_H
-
-#define RecordPlayerEventLog(event_type, event_data) do {\
-    if (player_event_logs.IsEventEnabled(event_type)) {\
-        worldserver.SendPacket(\
-            player_event_logs.RecordEvent(\
-                event_type,\
-                GetPlayerEvent(),\
-                event_data\
-            ).get()\
-        );\
-    }\
-} while (0)
-
-#define RecordPlayerEventLogWithClient(c, event_type, event_data) do {\
-    if (player_event_logs.IsEventEnabled(event_type)) {\
-        worldserver.SendPacket(\
-            player_event_logs.RecordEvent(\
-                event_type,\
-                (c)->GetPlayerEvent(),\
-                event_data\
-            ).get()\
-        );\
-    }\
-} while (0)
@@ -132,7 +132,7 @@ enum {	//reuse times
 	InstillDoubtReuseTime = 9,
 	FishingReuseTime = 11,
 	ForagingReuseTime = 50,
-	MendReuseTime = 360,
+	MendReuseTime = 290,
 	BashReuseTime = 5,
 	BackstabReuseTime = 9,
 	KickReuseTime = 5,
@@ -61,11 +61,9 @@ bool BaseGuildManager::LoadGuilds() {
 	}

 	for (auto row=results.begin();row!=results.end();++row)
-		_CreateGuild(Strings::ToUnsignedInt(row[0]), row[1], Strings::ToUnsignedInt(row[2]), Strings::ToUnsignedInt(row[3]), row[4], row[5], row[6], row[7]);
+		_CreateGuild(atoi(row[0]), row[1], atoi(row[2]), atoi(row[3]), row[4], row[5], row[6], row[7]);

-	LogInfo("Loaded [{}] Guilds", Strings::Commify(std::to_string(results.RowCount())));
-
-	query = "SELECT guild_id,`rank`,title,can_hear,can_speak,can_invite,can_remove,can_promote,can_demote,can_motd,can_warpeace FROM guild_ranks";
+    query = "SELECT guild_id,`rank`,title,can_hear,can_speak,can_invite,can_remove,can_promote,can_demote,can_motd,can_warpeace FROM guild_ranks";
 	results = m_db->QueryDatabase(query);

 	if (!results.Success())
@@ -75,8 +73,8 @@ bool BaseGuildManager::LoadGuilds() {

 	for (auto row=results.begin();row!=results.end();++row)
 	{
-		uint32 guild_id = Strings::ToUnsignedInt(row[0]);
-		uint8 rankn = Strings::ToUnsignedInt(row[1]);
+		uint32 guild_id = atoi(row[0]);
+		uint8 rankn = atoi(row[1]);

 		if(rankn > GUILD_MAX_RANK) {
 			LogGuilds("Found invalid (too high) rank [{}] for guild [{}], skipping", rankn, guild_id);
@@ -131,7 +129,7 @@ bool BaseGuildManager::RefreshGuild(uint32 guild_id) {

 	auto row = results.begin();

-	info = _CreateGuild(guild_id, row[0], Strings::ToUnsignedInt(row[1]), Strings::ToUnsignedInt(row[2]), row[3], row[4], row[5], row[6]);
+	info = _CreateGuild(guild_id, row[0], atoi(row[1]), atoi(row[2]), row[3], row[4], row[5], row[6]);

    query = StringFormat("SELECT guild_id, `rank`, title, can_hear, can_speak, can_invite, can_remove, can_promote, can_demote, can_motd, can_warpeace "
                        "FROM guild_ranks WHERE guild_id=%lu", (unsigned long)guild_id);
@@ -144,7 +142,7 @@ bool BaseGuildManager::RefreshGuild(uint32 guild_id) {

 	for (auto row=results.begin();row!=results.end();++row)
 	{
-		uint8 rankn = Strings::ToUnsignedInt(row[1]);
+		uint8 rankn = atoi(row[1]);

 		if(rankn > GUILD_MAX_RANK) {
 			LogGuilds("Found invalid (too high) rank [{}] for guild [{}], skipping", rankn, guild_id);
@@ -787,7 +785,9 @@ bool BaseGuildManager::GetBankerFlag(uint32 CharID)

 	auto row = results.begin();

-	return Strings::ToBool(row[0]);
+	bool IsBanker = atoi(row[0]);
+
+	return IsBanker;
 }

 bool BaseGuildManager::DBSetAltFlag(uint32 charid, bool is_alt)
@@ -815,7 +815,9 @@ bool BaseGuildManager::GetAltFlag(uint32 CharID)

 	auto row = results.begin();

-	return Strings::ToBool(row[0]);
+	bool IsAlt = atoi(row[0]);
+
+	return IsAlt;
 }

 bool BaseGuildManager::DBSetTributeFlag(uint32 charid, bool enabled) {
@@ -862,26 +864,35 @@ bool BaseGuildManager::QueryWithLogging(std::string query, const char *errmsg) {
 	return(true);
 }

+//factored out so I dont have to copy this crap.
+#ifdef BOTS
+#define GuildMemberBaseQuery \
+"SELECT c.`id`, c.`name`, c.`class`, c.`level`, c.`last_login`, c.`zone_id`," \
+" g.`guild_id`, g.`rank`, g.`tribute_enable`, g.`total_tribute`, g.`last_tribute`," \
+" g.`banker`, g.`public_note`, g.`alt`" \
+" FROM `vw_bot_character_mobs` AS c LEFT JOIN `vw_guild_members` AS g ON c.`id` = g.`char_id` AND c.`mob_type` = g.`mob_type` "
+#else
 #define GuildMemberBaseQuery \
 "SELECT c.`id`, c.`name`, c.`class`, c.`level`, c.`last_login`, c.`zone_id`," \
 " g.`guild_id`, g.`rank`, g.`tribute_enable`, g.`total_tribute`, g.`last_tribute`," \
 " g.`banker`, g.`public_note`, g.`alt` " \
 " FROM `character_data` AS c LEFT JOIN `guild_members` AS g ON c.`id` = g.`char_id` "
+#endif
 static void ProcessGuildMember(MySQLRequestRow row, CharGuildInfo &into) {
 	//fields from `characer_`
-	into.char_id		= Strings::ToUnsignedInt(row[0]);
+	into.char_id		= atoi(row[0]);
 	into.char_name		= row[1];
-	into.class_			= Strings::ToUnsignedInt(row[2]);
-	into.level			= Strings::ToUnsignedInt(row[3]);
-	into.time_last_on	= Strings::ToUnsignedInt(row[4]);
-	into.zone_id		= Strings::ToUnsignedInt(row[5]);
+	into.class_			= atoi(row[2]);
+	into.level			= atoi(row[3]);
+	into.time_last_on	= atoul(row[4]);
+	into.zone_id		= atoi(row[5]);

 	//fields from `guild_members`, leave at defaults if missing
-	into.guild_id		= row[6] ? Strings::ToUnsignedInt(row[6]) : GUILD_NONE;
-	into.rank			= row[7] ? Strings::ToUnsignedInt(row[7]) : (GUILD_MAX_RANK+1);
+	into.guild_id		= row[6] ? atoi(row[6]) : GUILD_NONE;
+	into.rank			= row[7] ? atoi(row[7]) : (GUILD_MAX_RANK+1);
 	into.tribute_enable = row[8] ? (row[8][0] == '0'?false:true) : false;
-	into.total_tribute	= row[9] ? Strings::ToUnsignedInt(row[9]) : 0;
-	into.last_tribute	= row[10]? Strings::ToUnsignedInt(row[10]) : 0;		//timestamp
+	into.total_tribute	= row[9] ? atoi(row[9]) : 0;
+	into.last_tribute	= row[10]? atoul(row[10]) : 0;		//timestamp
 	into.banker			= row[11]? (row[11][0] == '0'?false:true) : false;
 	into.public_note	= row[12]? row[12] : "";
 	into.alt		= row[13]? (row[13][0] == '0'?false:true) : false;
@@ -956,8 +967,13 @@ bool BaseGuildManager::GetCharInfo(uint32 char_id, CharGuildInfo &into) {
 	}

 	//load up the rank info for each guild.
-	std::string query   = StringFormat(GuildMemberBaseQuery " WHERE c.id=%d AND c.deleted_at IS NULL", char_id);
-	auto        results = m_db->QueryDatabase(query);
+	std::string query;
+#ifdef BOTS
+    query = StringFormat(GuildMemberBaseQuery " WHERE c.id=%d AND c.mob_type = 'C' AND c.deleted_at IS NULL", char_id);
+#else
+    query = StringFormat(GuildMemberBaseQuery " WHERE c.id=%d AND c.deleted_at IS NULL", char_id);
+#endif
+    auto results = m_db->QueryDatabase(query);
 	if (!results.Success()) {
 		return false;
 	}
@@ -1254,7 +1270,7 @@ uint32 BaseGuildManager::GetGuildIDByCharacterID(uint32 character_id)
 	}

 	auto row = results.begin();
-	auto guild_id = Strings::ToUnsignedInt(row[0]);
+	auto guild_id = std::stoul(row[0]);
 	return guild_id;
 }

@@ -272,8 +272,6 @@ inline const unsigned char *ASN1_STRING_get0_data(const ASN1_STRING *asn1) {
 #include <brotli/encode.h>
 #endif

-#include "../strings.h"
-
 /*
 * Declaration
 */
@@ -3814,12 +3812,12 @@ inline bool brotli_decompressor::decompress(const char *data,
 					if (std::regex_match(b, e, cm, re_another_range)) {
 						ssize_t first = -1;
 						if (!cm.str(1).empty()) {
-							first = static_cast<ssize_t>(Strings::ToBigInt(cm.str(1)));
+							first = static_cast<ssize_t>(std::stoll(cm.str(1)));
 						}

 						ssize_t last = -1;
 						if (!cm.str(2).empty()) {
-							last = static_cast<ssize_t>(Strings::ToBigInt(cm.str(2)));
+							last = static_cast<ssize_t>(std::stoll(cm.str(2)));
 						}

 						if (first != -1 && last != -1 && first > last) {
@@ -6690,7 +6688,7 @@ static WSInit wsinit_;
 		if (params.empty()) { return Get(path, headers); }

 		std::string path_with_query = append_query_params(path, params);
-		return Get(path_with_query, headers, progress);
+		return Get(path_with_query.c_str(), headers, progress);
 	}

 	inline Result ClientImpl::Get(const std::string &path, const Params &params,
@@ -6710,7 +6708,7 @@ static WSInit wsinit_;
 		}

 		std::string path_with_query = append_query_params(path, params);
-		return Get(path_with_query, headers, response_handler,
+		return Get(path_with_query.c_str(), headers, response_handler,
 				   content_receiver, progress);
 	}

@@ -6807,7 +6805,7 @@ static WSInit wsinit_;
 		std::string content_type;
 		const auto &body = detail::serialize_multipart_formdata(
 			items, detail::make_multipart_data_boundary(), content_type);
-		return Post(path, headers, body, content_type);
+		return Post(path, headers, body, content_type.c_str());
 	}

 	inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
@@ -6820,7 +6818,7 @@ static WSInit wsinit_;
 		std::string content_type;
 		const auto &body =
 						detail::serialize_multipart_formdata(items, boundary, content_type);
-		return Post(path, headers, body, content_type);
+		return Post(path, headers, body, content_type.c_str());
 	}

 	inline Result ClientImpl::Put(const std::string &path) {
@@ -26,8 +26,6 @@


 #include "item_instance.h"
-#include "classes.h"
-#include "races.h"

 #include <list>
 #include <vector>
@@ -132,7 +130,7 @@ 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_0, uint8 class_id = NO_CLASS, 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);
@@ -203,12 +201,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, const 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, const std::string &identifier, bool value);
-		std::string GetCustomItemData(int16 slot_id, const std::string& identifier);
-		static const int GetItemStatValue(uint32 item_id, const std::string& identifier);
+		void SetCustomItemData(uint32 character_id, int16 slot_id, std::string identifier, std::string value);
+		void SetCustomItemData(uint32 character_id, int16 slot_id, std::string identifier, int value);
+		void SetCustomItemData(uint32 character_id, int16 slot_id, std::string identifier, float value);
+		void SetCustomItemData(uint32 character_id, int16 slot_id, std::string identifier, bool value);
+		std::string GetCustomItemData(int16 slot_id, std::string identifier);
+		static const int GetItemStatValue(uint32 item_id, std::string identifier);
 	protected:
 		///////////////////////////////
 		// Protected Methods
@@ -198,7 +198,7 @@ std::string IpUtil::DNSLookupSync(const std::string &addr, int port)
 				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 [{}]",
+						"[DNSLookupSync] Deadline exceeded [{}]",
 						1500
 					);
 					running = false;
@@ -131,7 +131,7 @@ namespace EQ
 			Mounts?
 			Ornamentations?
 			GuildBanners?
-			Collectible?
+			Collectible? 
 			Placeable?
 			(others?)
 */
@@ -449,8 +449,8 @@ namespace EQ
 		int8	Shielding;		// PoP: Shielding %
 		int8	StunResist;		// PoP: Stun Resist %
 		int8	StrikeThrough;	// PoP: Strike Through %
-		int32	ExtraDmgSkill;
-		int32	ExtraDmgAmt;
+		uint32	ExtraDmgSkill;
+		uint32	ExtraDmgAmt;
 		int8	SpellShield;	// PoP: Spell Shield %
 		int8	Avoidance;		// PoP: Avoidance +
 		int8	Accuracy;		// PoP: Accuracy +
@@ -358,27 +358,15 @@ int8 EQ::ItemInstance::AvailableAugmentSlot(int32 augment_type) const
 	return (i <= invaug::SOCKET_END) ? i : INVALID_INDEX;
 }

-bool EQ::ItemInstance::IsAugmentSlotAvailable(int32 augment_type, uint8 slot) const
+bool EQ::ItemInstance::IsAugmentSlotAvailable(int32 augtype, uint8 slot) const
 {
-	if (!m_item || !m_item->IsClassCommon()) {
-		return false;
-	}
+	if (!m_item || !m_item->IsClassCommon())
+		 return false;

-	if (
-		(
-			!GetItem(slot) &&
-			m_item->AugSlotVisible[slot]
-		) &&
-		augment_type == -1 ||
-		(
-			m_item->AugSlotType[slot] &&
-			((1 << (m_item->AugSlotType[slot] - 1)) & augment_type)
-		)
-	) {
+	if ((!GetItem(slot) && m_item->AugSlotVisible[slot]) && augtype == -1 || (m_item->AugSlotType[slot] && ((1 << (m_item->AugSlotType[slot] - 1)) & augtype))) {
 		return true;
 	}
-
-	return false;
+		return false;
 }

 // Retrieve item inside container
@@ -546,11 +534,10 @@ bool EQ::ItemInstance::IsNoneEmptyContainer()
 }

 // Retrieve augment inside item
-EQ::ItemInstance* EQ::ItemInstance::GetAugment(uint8 augment_index) const
+EQ::ItemInstance* EQ::ItemInstance::GetAugment(uint8 slot) const
 {
-	if (m_item && m_item->IsClassCommon()) {
-		return GetItem(augment_index);
-	}
+	if (m_item && m_item->IsClassCommon())
+		return GetItem(slot);

 	return nullptr;
 }
@@ -610,7 +597,7 @@ bool EQ::ItemInstance::UpdateOrnamentationInfo() {
 			SetOrnamentHeroModel(ornamentItem->HerosForgeModel);
 			if (strlen(ornamentItem->IDFile) > 2)
 			{
-				SetOrnamentationIDFile(Strings::ToUnsignedInt(&ornamentItem->IDFile[2]));
+				SetOrnamentationIDFile(atoi(&ornamentItem->IDFile[2]));
 			}
 			else
 			{
@@ -676,13 +663,12 @@ bool EQ::ItemInstance::CanTransform(const ItemData *ItemToTry, const ItemData *C
 	return false;
 }

-uint32 EQ::ItemInstance::GetAugmentItemID(uint8 augment_index) const
+uint32 EQ::ItemInstance::GetAugmentItemID(uint8 slot) const
 {
-	if (!m_item || !m_item->IsClassCommon()) {
+	if (!m_item || !m_item->IsClassCommon())
 		return 0;
-	}

-	return GetItemID(augment_index);
+	return GetItemID(slot);
 }

 // Add an augment to the item
@@ -840,20 +826,7 @@ std::string EQ::ItemInstance::GetCustomDataString() const {
 	return ret_val;
 }

-void EQ::ItemInstance::SetCustomDataString(const std::string& str)
-{
-	auto components = Strings::Split(str, "^");
-	auto value_count = components.size() / 2;
-
-	for (auto i = 0; i < value_count; i++) {
-		auto identifier = components[i * 2];
-		auto value = components[(i * 2) + 1];
-
-		SetCustomData(identifier, value);
-	}
-}
-
-std::string EQ::ItemInstance::GetCustomData(const std::string& identifier) {
+std::string EQ::ItemInstance::GetCustomData(std::string identifier) {
 	std::map<std::string, std::string>::const_iterator iter = m_custom_data.find(identifier);
 	if (iter != m_custom_data.end()) {
 		return iter->second;
@@ -862,33 +835,33 @@ std::string EQ::ItemInstance::GetCustomData(const std::string& identifier) {
 	return "";
 }

-void EQ::ItemInstance::SetCustomData(const std::string& identifier, const std::string& value) {
+void EQ::ItemInstance::SetCustomData(std::string identifier, std::string value) {
 	DeleteCustomData(identifier);
 	m_custom_data[identifier] = value;
 }

-void EQ::ItemInstance::SetCustomData(const std::string& identifier, int value) {
+void EQ::ItemInstance::SetCustomData(std::string identifier, int value) {
 	DeleteCustomData(identifier);
 	std::stringstream ss;
 	ss << value;
 	m_custom_data[identifier] = ss.str();
 }

-void EQ::ItemInstance::SetCustomData(const std::string& identifier, float value) {
+void EQ::ItemInstance::SetCustomData(std::string identifier, float value) {
 	DeleteCustomData(identifier);
 	std::stringstream ss;
 	ss << value;
 	m_custom_data[identifier] = ss.str();
 }

-void EQ::ItemInstance::SetCustomData(const std::string& identifier, bool value) {
+void EQ::ItemInstance::SetCustomData(std::string identifier, bool value) {
 	DeleteCustomData(identifier);
 	std::stringstream ss;
 	ss << value;
 	m_custom_data[identifier] = ss.str();
 }

-void EQ::ItemInstance::DeleteCustomData(const std::string& identifier) {
+void EQ::ItemInstance::DeleteCustomData(std::string identifier) {
 	auto iter = m_custom_data.find(identifier);
 	if (iter != m_custom_data.end()) {
 		m_custom_data.erase(iter);
@@ -1276,7 +1249,7 @@ int EQ::ItemInstance::GetItemBaneDamageBody(bool augments) const

 int EQ::ItemInstance::GetItemBaneDamageRace(bool augments) const
 {
-	int race = RACE_DOUG_0;
+	int race = 0;
 	const auto item = GetItem();
 	if (item) {
 		race = item->BaneDmgRace;
@@ -101,8 +101,8 @@ namespace EQ
 		//
 		bool IsAugmentable() const;
 		bool AvailableWearSlot(uint32 aug_wear_slots) const;
-		int8 AvailableAugmentSlot(int32 augment_type) const;
-		bool IsAugmentSlotAvailable(int32 augment_type, uint8 slot) const;
+		int8 AvailableAugmentSlot(int32 augtype) const;
+		bool IsAugmentSlotAvailable(int32 augtype, uint8 slot) const;
 		inline int32 GetAugmentType() const { return ((m_item) ? m_item->AugType : 0); }

 		inline bool IsExpendable() const { return ((m_item) ? ((m_item->Click.Type == item::ItemEffectExpendable) || (m_item->ItemType == item::ItemTypePotion)) : false); }
@@ -127,8 +127,8 @@ namespace EQ
 		//
 		// Augments
 		//
-		ItemInstance* GetAugment(uint8 augment_index) const;
-		uint32 GetAugmentItemID(uint8 augment_index) const;
+		ItemInstance* GetAugment(uint8 slot) const;
+		uint32 GetAugmentItemID(uint8 slot) const;
 		void PutAugment(uint8 slot, const ItemInstance& inst);
 		void PutAugment(SharedDatabase *db, uint8 slot, uint32 item_id);
 		void DeleteAugment(uint8 slot);
@@ -175,13 +175,12 @@ namespace EQ
 		void SetAttuned(bool flag)				{ m_attuned = flag; }

 		std::string GetCustomDataString() const;
-		std::string GetCustomData(const std::string &identifier);
-		void SetCustomDataString(const std::string& str);
-		void SetCustomData(const std::string &identifier, const std::string& value);
-		void SetCustomData(const std::string &identifier, int value);
-		void SetCustomData(const std::string &identifier, float value);
-		void SetCustomData(const std::string &identifier, bool value);
-		void DeleteCustomData(const std::string& identifier);
+		std::string GetCustomData(std::string identifier);
+		void SetCustomData(std::string identifier, std::string value);
+		void SetCustomData(std::string identifier, int value);
+		void SetCustomData(std::string identifier, float value);
+		void SetCustomData(std::string identifier, bool value);
+		void DeleteCustomData(std::string identifier);

 		// Allows treatment of this object as though it were a pointer to m_item
 		operator bool() const { return (m_item != nullptr); }
@@ -18,7 +18,6 @@
 #include "misc.h"
 #include "types.h"
 #include <cstring>
-#include "strings.h"

 std::map<int,std::string> DBFieldNames;

@@ -151,7 +150,7 @@ static char *temp=nullptr;
 		return false;
 	}
 	ptr++;
-	uint32 id = Strings::ToUnsignedInt(field[id_pos]);
+	uint32 id = atoi(field[id_pos].c_str());
 	items[id]=field;

 	for(i=0;i<10;i++) {
@@ -21,7 +21,6 @@
 #include "misc_functions.h"
 #include <string.h>
 #include <time.h>
-#include "strings.h"

 #ifndef WIN32
 #include <netinet/in.h>
@@ -131,7 +130,7 @@ bool ParseAddress(const char* iAddress, uint32* oIP, uint16* oPort, char* errbuf
 		if (*oIP == 0)
 			return false;
 		if (oPort)
-			*oPort = Strings::ToUnsignedInt(sep.arg[1]);
+			*oPort = atoi(sep.arg[1]);
 		return true;
 	}
 	return false;
@@ -7,7 +7,7 @@ EQ::Net::ConsoleServer::ConsoleServer(const std::string &addr, int port)
 	m_server = std::make_unique<EQ::Net::TCPServer>();
 	m_server->Listen(addr, port, false, [this](std::shared_ptr<EQ::Net::TCPConnection> connection) {
 		ConsoleServerConnection *c = new ConsoleServerConnection(this, connection);
-		m_connections.emplace(std::make_pair(c->GetUUID(), std::unique_ptr<ConsoleServerConnection>(c)));
+		m_connections.insert(std::make_pair(c->GetUUID(), std::unique_ptr<ConsoleServerConnection>(c)));
 	});
 }

@@ -97,7 +97,7 @@ void EQ::Net::DaybreakConnectionManager::Connect(const std::string &addr, int po
 		m_on_new_connection(connection);
 	}

-	m_connections.emplace(std::make_pair(std::make_pair(addr, port), connection));
+	m_connections.insert(std::make_pair(std::make_pair(addr, port), connection));
 }

 void EQ::Net::DaybreakConnectionManager::Process()
@@ -234,7 +234,7 @@ void EQ::Net::DaybreakConnectionManager::ProcessPacket(const std::string &endpoi
 				if (m_on_new_connection) {
 					m_on_new_connection(connection);
 				}
-				m_connections.emplace(std::make_pair(std::make_pair(endpoint, port), connection));
+				m_connections.insert(std::make_pair(std::make_pair(endpoint, port), connection));
 				connection->ProcessPacket(p);
 			}
 			else if (data[1] != OP_OutOfSession) {
@@ -527,7 +527,7 @@ void EQ::Net::DaybreakConnection::AddToQueue(int stream, uint16_t seq, const Pac
 		DynamicPacket *out = new DynamicPacket();
 		out->PutPacket(0, p);

-		s->packet_queue.emplace(std::make_pair(seq, out));
+		s->packet_queue.insert(std::make_pair(seq, out));
 	}
 }

@@ -1427,7 +1427,7 @@ void EQ::Net::DaybreakConnection::InternalQueuePacket(Packet &p, int stream_id,
 			static_cast<size_t>((m_rolling_ping * m_owner->m_options.resend_delay_factor) + m_owner->m_options.resend_delay_ms),
 			m_owner->m_options.resend_delay_min,
 			m_owner->m_options.resend_delay_max);
-		stream->sent_packets.emplace(std::make_pair(stream->sequence_out, sent));
+		stream->sent_packets.insert(std::make_pair(stream->sequence_out, sent));
 		stream->sequence_out++;

 		InternalBufferedSend(first_packet);
@@ -1459,7 +1459,7 @@ void EQ::Net::DaybreakConnection::InternalQueuePacket(Packet &p, int stream_id,
 				static_cast<size_t>((m_rolling_ping * m_owner->m_options.resend_delay_factor) + m_owner->m_options.resend_delay_ms),
 				m_owner->m_options.resend_delay_min,
 				m_owner->m_options.resend_delay_max);
-			stream->sent_packets.emplace(std::make_pair(stream->sequence_out, sent));
+			stream->sent_packets.insert(std::make_pair(stream->sequence_out, sent));
 			stream->sequence_out++;

 			InternalBufferedSend(packet);
@@ -1483,7 +1483,7 @@ void EQ::Net::DaybreakConnection::InternalQueuePacket(Packet &p, int stream_id,
 			static_cast<size_t>((m_rolling_ping * m_owner->m_options.resend_delay_factor) + m_owner->m_options.resend_delay_ms),
 			m_owner->m_options.resend_delay_min,
 			m_owner->m_options.resend_delay_max);
-		stream->sent_packets.emplace(std::make_pair(stream->sequence_out, sent));
+		stream->sent_packets.insert(std::make_pair(stream->sequence_out, sent));
 		stream->sequence_out++;

 		InternalBufferedSend(packet);
@@ -22,7 +22,7 @@ void EQ::Net::EQStreamManager::SetOptions(const EQStreamManagerInterfaceOptions
 void EQ::Net::EQStreamManager::DaybreakNewConnection(std::shared_ptr<DaybreakConnection> connection)
 {
 	std::shared_ptr<EQStream> stream(new EQStream(this, connection));
-	m_streams.emplace(std::make_pair(connection, stream));
+	m_streams.insert(std::make_pair(connection, stream));
 	if (m_on_new_connection) {
 		m_on_new_connection(stream);
 	}
@@ -45,7 +45,7 @@ void EQ::Net::ServertalkClient::SendPacket(ServerPacket *p)

 void EQ::Net::ServertalkClient::OnMessage(uint16_t opcode, std::function<void(uint16_t, EQ::Net::Packet&)> cb)
 {
-	m_message_callbacks.emplace(std::make_pair(opcode, cb));
+	m_message_callbacks.insert(std::make_pair(opcode, cb));
 }

 void EQ::Net::ServertalkClient::OnMessage(std::function<void(uint16_t, EQ::Net::Packet&)> cb)
@@ -41,7 +41,7 @@ void EQ::Net::ServertalkLegacyClient::SendPacket(ServerPacket *p)

 void EQ::Net::ServertalkLegacyClient::OnMessage(uint16_t opcode, std::function<void(uint16_t, EQ::Net::Packet&)> cb)
 {
-	m_message_callbacks.emplace(std::make_pair(opcode, cb));
+	m_message_callbacks.insert(std::make_pair(opcode, cb));
 }

 void EQ::Net::ServertalkLegacyClient::OnMessage(std::function<void(uint16_t, EQ::Net::Packet&)> cb)
@@ -19,12 +19,12 @@ void EQ::Net::ServertalkServer::Listen(const ServertalkServerOptions& opts)

 void EQ::Net::ServertalkServer::OnConnectionIdentified(const std::string &type, std::function<void(std::shared_ptr<ServertalkServerConnection>)> cb)
 {
-	m_on_ident.emplace(std::make_pair(type, cb));
+	m_on_ident.insert(std::make_pair(type, cb));
 }

 void EQ::Net::ServertalkServer::OnConnectionRemoved(const std::string &type, std::function<void(std::shared_ptr<ServertalkServerConnection>)> cb)
 {
-	m_on_disc.emplace(std::make_pair(type, cb));
+	m_on_disc.insert(std::make_pair(type, cb));
 }

 void EQ::Net::ServertalkServer::ConnectionDisconnected(ServertalkServerConnection *conn)
@@ -75,7 +75,7 @@ void EQ::Net::ServertalkServer::ConnectionIdentified(ServertalkServerConnection
 			else {
 				std::vector<std::shared_ptr<EQ::Net::ServertalkServerConnection>> vec;
 				vec.push_back(*iter);
-				m_ident_connections.emplace(std::make_pair(conn->GetIdentifier(), vec));
+				m_ident_connections.insert(std::make_pair(conn->GetIdentifier(), vec));
 			}

 			m_unident_connections.erase(iter);
@@ -100,7 +100,7 @@ void EQ::Net::ServertalkServerConnection::SendPacket(ServerPacket *p)

 void EQ::Net::ServertalkServerConnection::OnMessage(uint16_t opcode, std::function<void(uint16_t, EQ::Net::Packet&)> cb)
 {
-	m_message_callbacks.emplace(std::make_pair(opcode, cb));
+	m_message_callbacks.insert(std::make_pair(opcode, cb));
 }

 void EQ::Net::ServertalkServerConnection::OnMessage(std::function<void(uint16_t, EQ::Net::Packet&)> cb)
@@ -665,7 +665,7 @@ namespace RoF

 	ENCODE(OP_DeleteCharge)
 	{
-		Log(Logs::Detail, Logs::Netcode, "RoF::ENCODE(OP_DeleteCharge)");
+		Log(Logs::Moderate, Logs::Netcode, "RoF::ENCODE(OP_DeleteCharge)");

 		ENCODE_FORWARD(OP_MoveItem);
 	}
@@ -1050,7 +1050,7 @@ namespace RoF
 		{
 			if ((gjs->action == groupActDisband) || !strcmp(gjs->yourname, gjs->membername))
 			{
-				//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, member_name = %s", gjs->yourname, gjs->member_name);
+				//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, membername = %s", gjs->yourname, gjs->membername);

 				auto outapp =
 				    new EQApplicationPacket(OP_GroupDisbandYou, sizeof(structs::GroupGeneric_Struct));
@@ -1069,7 +1069,7 @@ namespace RoF
 				return;
 			}
 			//if(gjs->action == groupActLeave)
-			//	Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, member_name = %s", gjs->yourname, gjs->member_name);
+			//	Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, membername = %s", gjs->yourname, gjs->membername);

 			auto outapp =
 			    new EQApplicationPacket(OP_GroupDisbandOther, sizeof(structs::GroupGeneric_Struct));
@@ -1099,7 +1099,7 @@ namespace RoF

 			for (int i = 0; i < 5; ++i)
 			{
-				//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Membername[%i] is %s", i,  gu2->member_name[i]);
+				//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Membername[%i] is %s", i,  gu2->membername[i]);
 				if (gu2->membername[i][0] != '\0')
 				{
 					PacketLength += (22 + strlen(gu2->membername[i]) + 1);
@@ -1169,7 +1169,7 @@ namespace RoF
 			return;

 		}
-		//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Generic GroupUpdate, yourname = %s, member_name = %s", gjs->yourname, gjs->member_name);
+		//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Generic GroupUpdate, yourname = %s, membername = %s", gjs->yourname, gjs->membername);
 		ENCODE_LENGTH_EXACT(GroupJoin_Struct);
 		SETUP_DIRECT_ENCODE(GroupJoin_Struct, structs::GroupJoin_Struct);

@@ -1593,7 +1593,7 @@ namespace RoF
 		ENCODE_LENGTH_EXACT(LootingItem_Struct);
 		SETUP_DIRECT_ENCODE(LootingItem_Struct, structs::LootingItem_Struct);

-		Log(Logs::Detail, Logs::Netcode, "RoF::ENCODE(OP_LootItem)");
+		Log(Logs::Moderate, Logs::Netcode, "RoF::ENCODE(OP_LootItem)");

 		OUT(lootee);
 		OUT(looter);
@@ -1751,7 +1751,7 @@ namespace RoF
 		ENCODE_LENGTH_EXACT(MoveItem_Struct);
 		SETUP_DIRECT_ENCODE(MoveItem_Struct, structs::MoveItem_Struct);

-		Log(Logs::Detail, Logs::Netcode, "RoF::ENCODE(OP_MoveItem)");
+		Log(Logs::Moderate, Logs::Netcode, "RoF::ENCODE(OP_MoveItem)");

 		eq->from_slot = ServerToRoFSlot(emu->from_slot);
 		eq->to_slot = ServerToRoFSlot(emu->to_slot);
@@ -3831,7 +3831,7 @@ namespace RoF
 			}

 			float SpawnSize = emu->size;
-			if (!((emu->NPC == 0) || (emu->race <= RACE_GNOME_12) || (emu->race == RACE_IKSAR_128) ||
+			if (!((emu->NPC == 0) || (emu->race <= RACE_GNOME_12) || (emu->race == RACE_IKSAR_128) || 
 					(emu->race == RACE_VAH_SHIR_130) || (emu->race == RACE_FROGLOK_330) || (emu->race == RACE_DRAKKIN_522))
 				)
 			{
@@ -3965,7 +3965,7 @@ namespace RoF
 			VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 0xffffffff); // unknown18
 			VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 0xffffffff); // unknown19

-			if ((emu->NPC == 0) || (emu->race <= RACE_GNOME_12) || (emu->race == RACE_IKSAR_128) ||
+			if ((emu->NPC == 0) || (emu->race <= RACE_GNOME_12) || (emu->race == RACE_IKSAR_128) || 
 					(emu->race == RACE_VAH_SHIR_130) || (emu->race == RACE_FROGLOK_330) || (emu->race == RACE_DRAKKIN_522)
 				)
 			{
@@ -4822,7 +4822,7 @@ namespace RoF
 		DECODE_LENGTH_EXACT(structs::LootingItem_Struct);
 		SETUP_DIRECT_DECODE(LootingItem_Struct, structs::LootingItem_Struct);

-		Log(Logs::Detail, Logs::Netcode, "RoF::DECODE(OP_LootItem)");
+		Log(Logs::Moderate, Logs::Netcode, "RoF::DECODE(OP_LootItem)");

 		IN(lootee);
 		IN(looter);
@@ -4837,7 +4837,7 @@ namespace RoF
 		DECODE_LENGTH_EXACT(structs::MoveItem_Struct);
 		SETUP_DIRECT_DECODE(MoveItem_Struct, structs::MoveItem_Struct);

-		Log(Logs::Detail, Logs::Netcode, "RoF::DECODE(OP_MoveItem)");
+		Log(Logs::Moderate, Logs::Netcode, "RoF::DECODE(OP_MoveItem)");

 		emu->from_slot = RoFToServerSlot(eq->from_slot);
 		emu->to_slot = RoFToServerSlot(eq->to_slot);
@@ -716,7 +716,7 @@ namespace RoF2

 	ENCODE(OP_DeleteCharge)
 	{
-		Log(Logs::Detail, Logs::Netcode, "RoF2::ENCODE(OP_DeleteCharge)");
+		Log(Logs::Moderate, Logs::Netcode, "RoF2::ENCODE(OP_DeleteCharge)");

 		ENCODE_FORWARD(OP_MoveItem);
 	}
@@ -1101,7 +1101,7 @@ namespace RoF2
 		{
 			if ((gjs->action == groupActDisband) || !strcmp(gjs->yourname, gjs->membername))
 			{
-				//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, member_name = %s", gjs->yourname, gjs->member_name);
+				//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, membername = %s", gjs->yourname, gjs->membername);

 				auto outapp =
 				    new EQApplicationPacket(OP_GroupDisbandYou, sizeof(structs::GroupGeneric_Struct));
@@ -1120,7 +1120,7 @@ namespace RoF2
 				return;
 			}
 			//if(gjs->action == groupActLeave)
-			//	Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, member_name = %s", gjs->yourname, gjs->member_name);
+			//	Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, membername = %s", gjs->yourname, gjs->membername);

 			auto outapp =
 			    new EQApplicationPacket(OP_GroupDisbandOther, sizeof(structs::GroupGeneric_Struct));
@@ -1150,7 +1150,7 @@ namespace RoF2

 			for (int i = 0; i < 5; ++i)
 			{
-				//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Membername[%i] is %s", i,  gu2->member_name[i]);
+				//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Membername[%i] is %s", i,  gu2->membername[i]);
 				if (gu2->membername[i][0] != '\0')
 				{
 					PacketLength += (22 + strlen(gu2->membername[i]) + 1);
@@ -1220,7 +1220,7 @@ namespace RoF2
 			return;

 		}
-		//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Generic GroupUpdate, yourname = %s, member_name = %s", gjs->yourname, gjs->member_name);
+		//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Generic GroupUpdate, yourname = %s, membername = %s", gjs->yourname, gjs->membername);
 		ENCODE_LENGTH_EXACT(GroupJoin_Struct);
 		SETUP_DIRECT_ENCODE(GroupJoin_Struct, structs::GroupJoin_Struct);

@@ -1644,7 +1644,7 @@ namespace RoF2
 		ENCODE_LENGTH_EXACT(LootingItem_Struct);
 		SETUP_DIRECT_ENCODE(LootingItem_Struct, structs::LootingItem_Struct);

-		Log(Logs::Detail, Logs::Netcode, "RoF2::ENCODE(OP_LootItem)");
+		Log(Logs::Moderate, Logs::Netcode, "RoF2::ENCODE(OP_LootItem)");

 		OUT(lootee);
 		OUT(looter);
@@ -1802,7 +1802,7 @@ namespace RoF2
 		ENCODE_LENGTH_EXACT(MoveItem_Struct);
 		SETUP_DIRECT_ENCODE(MoveItem_Struct, structs::MoveItem_Struct);

-		Log(Logs::Detail, Logs::Netcode, "RoF2::ENCODE(OP_MoveItem)");
+		Log(Logs::Moderate, Logs::Netcode, "RoF2::ENCODE(OP_MoveItem)");

 		eq->from_slot = ServerToRoF2Slot(emu->from_slot);
 		eq->to_slot = ServerToRoF2Slot(emu->to_slot);
@@ -3967,7 +3967,7 @@ namespace RoF2
 			}

 			float SpawnSize = emu->size;
-			if (!((emu->NPC == 0) || (emu->race <= RACE_GNOME_12) || (emu->race == RACE_IKSAR_128) ||
+			if (!((emu->NPC == 0) || (emu->race <= RACE_GNOME_12) || (emu->race == RACE_IKSAR_128) || 
 					(emu->race == RACE_VAH_SHIR_130) || (emu->race == RACE_FROGLOK_330) || (emu->race == RACE_DRAKKIN_522))
 				)
 			{
@@ -4172,7 +4172,7 @@ namespace RoF2
 			VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 0xffffffff); // These do something with OP_WeaponEquip1
 			VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 0xffffffff); // ^

-			if ((emu->NPC == 0) || (emu->race <= RACE_GNOME_12) || (emu->race == RACE_IKSAR_128) ||
+			if ((emu->NPC == 0) || (emu->race <= RACE_GNOME_12) || (emu->race == RACE_IKSAR_128) || 
 					(emu->race == RACE_VAH_SHIR_130) || (emu->race == RACE_FROGLOK_330) || (emu->race == RACE_DRAKKIN_522)
 				)
 			{
@@ -5023,7 +5023,7 @@ namespace RoF2
 		DECODE_LENGTH_EXACT(structs::LootingItem_Struct);
 		SETUP_DIRECT_DECODE(LootingItem_Struct, structs::LootingItem_Struct);

-		Log(Logs::Detail, Logs::Netcode, "RoF2::DECODE(OP_LootItem)");
+		Log(Logs::Moderate, Logs::Netcode, "RoF2::DECODE(OP_LootItem)");

 		IN(lootee);
 		IN(looter);
@@ -5038,7 +5038,7 @@ namespace RoF2
 		DECODE_LENGTH_EXACT(structs::MoveItem_Struct);
 		SETUP_DIRECT_DECODE(MoveItem_Struct, structs::MoveItem_Struct);

-		Log(Logs::Detail, Logs::Netcode, "RoF2::DECODE(OP_MoveItem)");
+		Log(Logs::Moderate, Logs::Netcode, "RoF2::DECODE(OP_MoveItem)");

 		emu->from_slot = RoF2ToServerSlot(eq->from_slot);
 		emu->to_slot = RoF2ToServerSlot(eq->to_slot);
@@ -2590,7 +2590,7 @@ struct GroupUpdate_Struct_Live {	// New for Live

 struct GroupMembers_Struct {	// New for Live
 /*0000*/	uint32	membernumber;	// Guess - number of member in the group (0 to 5?)
-/*0000*/	//char	member_name[0];	// Member Name Null Terminated
+/*0000*/	//char	membername[0];	// Member Name Null Terminated
 /*0000*/	uint8	unknown001[3];	// Seen 0
 /*0000*/	uint32	memberlevel;	// Guess
 /*0000*/	uint8	unknown002[11];	// Seen 0
@@ -2600,7 +2600,7 @@ struct GroupJoin_Struct_Live {	// New for Live
 /*0000*/	uint32	unknown0000;	// Matches unknown0136 from GroupFollow_Struct
 /*0004*/	uint32	action;
 /*0008*/	uint8	unknown0008[5];	// Seen 0
-/*0013*/	//char	member_name[0];	// Null Terminated?
+/*0013*/	//char	membername[0];	// Null Terminated?
 /*0000*/	uint8	unknown0013[3];	// Seen 0
 /*0000*/	uint32	unknown0016;	// Matches unknown0132 from GroupFollow_Struct
 /*0000*/	uint8	unknown0020[11];	// Seen 0
@@ -2566,7 +2566,7 @@ struct GroupUpdate_Struct_Live {	// New for Live

 struct GroupMembers_Struct {	// New for Live
 /*0000*/	uint32	membernumber;	// Guess - number of member in the group (0 to 5?)
-/*0000*/	//char	member_name[0];	// Member Name Null Terminated
+/*0000*/	//char	membername[0];	// Member Name Null Terminated
 /*0000*/	uint8	unknown001[3];	// Seen 0
 /*0000*/	uint32	memberlevel;	// Guess
 /*0000*/	uint8	unknown002[11];	// Seen 0
@@ -2576,7 +2576,7 @@ struct GroupJoin_Struct_Live {	// New for Live
 /*0000*/	uint32	unknown0000;	// Matches unknown0136 from GroupFollow_Struct
 /*0004*/	uint32	action;
 /*0008*/	uint8	unknown0008[5];	// Seen 0
-/*0013*/	//char	member_name[0];	// Null Terminated?
+/*0013*/	//char	membername[0];	// Null Terminated?
 /*0000*/	uint8	unknown0013[3];	// Seen 0
 /*0000*/	uint32	unknown0016;	// Matches unknown0132 from GroupFollow_Struct
 /*0000*/	uint8	unknown0020[11];	// Seen 0
@@ -458,7 +458,7 @@ namespace SoD

 	ENCODE(OP_DeleteCharge)
 	{
-		Log(Logs::Detail, Logs::Netcode, "SoD::ENCODE(OP_DeleteCharge)");
+		Log(Logs::Moderate, Logs::Netcode, "SoD::ENCODE(OP_DeleteCharge)");

 		ENCODE_FORWARD(OP_MoveItem);
 	}
@@ -785,7 +785,7 @@ namespace SoD
 		{
 			if ((gjs->action == groupActDisband) || !strcmp(gjs->yourname, gjs->membername))
 			{
-				//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, member_name = %s", gjs->yourname, gjs->member_name);
+				//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, membername = %s", gjs->yourname, gjs->membername);

 				auto outapp =
 				    new EQApplicationPacket(OP_GroupDisbandYou, sizeof(structs::GroupGeneric_Struct));
@@ -804,7 +804,7 @@ namespace SoD
 				return;
 			}
 			//if(gjs->action == groupActLeave)
-			//	Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, member_name = %s", gjs->yourname, gjs->member_name);
+			//	Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, membername = %s", gjs->yourname, gjs->membername);

 			auto outapp =
 			    new EQApplicationPacket(OP_GroupDisbandOther, sizeof(structs::GroupGeneric_Struct));
@@ -834,7 +834,7 @@ namespace SoD

 			for (int i = 0; i < 5; ++i)
 			{
-				//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Membername[%i] is %s", i,  gu2->member_name[i]);
+				//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Membername[%i] is %s", i,  gu2->membername[i]);
 				if (gu2->membername[i][0] != '\0')
 				{
 					PacketLength += (22 + strlen(gu2->membername[i]) + 1);
@@ -902,7 +902,7 @@ namespace SoD
 			return;
 		}

-		//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Generic GroupUpdate, yourname = %s, member_name = %s", gjs->yourname, gjs->member_name);
+		//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Generic GroupUpdate, yourname = %s, membername = %s", gjs->yourname, gjs->membername);
 		ENCODE_LENGTH_EXACT(GroupJoin_Struct);
 		SETUP_DIRECT_ENCODE(GroupJoin_Struct, structs::GroupJoin_Struct);

@@ -1128,7 +1128,7 @@ namespace SoD
 		ENCODE_LENGTH_EXACT(LootingItem_Struct);
 		SETUP_DIRECT_ENCODE(LootingItem_Struct, structs::LootingItem_Struct);

-		Log(Logs::Detail, Logs::Netcode, "SoD::ENCODE(OP_LootItem)");
+		Log(Logs::Moderate, Logs::Netcode, "SoD::ENCODE(OP_LootItem)");

 		OUT(lootee);
 		OUT(looter);
@@ -1277,7 +1277,7 @@ namespace SoD
 		ENCODE_LENGTH_EXACT(MoveItem_Struct);
 		SETUP_DIRECT_ENCODE(MoveItem_Struct, structs::MoveItem_Struct);

-		Log(Logs::Detail, Logs::Netcode, "SoD::ENCODE(OP_MoveItem)");
+		Log(Logs::Moderate, Logs::Netcode, "SoD::ENCODE(OP_MoveItem)");

 		eq->from_slot = ServerToSoDSlot(emu->from_slot);
 		eq->to_slot = ServerToSoDSlot(emu->to_slot);
@@ -2467,7 +2467,7 @@ namespace SoD
 			}

 			float SpawnSize = emu->size;
-			if (!((emu->NPC == 0) || (emu->race <= RACE_GNOME_12) || (emu->race == RACE_IKSAR_128) ||
+			if (!((emu->NPC == 0) || (emu->race <= RACE_GNOME_12) || (emu->race == RACE_IKSAR_128) || 
 					(emu->race == RACE_VAH_SHIR_130) || (emu->race == RACE_FROGLOK_330) || (emu->race == RACE_DRAKKIN_522))
 				)
 			{
@@ -2666,7 +2666,7 @@ namespace SoD

 			Buffer += sizeof(structs::Spawn_Struct_Position);

-			if ((emu->NPC == 0) || (emu->race <= RACE_GNOME_12) || (emu->race == RACE_IKSAR_128) ||
+			if ((emu->NPC == 0) || (emu->race <= RACE_GNOME_12) || (emu->race == RACE_IKSAR_128) || 
 					(emu->race == RACE_VAH_SHIR_130) || (emu->race == RACE_FROGLOK_330) || (emu->race == RACE_DRAKKIN_522)
 				)
 			{
@@ -2693,7 +2693,7 @@ namespace SoD
 			}


-			if ((emu->NPC == 0) || (emu->race <= RACE_GNOME_12) || (emu->race == RACE_IKSAR_128) ||
+			if ((emu->NPC == 0) || (emu->race <= RACE_GNOME_12) || (emu->race == RACE_IKSAR_128) || 
 					(emu->race == RACE_VAH_SHIR_130) || (emu->race == RACE_FROGLOK_330) || (emu->race == RACE_DRAKKIN_522)
 				)
 			{
@@ -3226,7 +3226,7 @@ namespace SoD
 		DECODE_LENGTH_EXACT(structs::LootingItem_Struct);
 		SETUP_DIRECT_DECODE(LootingItem_Struct, structs::LootingItem_Struct);

-		Log(Logs::Detail, Logs::Netcode, "SoD::DECODE(OP_LootItem)");
+		Log(Logs::Moderate, Logs::Netcode, "SoD::DECODE(OP_LootItem)");

 		IN(lootee);
 		IN(looter);
@@ -3241,7 +3241,7 @@ namespace SoD
 		DECODE_LENGTH_EXACT(structs::MoveItem_Struct);
 		SETUP_DIRECT_DECODE(MoveItem_Struct, structs::MoveItem_Struct);

-		Log(Logs::Detail, Logs::Netcode, "SoD::DECODE(OP_MoveItem)");
+		Log(Logs::Moderate, Logs::Netcode, "SoD::DECODE(OP_MoveItem)");

 		emu->from_slot = SoDToServerSlot(eq->from_slot);
 		emu->to_slot = SoDToServerSlot(eq->to_slot);
@@ -2085,7 +2085,7 @@ struct GroupUpdate_Struct_SoD {	// New for SoD

 struct GroupMembers_Struct {	// New for SoD
 /*0000*/	uint32	membernumber;	// Guess - number of member in the group (0 to 5?)
-/*0000*/	//char	member_name[0];	// Member Name Null Terminated
+/*0000*/	//char	membername[0];	// Member Name Null Terminated
 /*0000*/	uint8	unknown001[3];	// Seen 0
 /*0000*/	uint32	memberlevel;	// Guess
 /*0000*/	uint8	unknown002[11];	// Seen 0
@@ -2095,7 +2095,7 @@ struct GroupJoin_Struct_SoD {	// New for SoD
 /*0000*/	uint32	unknown0000;	// Matches unknown0136 from GroupFollow_Struct
 /*0004*/	uint32	action;
 /*0008*/	uint8	unknown0008[5];	// Seen 0
-/*0013*/	//char	member_name[0];	// Null Terminated?
+/*0013*/	//char	membername[0];	// Null Terminated?
 /*0000*/	uint8	unknown0013[3];	// Seen 0
 /*0000*/	uint32	unknown0016;	// Matches unknown0132 from GroupFollow_Struct
 /*0000*/	uint8	unknown0020[11];	// Seen 0
@@ -436,7 +436,7 @@ namespace SoF

 	ENCODE(OP_DeleteCharge)
 	{
-		Log(Logs::Detail, Logs::Netcode, "SoF::ENCODE(OP_DeleteCharge)");
+		Log(Logs::Moderate, Logs::Netcode, "SoF::ENCODE(OP_DeleteCharge)");

 		ENCODE_FORWARD(OP_MoveItem);
 	}
@@ -923,7 +923,7 @@ namespace SoF
 		ENCODE_LENGTH_EXACT(LootingItem_Struct);
 		SETUP_DIRECT_ENCODE(LootingItem_Struct, structs::LootingItem_Struct);

-		Log(Logs::Detail, Logs::Netcode, "SoF::ENCODE(OP_LootItem)");
+		Log(Logs::Moderate, Logs::Netcode, "SoF::ENCODE(OP_LootItem)");

 		OUT(lootee);
 		OUT(looter);
@@ -954,7 +954,7 @@ namespace SoF
 		ENCODE_LENGTH_EXACT(MoveItem_Struct);
 		SETUP_DIRECT_ENCODE(MoveItem_Struct, structs::MoveItem_Struct);

-		Log(Logs::Detail, Logs::Netcode, "SoF::ENCODE(OP_MoveItem)");
+		Log(Logs::Moderate, Logs::Netcode, "SoF::ENCODE(OP_MoveItem)");

 		eq->from_slot = ServerToSoFSlot(emu->from_slot);
 		eq->to_slot = ServerToSoFSlot(emu->to_slot);
@@ -2095,13 +2095,13 @@ namespace SoF
 			}
 			else
 			{
-			val = Strings::ToInt(&emu->lastName[2]);
+			val = atoi(&emu->lastName[2]);
 			}
 			}
 			else
 			{
 			sep[0] = nullptr;
-			ofs = Strings::ToInt(&emu->lastName[2]);
+			ofs = atoi(&emu->lastName[2]);
 			sep[0] = '=';
 			if ((sep[1] < '0') || (sep[1] > '9'))
 			{
@@ -2109,7 +2109,7 @@ namespace SoF
 			}
 			else
 			{
-			val = Strings::ToInt(&sep[1]);
+			val = atoi(&sep[1]);
 			}
 			}

@@ -2631,7 +2631,7 @@ namespace SoF
 		DECODE_LENGTH_EXACT(structs::LootingItem_Struct);
 		SETUP_DIRECT_DECODE(LootingItem_Struct, structs::LootingItem_Struct);

-		Log(Logs::Detail, Logs::Netcode, "SoF::DECODE(OP_LootItem)");
+		Log(Logs::Moderate, Logs::Netcode, "SoF::DECODE(OP_LootItem)");

 		IN(lootee);
 		IN(looter);
@@ -2646,7 +2646,7 @@ namespace SoF
 		DECODE_LENGTH_EXACT(structs::MoveItem_Struct);
 		SETUP_DIRECT_DECODE(MoveItem_Struct, structs::MoveItem_Struct);

-		Log(Logs::Detail, Logs::Netcode, "SoF::DECODE(OP_MoveItem)");
+		Log(Logs::Moderate, Logs::Netcode, "SoF::DECODE(OP_MoveItem)");

 		emu->from_slot = SoFToServerSlot(eq->from_slot);
 		emu->to_slot = SoFToServerSlot(eq->to_slot);
@@ -380,7 +380,7 @@ namespace Titanium

 	ENCODE(OP_DeleteCharge)
 	{
-		Log(Logs::Detail, Logs::Netcode, "Titanium::ENCODE(OP_DeleteCharge)");
+		Log(Logs::Moderate, Logs::Netcode, "Titanium::ENCODE(OP_DeleteCharge)");

 		ENCODE_FORWARD(OP_MoveItem);
 	}
@@ -890,7 +890,7 @@ namespace Titanium
 		ENCODE_LENGTH_EXACT(LootingItem_Struct);
 		SETUP_DIRECT_ENCODE(LootingItem_Struct, structs::LootingItem_Struct);

-		Log(Logs::Detail, Logs::Netcode, "Titanium::ENCODE(OP_LootItem)");
+		Log(Logs::Moderate, Logs::Netcode, "Titanium::ENCODE(OP_LootItem)");

 		OUT(lootee);
 		OUT(looter);
@@ -934,7 +934,7 @@ namespace Titanium
 		ENCODE_LENGTH_EXACT(MoveItem_Struct);
 		SETUP_DIRECT_ENCODE(MoveItem_Struct, structs::MoveItem_Struct);

-		Log(Logs::Detail, Logs::Netcode, "Titanium::ENCODE(OP_MoveItem)");
+		Log(Logs::Moderate, Logs::Netcode, "Titanium::ENCODE(OP_MoveItem)");

 		eq->from_slot = ServerToTitaniumSlot(emu->from_slot);
 		eq->to_slot = ServerToTitaniumSlot(emu->to_slot);
@@ -2178,7 +2178,7 @@ namespace Titanium
 		DECODE_LENGTH_EXACT(structs::LootingItem_Struct);
 		SETUP_DIRECT_DECODE(LootingItem_Struct, structs::LootingItem_Struct);

-		Log(Logs::Detail, Logs::Netcode, "Titanium::DECODE(OP_LootItem)");
+		Log(Logs::Moderate, Logs::Netcode, "Titanium::DECODE(OP_LootItem)");

 		IN(lootee);
 		IN(looter);
@@ -2193,7 +2193,7 @@ namespace Titanium
 		DECODE_LENGTH_EXACT(structs::MoveItem_Struct);
 		SETUP_DIRECT_DECODE(MoveItem_Struct, structs::MoveItem_Struct);

-		Log(Logs::Detail, Logs::Netcode, "Titanium::DECODE(OP_MoveItem)");
+		Log(Logs::Moderate, Logs::Netcode, "Titanium::DECODE(OP_MoveItem)");

 		emu->from_slot = TitaniumToServerSlot(eq->from_slot);
 		emu->to_slot = TitaniumToServerSlot(eq->to_slot);
@@ -579,7 +579,7 @@ namespace UF

 	ENCODE(OP_DeleteCharge)
 	{
-		Log(Logs::Detail, Logs::Netcode, "UF::ENCODE(OP_DeleteCharge)");
+		Log(Logs::Moderate, Logs::Netcode, "UF::ENCODE(OP_DeleteCharge)");

 		ENCODE_FORWARD(OP_MoveItem);
 	}
@@ -927,7 +927,7 @@ namespace UF
 		{
 			if ((gjs->action == groupActDisband) || !strcmp(gjs->yourname, gjs->membername))
 			{
-				//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, member_name = %s", gjs->yourname, gjs->member_name);
+				//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, membername = %s", gjs->yourname, gjs->membername);

 				auto outapp =
 				    new EQApplicationPacket(OP_GroupDisbandYou, sizeof(structs::GroupGeneric_Struct));
@@ -947,7 +947,7 @@ namespace UF
 				return;
 			}
 			//if(gjs->action == groupActLeave)
-			//	Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, member_name = %s", gjs->yourname, gjs->member_name);
+			//	Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, membername = %s", gjs->yourname, gjs->membername);

 			auto outapp =
 			    new EQApplicationPacket(OP_GroupDisbandOther, sizeof(structs::GroupGeneric_Struct));
@@ -977,7 +977,7 @@ namespace UF

 			for (int i = 0; i < 5; ++i)
 			{
-				//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Membername[%i] is %s", i,  gu2->member_name[i]);
+				//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Membername[%i] is %s", i,  gu2->membername[i]);
 				if (gu2->membername[i][0] != '\0')
 				{
 					PacketLength += (22 + strlen(gu2->membername[i]) + 1);
@@ -1045,7 +1045,7 @@ namespace UF
 			delete in;
 			return;
 		}
-		//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Generic GroupUpdate, yourname = %s, member_name = %s", gjs->yourname, gjs->member_name);
+		//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Generic GroupUpdate, yourname = %s, membername = %s", gjs->yourname, gjs->membername);
 		ENCODE_LENGTH_EXACT(GroupJoin_Struct);
 		SETUP_DIRECT_ENCODE(GroupJoin_Struct, structs::GroupJoin_Struct);

@@ -1349,7 +1349,7 @@ namespace UF
 		ENCODE_LENGTH_EXACT(LootingItem_Struct);
 		SETUP_DIRECT_ENCODE(LootingItem_Struct, structs::LootingItem_Struct);

-		Log(Logs::Detail, Logs::Netcode, "UF::ENCODE(OP_LootItem)");
+		Log(Logs::Moderate, Logs::Netcode, "UF::ENCODE(OP_LootItem)");

 		OUT(lootee);
 		OUT(looter);
@@ -1502,7 +1502,7 @@ namespace UF
 		ENCODE_LENGTH_EXACT(MoveItem_Struct);
 		SETUP_DIRECT_ENCODE(MoveItem_Struct, structs::MoveItem_Struct);

-		Log(Logs::Detail, Logs::Netcode, "UF::ENCODE(OP_MoveItem)");
+		Log(Logs::Moderate, Logs::Netcode, "UF::ENCODE(OP_MoveItem)");

 		eq->from_slot = ServerToUFSlot(emu->from_slot);
 		eq->to_slot = ServerToUFSlot(emu->to_slot);
@@ -2739,7 +2739,7 @@ namespace UF
 			}

 			float SpawnSize = emu->size;
-			if (!((emu->NPC == 0) || (emu->race <= RACE_GNOME_12) || (emu->race == RACE_IKSAR_128) ||
+			if (!((emu->NPC == 0) || (emu->race <= RACE_GNOME_12) || (emu->race == RACE_IKSAR_128) || 
 					(emu->race == RACE_VAH_SHIR_130) || (emu->race == RACE_FROGLOK_330) || (emu->race == RACE_DRAKKIN_522))
 				)
 			{
@@ -2942,7 +2942,7 @@ namespace UF

 			Buffer += sizeof(structs::Spawn_Struct_Position);

-			if ((emu->NPC == 0) || (emu->race <= RACE_GNOME_12) || (emu->race == RACE_IKSAR_128) ||
+			if ((emu->NPC == 0) || (emu->race <= RACE_GNOME_12) || (emu->race == RACE_IKSAR_128) || 
 					(emu->race == RACE_VAH_SHIR_130) || (emu->race == RACE_FROGLOK_330) || (emu->race == RACE_DRAKKIN_522)
 				)
 			{
@@ -2978,7 +2978,7 @@ namespace UF
 				VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 0);
 			}

-			if ((emu->NPC == 0) || (emu->race <= RACE_GNOME_12) || (emu->race == RACE_IKSAR_128) ||
+			if ((emu->NPC == 0) || (emu->race <= RACE_GNOME_12) || (emu->race == RACE_IKSAR_128) || 
 					(emu->race == RACE_VAH_SHIR_130) || (emu->race == RACE_FROGLOK_330) || (emu->race == RACE_DRAKKIN_522)
 				)
 			{
@@ -3584,7 +3584,7 @@ namespace UF
 		DECODE_LENGTH_EXACT(structs::LootingItem_Struct);
 		SETUP_DIRECT_DECODE(LootingItem_Struct, structs::LootingItem_Struct);

-		Log(Logs::Detail, Logs::Netcode, "UF::DECODE(OP_LootItem)");
+		Log(Logs::Moderate, Logs::Netcode, "UF::DECODE(OP_LootItem)");

 		IN(lootee);
 		IN(looter);
@@ -3599,7 +3599,7 @@ namespace UF
 		DECODE_LENGTH_EXACT(structs::MoveItem_Struct);
 		SETUP_DIRECT_DECODE(MoveItem_Struct, structs::MoveItem_Struct);

-		Log(Logs::Detail, Logs::Netcode, "UF::DECODE(OP_MoveItem)");
+		Log(Logs::Moderate, Logs::Netcode, "UF::DECODE(OP_MoveItem)");

 		emu->from_slot = UFToServerSlot(eq->from_slot);
 		emu->to_slot = UFToServerSlot(eq->to_slot);
@@ -2128,7 +2128,7 @@ struct GroupUpdate_Struct_Underfoot {	// New for Underfoot

 struct GroupMembers_Struct {	// New for Underfoot
 /*0000*/	uint32	membernumber;	// Guess - number of member in the group (0 to 5?)
-/*0000*/	//char	member_name[0];	// Member Name Null Terminated
+/*0000*/	//char	membername[0];	// Member Name Null Terminated
 /*0000*/	uint8	unknown001[3];	// Seen 0
 /*0000*/	uint32	memberlevel;	// Guess
 /*0000*/	uint8	unknown002[11];	// Seen 0
@@ -2138,7 +2138,7 @@ struct GroupJoin_Struct_Underfoot {	// New for Underfoot
 /*0000*/	uint32	unknown0000;	// Matches unknown0136 from GroupFollow_Struct
 /*0004*/	uint32	action;
 /*0008*/	uint8	unknown0008[5];	// Seen 0
-/*0013*/	//char	member_name[0];	// Null Terminated?
+/*0013*/	//char	membername[0];	// Null Terminated?
 /*0000*/	uint8	unknown0013[3];	// Seen 0
 /*0000*/	uint32	unknown0016;	// Matches unknown0132 from GroupFollow_Struct
 /*0000*/	uint8	unknown0020[11];	// Seen 0
@@ -20,19 +20,12 @@ void PathManager::LoadPaths()
 {
 	m_server_path = File::FindEqemuConfigPath();

-	if (!m_server_path.empty()) {
-		std::filesystem::current_path(m_server_path);
-	}
+	std::filesystem::current_path(m_server_path);

-	if (m_server_path.empty()) {
-		LogInfo("Failed to load server path");
-		return;
-	}
-
-	LogInfo("server [{}]", m_server_path);
+	LogInfo("[PathManager] server [{}]", m_server_path);

 	if (!EQEmuConfig::LoadConfig()) {
-		LogError("Failed to load eqemu config");
+		LogError("[PathManager] Failed to load eqemu config");
 		return;
 	}

@@ -84,14 +77,14 @@ void PathManager::LoadPaths()
 		m_log_path = fs::relative(fs::path{m_server_path + "/" + c->LogDir}).string();
 	}

-	LogInfo("logs path [{}]", m_log_path);
-	LogInfo("lua mods path [{}]", m_lua_mods_path);
-	LogInfo("lua_modules path [{}]", m_lua_modules_path);
-	LogInfo("maps path [{}]", m_maps_path);
-	LogInfo("patches path [{}]", m_patch_path);
-	LogInfo("plugins path [{}]", m_plugins_path);
-	LogInfo("quests path [{}]", m_quests_path);
-	LogInfo("shared_memory path [{}]", m_shared_memory_path);
+	LogInfo("[PathManager] logs [{}]", m_log_path);
+	LogInfo("[PathManager] lua mods [{}]", m_lua_mods_path);
+	LogInfo("[PathManager] lua_modules [{}]", m_lua_modules_path);
+	LogInfo("[PathManager] maps [{}]", m_maps_path);
+	LogInfo("[PathManager] patches [{}]", m_patch_path);
+	LogInfo("[PathManager] plugins [{}]", m_plugins_path);
+	LogInfo("[PathManager] quests [{}]", m_quests_path);
+	LogInfo("[PathManager] shared_memory [{}]", m_shared_memory_path);
 }

 const std::string &PathManager::GetServerPath() const
@@ -22,31 +22,26 @@

 EQEmuExePlatform exe_platform = ExePlatformNone;

-void RegisterExecutablePlatform(EQEmuExePlatform p)
-{
+void RegisterExecutablePlatform(EQEmuExePlatform p) {
 	exe_platform = p;
 }

-const EQEmuExePlatform &GetExecutablePlatform()
-{
+const EQEmuExePlatform& GetExecutablePlatform() {
 	return exe_platform;
 }

-int GetExecutablePlatformInt()
-{
+/**
+ * @return
+ */
+int GetExecutablePlatformInt(){
 	return exe_platform;
 }

-bool IsWorld()
-{
-	return exe_platform == EQEmuExePlatform::ExePlatformWorld;
-}
-
-bool IsQueryServ()
-{
-	return exe_platform == EQEmuExePlatform::ExePlatformQueryServ;
-}
-
+/**
+ * Returns platform name by string
+ *
+ * @return
+ */
 std::string GetPlatformName()
 {
 	switch (GetExecutablePlatformInt()) {
@@ -60,12 +55,14 @@ std::string GetPlatformName()
 			return "UCS";
 		case EQEmuExePlatform::ExePlatformLogin:
 			return "Login";
+		case EQEmuExePlatform::ExePlatformSocket_Server:
+			return "SocketServer";
 		case EQEmuExePlatform::ExePlatformSharedMemory:
-			return "SharedMem";
+			return "SharedMemory";
 		case EQEmuExePlatform::ExePlatformClientImport:
-			return "Import";
+			return "ClientImport";
 		case EQEmuExePlatform::ExePlatformClientExport:
-			return "Export";
+			return "ClientExport";
 		case EQEmuExePlatform::ExePlatformLaunch:
 			return "Launch";
 		case EQEmuExePlatform::ExePlatformHC:
@@ -44,7 +44,5 @@ void RegisterExecutablePlatform(EQEmuExePlatform p);
 const EQEmuExePlatform& GetExecutablePlatform();
 int GetExecutablePlatformInt();
 std::string GetPlatformName();
-bool IsWorld();
-bool IsQueryServ();

 #endif
@@ -64,7 +64,7 @@ void ProcLauncher::Process() {
 		if(GetExitCodeProcess(cur->second->proc_info.hProcess, &res)) {
 			//got exit code, see if its still running...
 			if(res == STILL_ACTIVE) {
-				++cur;
+				cur++;
 				continue;
 			}
 			//else, it died, handle properly
@@ -76,7 +76,7 @@ void ProcLauncher::Process() {

 		//if we get here, the current process died.
 		tmp = cur;
-		++tmp;
+		tmp++;
 		ProcessTerminated(cur);
 		cur = tmp;
 	}
@@ -174,7 +174,7 @@ ProcLauncher::ProcRef ProcLauncher::Launch(Spec *&to_launch) {
 	std::vector<std::string>::iterator cur, end;
 	cur = it->args.begin();
 	end = it->args.end();
-	for(; cur != end; ++cur) {
+	for(; cur != end; cur++) {
 		args += " ";
 		args += *cur;
 	}
@@ -306,7 +306,7 @@ void ProcLauncher::TerminateAll(bool final) {
 		std::map<ProcRef, Spec *>::iterator cur, end;
 		cur = m_running.begin();
 		end = m_running.end();
-		for(; cur != end; ++cur) {
+		for(; cur != end; cur++) {
 			Terminate(cur->first, true);
 		}
 	} else {
@@ -317,7 +317,7 @@ void ProcLauncher::TerminateAll(bool final) {
 		std::map<ProcRef, Spec *>::iterator cur, end;
 		cur = running.begin();
 		end = running.end();
-		for(; cur != end; ++cur) {
+		for(; cur != end; cur++) {
 			Terminate(cur->first, true);
 			safe_delete(cur->second);
 		}
@@ -18,7 +18,6 @@
 */

 #include "profanity_manager.h"
-#include "eqemu_logsys.h"
 #include "dbcore.h"
 #include "strings.h"

@@ -236,8 +235,6 @@ bool EQ::ProfanityManager::load_database_entries(DBcore *db) {
 		}
 	}

-	LogInfo("Loaded [{}] profanity entries", Strings::Commify(profanity_list.size()));
-
 	return true;
 }

@@ -258,7 +255,7 @@ bool EQ::ProfanityManager::clear_database_entries(DBcore *db) {
 	return true;
 }

-bool EQ::ProfanityManager::check_for_existing_entry(const std::string& profanity) {
+bool EQ::ProfanityManager::check_for_existing_entry(std::string profanity) {
 	if (profanity.empty()) {
 		return false;
 	}
@@ -53,7 +53,7 @@ namespace EQ
 	private:
 		static bool load_database_entries(DBcore *db);
 		static bool clear_database_entries(DBcore *db);
-		static bool check_for_existing_entry(const std::string& profanity);
+		static bool check_for_existing_entry(std::string profanity);
 		
 	};

@@ -288,9 +288,9 @@ bool PTimerList::Load(Database *db) {
 	PersistentTimer *cur;

    for (auto row = results.begin(); row != results.end(); ++row) {
-		type = Strings::ToUnsignedInt(row[0]);
-		start_time = Strings::ToUnsignedInt(row[1]);
-		timer_time = Strings::ToUnsignedInt(row[2]);
+		type = atoi(row[0]);
+		start_time = strtoul(row[1], nullptr, 10);
+		timer_time = strtoul(row[2], nullptr, 10);
 		enabled = (row[3][0] == '1');

 		//if it expired allready, dont bother.
@@ -69,7 +69,6 @@ public:
 		int32_t     expansion_bitmask;
 		uint8_t     enforce_spell_settings;
 		uint8_t     archery_setting;
-		uint32_t    caster_range;
 	};

 	static std::string PrimaryKey()
@@ -130,7 +129,6 @@ public:
 			"expansion_bitmask",
 			"enforce_spell_settings",
 			"archery_setting",
-			"caster_range",
 		};
 	}

@@ -187,7 +185,6 @@ public:
 			"expansion_bitmask",
 			"enforce_spell_settings",
 			"archery_setting",
-			"caster_range",
 		};
 	}

@@ -278,7 +275,6 @@ public:
 		e.expansion_bitmask      = -1;
 		e.enforce_spell_settings = 0;
 		e.archery_setting        = 0;
-		e.caster_range           = 0;

 		return e;
 	}
@@ -365,7 +361,6 @@ public:
 			e.expansion_bitmask      = static_cast<int32_t>(atoi(row[47]));
 			e.enforce_spell_settings = static_cast<uint8_t>(strtoul(row[48], nullptr, 10));
 			e.archery_setting        = static_cast<uint8_t>(strtoul(row[49], nullptr, 10));
-			e.caster_range           = static_cast<uint32_t>(strtoul(row[50], nullptr, 10));

 			return e;
 		}
@@ -448,7 +443,6 @@ public:
 		v.push_back(columns[47] + " = " + std::to_string(e.expansion_bitmask));
 		v.push_back(columns[48] + " = " + std::to_string(e.enforce_spell_settings));
 		v.push_back(columns[49] + " = " + std::to_string(e.archery_setting));
-		v.push_back(columns[50] + " = " + std::to_string(e.caster_range));

 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -520,7 +514,6 @@ public:
 		v.push_back(std::to_string(e.expansion_bitmask));
 		v.push_back(std::to_string(e.enforce_spell_settings));
 		v.push_back(std::to_string(e.archery_setting));
-		v.push_back(std::to_string(e.caster_range));

 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -600,7 +593,6 @@ public:
 			v.push_back(std::to_string(e.expansion_bitmask));
 			v.push_back(std::to_string(e.enforce_spell_settings));
 			v.push_back(std::to_string(e.archery_setting));
-			v.push_back(std::to_string(e.caster_range));

 			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
 		}
@@ -684,7 +676,6 @@ public:
 			e.expansion_bitmask      = static_cast<int32_t>(atoi(row[47]));
 			e.enforce_spell_settings = static_cast<uint8_t>(strtoul(row[48], nullptr, 10));
 			e.archery_setting        = static_cast<uint8_t>(strtoul(row[49], nullptr, 10));
-			e.caster_range           = static_cast<uint32_t>(strtoul(row[50], nullptr, 10));

 			all_entries.push_back(e);
 		}
@@ -759,7 +750,6 @@ public:
 			e.expansion_bitmask      = static_cast<int32_t>(atoi(row[47]));
 			e.enforce_spell_settings = static_cast<uint8_t>(strtoul(row[48], nullptr, 10));
 			e.archery_setting        = static_cast<uint8_t>(strtoul(row[49], nullptr, 10));
-			e.caster_range           = static_cast<uint32_t>(strtoul(row[50], nullptr, 10));

 			all_entries.push_back(e);
 		}
@@ -1,364 +0,0 @@
-/**
- * DO NOT MODIFY THIS FILE
- *
- * This repository was automatically generated and is NOT to be modified directly.
- * Any repository modifications are meant to be made to the repository extending the base.
- * Any modifications to base repositories are to be made by the generator only
- *
- * @generator ./utils/scripts/generators/repository-generator.pl
- * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
- */
-
-#ifndef EQEMU_BASE_CHATCHANNELS_REPOSITORY_H
-#define EQEMU_BASE_CHATCHANNELS_REPOSITORY_H
-
-#include "../../database.h"
-#include "../../strings.h"
-#include <ctime>
-
-
-class BaseChatchannelsRepository {
-public:
-	struct Chatchannels {
-		int32_t     id;
-		std::string name;
-		std::string owner;
-		std::string password;
-		int32_t     minstatus;
-	};
-
-	static std::string PrimaryKey()
-	{
-		return std::string("id");
-	}
-
-	static std::vector<std::string> Columns()
-	{
-		return {
-			"id",
-			"name",
-			"owner",
-			"password",
-			"minstatus",
-		};
-	}
-
-	static std::vector<std::string> SelectColumns()
-	{
-		return {
-			"id",
-			"name",
-			"owner",
-			"password",
-			"minstatus",
-		};
-	}
-
-	static std::string ColumnsRaw()
-	{
-		return std::string(Strings::Implode(", ", Columns()));
-	}
-
-	static std::string SelectColumnsRaw()
-	{
-		return std::string(Strings::Implode(", ", SelectColumns()));
-	}
-
-	static std::string TableName()
-	{
-		return std::string("chatchannels");
-	}
-
-	static std::string BaseSelect()
-	{
-		return fmt::format(
-			"SELECT {} FROM {}",
-			SelectColumnsRaw(),
-			TableName()
-		);
-	}
-
-	static std::string BaseInsert()
-	{
-		return fmt::format(
-			"INSERT INTO {} ({}) ",
-			TableName(),
-			ColumnsRaw()
-		);
-	}
-
-	static Chatchannels NewEntity()
-	{
-		Chatchannels e{};
-
-		e.id        = 0;
-		e.name      = "";
-		e.owner     = "";
-		e.password  = "";
-		e.minstatus = 0;
-
-		return e;
-	}
-
-	static Chatchannels GetChatchannels(
-		const std::vector<Chatchannels> &chatchannelss,
-		int chatchannels_id
-	)
-	{
-		for (auto &chatchannels : chatchannelss) {
-			if (chatchannels.id == chatchannels_id) {
-				return chatchannels;
-			}
-		}
-
-		return NewEntity();
-	}
-
-	static Chatchannels FindOne(
-		Database& db,
-		int chatchannels_id
-	)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} WHERE {} = {} LIMIT 1",
-				BaseSelect(),
-				PrimaryKey(),
-				chatchannels_id
-			)
-		);
-
-		auto row = results.begin();
-		if (results.RowCount() == 1) {
-			Chatchannels e{};
-
-			e.id        = static_cast<int32_t>(atoi(row[0]));
-			e.name      = row[1] ? row[1] : "";
-			e.owner     = row[2] ? row[2] : "";
-			e.password  = row[3] ? row[3] : "";
-			e.minstatus = static_cast<int32_t>(atoi(row[4]));
-
-			return e;
-		}
-
-		return NewEntity();
-	}
-
-	static int DeleteOne(
-		Database& db,
-		int chatchannels_id
-	)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"DELETE FROM {} WHERE {} = {}",
-				TableName(),
-				PrimaryKey(),
-				chatchannels_id
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int UpdateOne(
-		Database& db,
-		const Chatchannels &e
-	)
-	{
-		std::vector<std::string> v;
-
-		auto columns = Columns();
-
-		v.push_back(columns[1] + " = '" + Strings::Escape(e.name) + "'");
-		v.push_back(columns[2] + " = '" + Strings::Escape(e.owner) + "'");
-		v.push_back(columns[3] + " = '" + Strings::Escape(e.password) + "'");
-		v.push_back(columns[4] + " = " + std::to_string(e.minstatus));
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"UPDATE {} SET {} WHERE {} = {}",
-				TableName(),
-				Strings::Implode(", ", v),
-				PrimaryKey(),
-				e.id
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static Chatchannels InsertOne(
-		Database& db,
-		Chatchannels e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.id));
-		v.push_back("'" + Strings::Escape(e.name) + "'");
-		v.push_back("'" + Strings::Escape(e.owner) + "'");
-		v.push_back("'" + Strings::Escape(e.password) + "'");
-		v.push_back(std::to_string(e.minstatus));
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				BaseInsert(),
-				Strings::Implode(",", v)
-			)
-		);
-
-		if (results.Success()) {
-			e.id = results.LastInsertedID();
-			return e;
-		}
-
-		e = NewEntity();
-
-		return e;
-	}
-
-	static int InsertMany(
-		Database& db,
-		const std::vector<Chatchannels> &entries
-	)
-	{
-		std::vector<std::string> insert_chunks;
-
-		for (auto &e: entries) {
-			std::vector<std::string> v;
-
-			v.push_back(std::to_string(e.id));
-			v.push_back("'" + Strings::Escape(e.name) + "'");
-			v.push_back("'" + Strings::Escape(e.owner) + "'");
-			v.push_back("'" + Strings::Escape(e.password) + "'");
-			v.push_back(std::to_string(e.minstatus));
-
-			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
-		}
-
-		std::vector<std::string> v;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseInsert(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static std::vector<Chatchannels> All(Database& db)
-	{
-		std::vector<Chatchannels> all_entries;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{}",
-				BaseSelect()
-			)
-		);
-
-		all_entries.reserve(results.RowCount());
-
-		for (auto row = results.begin(); row != results.end(); ++row) {
-			Chatchannels e{};
-
-			e.id        = static_cast<int32_t>(atoi(row[0]));
-			e.name      = row[1] ? row[1] : "";
-			e.owner     = row[2] ? row[2] : "";
-			e.password  = row[3] ? row[3] : "";
-			e.minstatus = static_cast<int32_t>(atoi(row[4]));
-
-			all_entries.push_back(e);
-		}
-
-		return all_entries;
-	}
-
-	static std::vector<Chatchannels> GetWhere(Database& db, const std::string &where_filter)
-	{
-		std::vector<Chatchannels> all_entries;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} WHERE {}",
-				BaseSelect(),
-				where_filter
-			)
-		);
-
-		all_entries.reserve(results.RowCount());
-
-		for (auto row = results.begin(); row != results.end(); ++row) {
-			Chatchannels e{};
-
-			e.id        = static_cast<int32_t>(atoi(row[0]));
-			e.name      = row[1] ? row[1] : "";
-			e.owner     = row[2] ? row[2] : "";
-			e.password  = row[3] ? row[3] : "";
-			e.minstatus = static_cast<int32_t>(atoi(row[4]));
-
-			all_entries.push_back(e);
-		}
-
-		return all_entries;
-	}
-
-	static int DeleteWhere(Database& db, const std::string &where_filter)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"DELETE FROM {} WHERE {}",
-				TableName(),
-				where_filter
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int Truncate(Database& db)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"TRUNCATE TABLE {}",
-				TableName()
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int64 GetMaxId(Database& db)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"SELECT COALESCE(MAX({}), 0) FROM {}",
-				PrimaryKey(),
-				TableName()
-			)
-		);
-
-		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
-	}
-
-	static int64 Count(Database& db, const std::string &where_filter = "")
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"SELECT COUNT(*) FROM {} {}",
-				TableName(),
-				(where_filter.empty() ? "" : "WHERE " + where_filter)
-			)
-		);
-
-		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
-	}
-
-};
-
-#endif //EQEMU_BASE_CHATCHANNELS_REPOSITORY_H
@@ -16,12 +16,11 @@
 #include "../../strings.h"
 #include <ctime>

-
 class BaseDataBucketsRepository {
 public:
 	struct DataBuckets {
 		uint64_t    id;
-		std::string key_;
+		std::string key;
 		std::string value;
 		uint32_t    expires;
 	};
@@ -35,7 +34,7 @@ public:
 	{
 		return {
 			"id",
-			"`key`",
+			"key",
 			"value",
 			"expires",
 		};
@@ -45,7 +44,7 @@ public:
 	{
 		return {
 			"id",
-			"`key`",
+			"key",
 			"value",
 			"expires",
 		};
@@ -89,7 +88,7 @@ public:
 		DataBuckets e{};

 		e.id      = 0;
-		e.key_    = "";
+		e.key     = "";
 		e.value   = "";
 		e.expires = 0;

@@ -117,9 +116,8 @@ public:
 	{
 		auto results = db.QueryDatabase(
 			fmt::format(
-				"{} WHERE {} = {} LIMIT 1",
+				"{} WHERE id = {} LIMIT 1",
 				BaseSelect(),
-				PrimaryKey(),
 				data_buckets_id
 			)
 		);
@@ -129,7 +127,7 @@ public:
 			DataBuckets e{};

 			e.id      = strtoull(row[0], nullptr, 10);
-			e.key_    = row[1] ? row[1] : "";
+			e.key     = row[1] ? row[1] : "";
 			e.value   = row[2] ? row[2] : "";
 			e.expires = static_cast<uint32_t>(strtoul(row[3], nullptr, 10));

@@ -165,7 +163,7 @@ public:

 		auto columns = Columns();

-		v.push_back(columns[1] + " = '" + Strings::Escape(e.key_) + "'");
+		v.push_back(columns[1] + " = '" + Strings::Escape(e.key) + "'");
 		v.push_back(columns[2] + " = '" + Strings::Escape(e.value) + "'");
 		v.push_back(columns[3] + " = " + std::to_string(e.expires));

@@ -190,7 +188,7 @@ public:
 		std::vector<std::string> v;

 		v.push_back(std::to_string(e.id));
-		v.push_back("'" + Strings::Escape(e.key_) + "'");
+		v.push_back("'" + Strings::Escape(e.key) + "'");
 		v.push_back("'" + Strings::Escape(e.value) + "'");
 		v.push_back(std::to_string(e.expires));

@@ -223,7 +221,7 @@ public:
 			std::vector<std::string> v;

 			v.push_back(std::to_string(e.id));
-			v.push_back("'" + Strings::Escape(e.key_) + "'");
+			v.push_back("'" + Strings::Escape(e.key) + "'");
 			v.push_back("'" + Strings::Escape(e.value) + "'");
 			v.push_back(std::to_string(e.expires));

@@ -260,7 +258,7 @@ public:
 			DataBuckets e{};

 			e.id      = strtoull(row[0], nullptr, 10);
-			e.key_    = row[1] ? row[1] : "";
+			e.key     = row[1] ? row[1] : "";
 			e.value   = row[2] ? row[2] : "";
 			e.expires = static_cast<uint32_t>(strtoul(row[3], nullptr, 10));

@@ -288,7 +286,7 @@ public:
 			DataBuckets e{};

 			e.id      = strtoull(row[0], nullptr, 10);
-			e.key_    = row[1] ? row[1] : "";
+			e.key     = row[1] ? row[1] : "";
 			e.value   = row[2] ? row[2] : "";
 			e.expires = static_cast<uint32_t>(strtoul(row[3], nullptr, 10));

@@ -0,0 +1,412 @@
+/**
+ * DO NOT MODIFY THIS FILE
+ *
+ * This repository was automatically generated and is NOT to be modified directly.
+ * Any repository modifications are meant to be made to the repository extending the base.
+ * Any modifications to base repositories are to be made by the generator only
+ *
+ * @generator ./utils/scripts/generators/repository-generator.pl
+ * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
+ */
+
+#ifndef EQEMU_BASE_EVENTLOG_REPOSITORY_H
+#define EQEMU_BASE_EVENTLOG_REPOSITORY_H
+
+#include "../../database.h"
+#include "../../strings.h"
+#include <ctime>
+
+class BaseEventlogRepository {
+public:
+	struct Eventlog {
+		uint32_t    id;
+		std::string accountname;
+		uint32_t    accountid;
+		int32_t     status;
+		std::string charname;
+		std::string target;
+		std::string time;
+		std::string descriptiontype;
+		std::string description;
+		int32_t     event_nid;
+	};
+
+	static std::string PrimaryKey()
+	{
+		return std::string("id");
+	}
+
+	static std::vector<std::string> Columns()
+	{
+		return {
+			"id",
+			"accountname",
+			"accountid",
+			"status",
+			"charname",
+			"target",
+			"time",
+			"descriptiontype",
+			"description",
+			"event_nid",
+		};
+	}
+
+	static std::vector<std::string> SelectColumns()
+	{
+		return {
+			"id",
+			"accountname",
+			"accountid",
+			"status",
+			"charname",
+			"target",
+			"time",
+			"descriptiontype",
+			"description",
+			"event_nid",
+		};
+	}
+
+	static std::string ColumnsRaw()
+	{
+		return std::string(Strings::Implode(", ", Columns()));
+	}
+
+	static std::string SelectColumnsRaw()
+	{
+		return std::string(Strings::Implode(", ", SelectColumns()));
+	}
+
+	static std::string TableName()
+	{
+		return std::string("eventlog");
+	}
+
+	static std::string BaseSelect()
+	{
+		return fmt::format(
+			"SELECT {} FROM {}",
+			SelectColumnsRaw(),
+			TableName()
+		);
+	}
+
+	static std::string BaseInsert()
+	{
+		return fmt::format(
+			"INSERT INTO {} ({}) ",
+			TableName(),
+			ColumnsRaw()
+		);
+	}
+
+	static Eventlog NewEntity()
+	{
+		Eventlog e{};
+
+		e.id              = 0;
+		e.accountname     = "";
+		e.accountid       = 0;
+		e.status          = 0;
+		e.charname        = "";
+		e.target          = "None";
+		e.time            = std::time(nullptr);
+		e.descriptiontype = "";
+		e.description     = "";
+		e.event_nid       = 0;
+
+		return e;
+	}
+
+	static Eventlog GetEventlog(
+		const std::vector<Eventlog> &eventlogs,
+		int eventlog_id
+	)
+	{
+		for (auto &eventlog : eventlogs) {
+			if (eventlog.id == eventlog_id) {
+				return eventlog;
+			}
+		}
+
+		return NewEntity();
+	}
+
+	static Eventlog FindOne(
+		Database& db,
+		int eventlog_id
+	)
+	{
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} WHERE id = {} LIMIT 1",
+				BaseSelect(),
+				eventlog_id
+			)
+		);
+
+		auto row = results.begin();
+		if (results.RowCount() == 1) {
+			Eventlog e{};
+
+			e.id              = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
+			e.accountname     = row[1] ? row[1] : "";
+			e.accountid       = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
+			e.status          = static_cast<int32_t>(atoi(row[3]));
+			e.charname        = row[4] ? row[4] : "";
+			e.target          = row[5] ? row[5] : "";
+			e.time            = row[6] ? row[6] : "";
+			e.descriptiontype = row[7] ? row[7] : "";
+			e.description     = row[8] ? row[8] : "";
+			e.event_nid       = static_cast<int32_t>(atoi(row[9]));
+
+			return e;
+		}
+
+		return NewEntity();
+	}
+
+	static int DeleteOne(
+		Database& db,
+		int eventlog_id
+	)
+	{
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"DELETE FROM {} WHERE {} = {}",
+				TableName(),
+				PrimaryKey(),
+				eventlog_id
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static int UpdateOne(
+		Database& db,
+		const Eventlog &e
+	)
+	{
+		std::vector<std::string> v;
+
+		auto columns = Columns();
+
+		v.push_back(columns[1] + " = '" + Strings::Escape(e.accountname) + "'");
+		v.push_back(columns[2] + " = " + std::to_string(e.accountid));
+		v.push_back(columns[3] + " = " + std::to_string(e.status));
+		v.push_back(columns[4] + " = '" + Strings::Escape(e.charname) + "'");
+		v.push_back(columns[5] + " = '" + Strings::Escape(e.target) + "'");
+		v.push_back(columns[6] + " = '" + Strings::Escape(e.time) + "'");
+		v.push_back(columns[7] + " = '" + Strings::Escape(e.descriptiontype) + "'");
+		v.push_back(columns[8] + " = '" + Strings::Escape(e.description) + "'");
+		v.push_back(columns[9] + " = " + std::to_string(e.event_nid));
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"UPDATE {} SET {} WHERE {} = {}",
+				TableName(),
+				Strings::Implode(", ", v),
+				PrimaryKey(),
+				e.id
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static Eventlog InsertOne(
+		Database& db,
+		Eventlog e
+	)
+	{
+		std::vector<std::string> v;
+
+		v.push_back(std::to_string(e.id));
+		v.push_back("'" + Strings::Escape(e.accountname) + "'");
+		v.push_back(std::to_string(e.accountid));
+		v.push_back(std::to_string(e.status));
+		v.push_back("'" + Strings::Escape(e.charname) + "'");
+		v.push_back("'" + Strings::Escape(e.target) + "'");
+		v.push_back("'" + Strings::Escape(e.time) + "'");
+		v.push_back("'" + Strings::Escape(e.descriptiontype) + "'");
+		v.push_back("'" + Strings::Escape(e.description) + "'");
+		v.push_back(std::to_string(e.event_nid));
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES ({})",
+				BaseInsert(),
+				Strings::Implode(",", v)
+			)
+		);
+
+		if (results.Success()) {
+			e.id = results.LastInsertedID();
+			return e;
+		}
+
+		e = NewEntity();
+
+		return e;
+	}
+
+	static int InsertMany(
+		Database& db,
+		const std::vector<Eventlog> &entries
+	)
+	{
+		std::vector<std::string> insert_chunks;
+
+		for (auto &e: entries) {
+			std::vector<std::string> v;
+
+			v.push_back(std::to_string(e.id));
+			v.push_back("'" + Strings::Escape(e.accountname) + "'");
+			v.push_back(std::to_string(e.accountid));
+			v.push_back(std::to_string(e.status));
+			v.push_back("'" + Strings::Escape(e.charname) + "'");
+			v.push_back("'" + Strings::Escape(e.target) + "'");
+			v.push_back("'" + Strings::Escape(e.time) + "'");
+			v.push_back("'" + Strings::Escape(e.descriptiontype) + "'");
+			v.push_back("'" + Strings::Escape(e.description) + "'");
+			v.push_back(std::to_string(e.event_nid));
+
+			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
+		}
+
+		std::vector<std::string> v;
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES {}",
+				BaseInsert(),
+				Strings::Implode(",", insert_chunks)
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static std::vector<Eventlog> All(Database& db)
+	{
+		std::vector<Eventlog> all_entries;
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{}",
+				BaseSelect()
+			)
+		);
+
+		all_entries.reserve(results.RowCount());
+
+		for (auto row = results.begin(); row != results.end(); ++row) {
+			Eventlog e{};
+
+			e.id              = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
+			e.accountname     = row[1] ? row[1] : "";
+			e.accountid       = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
+			e.status          = static_cast<int32_t>(atoi(row[3]));
+			e.charname        = row[4] ? row[4] : "";
+			e.target          = row[5] ? row[5] : "";
+			e.time            = row[6] ? row[6] : "";
+			e.descriptiontype = row[7] ? row[7] : "";
+			e.description     = row[8] ? row[8] : "";
+			e.event_nid       = static_cast<int32_t>(atoi(row[9]));
+
+			all_entries.push_back(e);
+		}
+
+		return all_entries;
+	}
+
+	static std::vector<Eventlog> GetWhere(Database& db, const std::string &where_filter)
+	{
+		std::vector<Eventlog> all_entries;
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} WHERE {}",
+				BaseSelect(),
+				where_filter
+			)
+		);
+
+		all_entries.reserve(results.RowCount());
+
+		for (auto row = results.begin(); row != results.end(); ++row) {
+			Eventlog e{};
+
+			e.id              = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
+			e.accountname     = row[1] ? row[1] : "";
+			e.accountid       = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
+			e.status          = static_cast<int32_t>(atoi(row[3]));
+			e.charname        = row[4] ? row[4] : "";
+			e.target          = row[5] ? row[5] : "";
+			e.time            = row[6] ? row[6] : "";
+			e.descriptiontype = row[7] ? row[7] : "";
+			e.description     = row[8] ? row[8] : "";
+			e.event_nid       = static_cast<int32_t>(atoi(row[9]));
+
+			all_entries.push_back(e);
+		}
+
+		return all_entries;
+	}
+
+	static int DeleteWhere(Database& db, const std::string &where_filter)
+	{
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"DELETE FROM {} WHERE {}",
+				TableName(),
+				where_filter
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static int Truncate(Database& db)
+	{
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"TRUNCATE TABLE {}",
+				TableName()
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static int64 GetMaxId(Database& db)
+	{
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"SELECT COALESCE(MAX({}), 0) FROM {}",
+				PrimaryKey(),
+				TableName()
+			)
+		);
+
+		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
+	}
+
+	static int64 Count(Database& db, const std::string &where_filter = "")
+	{
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"SELECT COUNT(*) FROM {} {}",
+				TableName(),
+				(where_filter.empty() ? "" : "WHERE " + where_filter)
+			)
+		);
+
+		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
+	}
+
+};
+
+#endif //EQEMU_BASE_EVENTLOG_REPOSITORY_H
@@ -9,19 +9,22 @@
 * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
 */

-#ifndef EQEMU_BASE_CHATCHANNEL_RESERVED_NAMES_REPOSITORY_H
-#define EQEMU_BASE_CHATCHANNEL_RESERVED_NAMES_REPOSITORY_H
+#ifndef EQEMU_BASE_HACKERS_REPOSITORY_H
+#define EQEMU_BASE_HACKERS_REPOSITORY_H

 #include "../../database.h"
 #include "../../strings.h"
 #include <ctime>

-
-class BaseChatchannelReservedNamesRepository {
+class BaseHackersRepository {
 public:
-	struct ChatchannelReservedNames {
+	struct Hackers {
 		int32_t     id;
+		std::string account;
 		std::string name;
+		std::string hacked;
+		std::string zone;
+		std::string date;
 	};

 	static std::string PrimaryKey()
@@ -33,7 +36,11 @@ public:
 	{
 		return {
 			"id",
+			"account",
 			"name",
+			"hacked",
+			"zone",
+			"date",
 		};
 	}

@@ -41,7 +48,11 @@ public:
 	{
 		return {
 			"id",
+			"account",
 			"name",
+			"hacked",
+			"zone",
+			"date",
 		};
 	}

@@ -57,7 +68,7 @@ public:

 	static std::string TableName()
 	{
-		return std::string("chatchannel_reserved_names");
+		return std::string("hackers");
 	}

 	static std::string BaseSelect()
@@ -78,50 +89,57 @@ public:
 		);
 	}

-	static ChatchannelReservedNames NewEntity()
+	static Hackers NewEntity()
 	{
-		ChatchannelReservedNames e{};
+		Hackers e{};

-		e.id   = 0;
-		e.name = "";
+		e.id      = 0;
+		e.account = "";
+		e.name    = "";
+		e.hacked  = "";
+		e.zone    = "";
+		e.date    = std::time(nullptr);

 		return e;
 	}

-	static ChatchannelReservedNames GetChatchannelReservedNames(
-		const std::vector<ChatchannelReservedNames> &chatchannel_reserved_namess,
-		int chatchannel_reserved_names_id
+	static Hackers GetHackers(
+		const std::vector<Hackers> &hackerss,
+		int hackers_id
 	)
 	{
-		for (auto &chatchannel_reserved_names : chatchannel_reserved_namess) {
-			if (chatchannel_reserved_names.id == chatchannel_reserved_names_id) {
-				return chatchannel_reserved_names;
+		for (auto &hackers : hackerss) {
+			if (hackers.id == hackers_id) {
+				return hackers;
 			}
 		}

 		return NewEntity();
 	}

-	static ChatchannelReservedNames FindOne(
+	static Hackers FindOne(
 		Database& db,
-		int chatchannel_reserved_names_id
+		int hackers_id
 	)
 	{
 		auto results = db.QueryDatabase(
 			fmt::format(
-				"{} WHERE {} = {} LIMIT 1",
+				"{} WHERE id = {} LIMIT 1",
 				BaseSelect(),
-				PrimaryKey(),
-				chatchannel_reserved_names_id
+				hackers_id
 			)
 		);

 		auto row = results.begin();
 		if (results.RowCount() == 1) {
-			ChatchannelReservedNames e{};
+			Hackers e{};

-			e.id   = static_cast<int32_t>(atoi(row[0]));
-			e.name = row[1] ? row[1] : "";
+			e.id      = static_cast<int32_t>(atoi(row[0]));
+			e.account = row[1] ? row[1] : "";
+			e.name    = row[2] ? row[2] : "";
+			e.hacked  = row[3] ? row[3] : "";
+			e.zone    = row[4] ? row[4] : "";
+			e.date    = row[5] ? row[5] : "";

 			return e;
 		}
@@ -131,7 +149,7 @@ public:

 	static int DeleteOne(
 		Database& db,
-		int chatchannel_reserved_names_id
+		int hackers_id
 	)
 	{
 		auto results = db.QueryDatabase(
@@ -139,7 +157,7 @@ public:
 				"DELETE FROM {} WHERE {} = {}",
 				TableName(),
 				PrimaryKey(),
-				chatchannel_reserved_names_id
+				hackers_id
 			)
 		);

@@ -148,14 +166,18 @@ public:

 	static int UpdateOne(
 		Database& db,
-		const ChatchannelReservedNames &e
+		const Hackers &e
 	)
 	{
 		std::vector<std::string> v;

 		auto columns = Columns();

-		v.push_back(columns[1] + " = '" + Strings::Escape(e.name) + "'");
+		v.push_back(columns[1] + " = '" + Strings::Escape(e.account) + "'");
+		v.push_back(columns[2] + " = '" + Strings::Escape(e.name) + "'");
+		v.push_back(columns[3] + " = '" + Strings::Escape(e.hacked) + "'");
+		v.push_back(columns[4] + " = '" + Strings::Escape(e.zone) + "'");
+		v.push_back(columns[5] + " = '" + Strings::Escape(e.date) + "'");

 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -170,15 +192,19 @@ public:
 		return (results.Success() ? results.RowsAffected() : 0);
 	}

-	static ChatchannelReservedNames InsertOne(
+	static Hackers InsertOne(
 		Database& db,
-		ChatchannelReservedNames e
+		Hackers e
 	)
 	{
 		std::vector<std::string> v;

 		v.push_back(std::to_string(e.id));
+		v.push_back("'" + Strings::Escape(e.account) + "'");
 		v.push_back("'" + Strings::Escape(e.name) + "'");
+		v.push_back("'" + Strings::Escape(e.hacked) + "'");
+		v.push_back("'" + Strings::Escape(e.zone) + "'");
+		v.push_back("'" + Strings::Escape(e.date) + "'");

 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -200,7 +226,7 @@ public:

 	static int InsertMany(
 		Database& db,
-		const std::vector<ChatchannelReservedNames> &entries
+		const std::vector<Hackers> &entries
 	)
 	{
 		std::vector<std::string> insert_chunks;
@@ -209,7 +235,11 @@ public:
 			std::vector<std::string> v;

 			v.push_back(std::to_string(e.id));
+			v.push_back("'" + Strings::Escape(e.account) + "'");
 			v.push_back("'" + Strings::Escape(e.name) + "'");
+			v.push_back("'" + Strings::Escape(e.hacked) + "'");
+			v.push_back("'" + Strings::Escape(e.zone) + "'");
+			v.push_back("'" + Strings::Escape(e.date) + "'");

 			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
 		}
@@ -227,9 +257,9 @@ public:
 		return (results.Success() ? results.RowsAffected() : 0);
 	}

-	static std::vector<ChatchannelReservedNames> All(Database& db)
+	static std::vector<Hackers> All(Database& db)
 	{
-		std::vector<ChatchannelReservedNames> all_entries;
+		std::vector<Hackers> all_entries;

 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -241,10 +271,14 @@ public:
 		all_entries.reserve(results.RowCount());

 		for (auto row = results.begin(); row != results.end(); ++row) {
-			ChatchannelReservedNames e{};
+			Hackers e{};

-			e.id   = static_cast<int32_t>(atoi(row[0]));
-			e.name = row[1] ? row[1] : "";
+			e.id      = static_cast<int32_t>(atoi(row[0]));
+			e.account = row[1] ? row[1] : "";
+			e.name    = row[2] ? row[2] : "";
+			e.hacked  = row[3] ? row[3] : "";
+			e.zone    = row[4] ? row[4] : "";
+			e.date    = row[5] ? row[5] : "";

 			all_entries.push_back(e);
 		}
@@ -252,9 +286,9 @@ public:
 		return all_entries;
 	}

-	static std::vector<ChatchannelReservedNames> GetWhere(Database& db, const std::string &where_filter)
+	static std::vector<Hackers> GetWhere(Database& db, const std::string &where_filter)
 	{
-		std::vector<ChatchannelReservedNames> all_entries;
+		std::vector<Hackers> all_entries;

 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -267,10 +301,14 @@ public:
 		all_entries.reserve(results.RowCount());

 		for (auto row = results.begin(); row != results.end(); ++row) {
-			ChatchannelReservedNames e{};
+			Hackers e{};

-			e.id   = static_cast<int32_t>(atoi(row[0]));
-			e.name = row[1] ? row[1] : "";
+			e.id      = static_cast<int32_t>(atoi(row[0]));
+			e.account = row[1] ? row[1] : "";
+			e.name    = row[2] ? row[2] : "";
+			e.hacked  = row[3] ? row[3] : "";
+			e.zone    = row[4] ? row[4] : "";
+			e.date    = row[5] ? row[5] : "";

 			all_entries.push_back(e);
 		}
@@ -331,4 +369,4 @@ public:

 };

-#endif //EQEMU_BASE_CHATCHANNEL_RESERVED_NAMES_REPOSITORY_H
+#endif //EQEMU_BASE_HACKERS_REPOSITORY_H
@@ -1,414 +0,0 @@
-/**
- * DO NOT MODIFY THIS FILE
- *
- * This repository was automatically generated and is NOT to be modified directly.
- * Any repository modifications are meant to be made to the repository extending the base.
- * Any modifications to base repositories are to be made by the generator only
- *
- * @generator ./utils/scripts/generators/repository-generator.pl
- * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
- */
-
-#ifndef EQEMU_BASE_MERC_ARMORINFO_REPOSITORY_H
-#define EQEMU_BASE_MERC_ARMORINFO_REPOSITORY_H
-
-#include "../../database.h"
-#include "../../strings.h"
-#include <ctime>
-
-
-class BaseMercArmorinfoRepository {
-public:
-	struct MercArmorinfo {
-		int32_t  id;
-		uint32_t merc_npc_type_id;
-		uint8_t  minlevel;
-		uint8_t  maxlevel;
-		uint8_t  texture;
-		uint8_t  helmtexture;
-		uint32_t armortint_id;
-		uint8_t  armortint_red;
-		uint8_t  armortint_green;
-		uint8_t  armortint_blue;
-	};
-
-	static std::string PrimaryKey()
-	{
-		return std::string("id");
-	}
-
-	static std::vector<std::string> Columns()
-	{
-		return {
-			"id",
-			"merc_npc_type_id",
-			"minlevel",
-			"maxlevel",
-			"texture",
-			"helmtexture",
-			"armortint_id",
-			"armortint_red",
-			"armortint_green",
-			"armortint_blue",
-		};
-	}
-
-	static std::vector<std::string> SelectColumns()
-	{
-		return {
-			"id",
-			"merc_npc_type_id",
-			"minlevel",
-			"maxlevel",
-			"texture",
-			"helmtexture",
-			"armortint_id",
-			"armortint_red",
-			"armortint_green",
-			"armortint_blue",
-		};
-	}
-
-	static std::string ColumnsRaw()
-	{
-		return std::string(Strings::Implode(", ", Columns()));
-	}
-
-	static std::string SelectColumnsRaw()
-	{
-		return std::string(Strings::Implode(", ", SelectColumns()));
-	}
-
-	static std::string TableName()
-	{
-		return std::string("merc_armorinfo");
-	}
-
-	static std::string BaseSelect()
-	{
-		return fmt::format(
-			"SELECT {} FROM {}",
-			SelectColumnsRaw(),
-			TableName()
-		);
-	}
-
-	static std::string BaseInsert()
-	{
-		return fmt::format(
-			"INSERT INTO {} ({}) ",
-			TableName(),
-			ColumnsRaw()
-		);
-	}
-
-	static MercArmorinfo NewEntity()
-	{
-		MercArmorinfo e{};
-
-		e.id               = 0;
-		e.merc_npc_type_id = 0;
-		e.minlevel         = 1;
-		e.maxlevel         = 255;
-		e.texture          = 0;
-		e.helmtexture      = 0;
-		e.armortint_id     = 0;
-		e.armortint_red    = 0;
-		e.armortint_green  = 0;
-		e.armortint_blue   = 0;
-
-		return e;
-	}
-
-	static MercArmorinfo GetMercArmorinfo(
-		const std::vector<MercArmorinfo> &merc_armorinfos,
-		int merc_armorinfo_id
-	)
-	{
-		for (auto &merc_armorinfo : merc_armorinfos) {
-			if (merc_armorinfo.id == merc_armorinfo_id) {
-				return merc_armorinfo;
-			}
-		}
-
-		return NewEntity();
-	}
-
-	static MercArmorinfo FindOne(
-		Database& db,
-		int merc_armorinfo_id
-	)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} WHERE {} = {} LIMIT 1",
-				BaseSelect(),
-				PrimaryKey(),
-				merc_armorinfo_id
-			)
-		);
-
-		auto row = results.begin();
-		if (results.RowCount() == 1) {
-			MercArmorinfo e{};
-
-			e.id               = static_cast<int32_t>(atoi(row[0]));
-			e.merc_npc_type_id = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
-			e.minlevel         = static_cast<uint8_t>(strtoul(row[2], nullptr, 10));
-			e.maxlevel         = static_cast<uint8_t>(strtoul(row[3], nullptr, 10));
-			e.texture          = static_cast<uint8_t>(strtoul(row[4], nullptr, 10));
-			e.helmtexture      = static_cast<uint8_t>(strtoul(row[5], nullptr, 10));
-			e.armortint_id     = static_cast<uint32_t>(strtoul(row[6], nullptr, 10));
-			e.armortint_red    = static_cast<uint8_t>(strtoul(row[7], nullptr, 10));
-			e.armortint_green  = static_cast<uint8_t>(strtoul(row[8], nullptr, 10));
-			e.armortint_blue   = static_cast<uint8_t>(strtoul(row[9], nullptr, 10));
-
-			return e;
-		}
-
-		return NewEntity();
-	}
-
-	static int DeleteOne(
-		Database& db,
-		int merc_armorinfo_id
-	)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"DELETE FROM {} WHERE {} = {}",
-				TableName(),
-				PrimaryKey(),
-				merc_armorinfo_id
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int UpdateOne(
-		Database& db,
-		const MercArmorinfo &e
-	)
-	{
-		std::vector<std::string> v;
-
-		auto columns = Columns();
-
-		v.push_back(columns[1] + " = " + std::to_string(e.merc_npc_type_id));
-		v.push_back(columns[2] + " = " + std::to_string(e.minlevel));
-		v.push_back(columns[3] + " = " + std::to_string(e.maxlevel));
-		v.push_back(columns[4] + " = " + std::to_string(e.texture));
-		v.push_back(columns[5] + " = " + std::to_string(e.helmtexture));
-		v.push_back(columns[6] + " = " + std::to_string(e.armortint_id));
-		v.push_back(columns[7] + " = " + std::to_string(e.armortint_red));
-		v.push_back(columns[8] + " = " + std::to_string(e.armortint_green));
-		v.push_back(columns[9] + " = " + std::to_string(e.armortint_blue));
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"UPDATE {} SET {} WHERE {} = {}",
-				TableName(),
-				Strings::Implode(", ", v),
-				PrimaryKey(),
-				e.id
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static MercArmorinfo InsertOne(
-		Database& db,
-		MercArmorinfo e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.id));
-		v.push_back(std::to_string(e.merc_npc_type_id));
-		v.push_back(std::to_string(e.minlevel));
-		v.push_back(std::to_string(e.maxlevel));
-		v.push_back(std::to_string(e.texture));
-		v.push_back(std::to_string(e.helmtexture));
-		v.push_back(std::to_string(e.armortint_id));
-		v.push_back(std::to_string(e.armortint_red));
-		v.push_back(std::to_string(e.armortint_green));
-		v.push_back(std::to_string(e.armortint_blue));
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				BaseInsert(),
-				Strings::Implode(",", v)
-			)
-		);
-
-		if (results.Success()) {
-			e.id = results.LastInsertedID();
-			return e;
-		}
-
-		e = NewEntity();
-
-		return e;
-	}
-
-	static int InsertMany(
-		Database& db,
-		const std::vector<MercArmorinfo> &entries
-	)
-	{
-		std::vector<std::string> insert_chunks;
-
-		for (auto &e: entries) {
-			std::vector<std::string> v;
-
-			v.push_back(std::to_string(e.id));
-			v.push_back(std::to_string(e.merc_npc_type_id));
-			v.push_back(std::to_string(e.minlevel));
-			v.push_back(std::to_string(e.maxlevel));
-			v.push_back(std::to_string(e.texture));
-			v.push_back(std::to_string(e.helmtexture));
-			v.push_back(std::to_string(e.armortint_id));
-			v.push_back(std::to_string(e.armortint_red));
-			v.push_back(std::to_string(e.armortint_green));
-			v.push_back(std::to_string(e.armortint_blue));
-
-			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
-		}
-
-		std::vector<std::string> v;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseInsert(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static std::vector<MercArmorinfo> All(Database& db)
-	{
-		std::vector<MercArmorinfo> all_entries;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{}",
-				BaseSelect()
-			)
-		);
-
-		all_entries.reserve(results.RowCount());
-
-		for (auto row = results.begin(); row != results.end(); ++row) {
-			MercArmorinfo e{};
-
-			e.id               = static_cast<int32_t>(atoi(row[0]));
-			e.merc_npc_type_id = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
-			e.minlevel         = static_cast<uint8_t>(strtoul(row[2], nullptr, 10));
-			e.maxlevel         = static_cast<uint8_t>(strtoul(row[3], nullptr, 10));
-			e.texture          = static_cast<uint8_t>(strtoul(row[4], nullptr, 10));
-			e.helmtexture      = static_cast<uint8_t>(strtoul(row[5], nullptr, 10));
-			e.armortint_id     = static_cast<uint32_t>(strtoul(row[6], nullptr, 10));
-			e.armortint_red    = static_cast<uint8_t>(strtoul(row[7], nullptr, 10));
-			e.armortint_green  = static_cast<uint8_t>(strtoul(row[8], nullptr, 10));
-			e.armortint_blue   = static_cast<uint8_t>(strtoul(row[9], nullptr, 10));
-
-			all_entries.push_back(e);
-		}
-
-		return all_entries;
-	}
-
-	static std::vector<MercArmorinfo> GetWhere(Database& db, const std::string &where_filter)
-	{
-		std::vector<MercArmorinfo> all_entries;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} WHERE {}",
-				BaseSelect(),
-				where_filter
-			)
-		);
-
-		all_entries.reserve(results.RowCount());
-
-		for (auto row = results.begin(); row != results.end(); ++row) {
-			MercArmorinfo e{};
-
-			e.id               = static_cast<int32_t>(atoi(row[0]));
-			e.merc_npc_type_id = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
-			e.minlevel         = static_cast<uint8_t>(strtoul(row[2], nullptr, 10));
-			e.maxlevel         = static_cast<uint8_t>(strtoul(row[3], nullptr, 10));
-			e.texture          = static_cast<uint8_t>(strtoul(row[4], nullptr, 10));
-			e.helmtexture      = static_cast<uint8_t>(strtoul(row[5], nullptr, 10));
-			e.armortint_id     = static_cast<uint32_t>(strtoul(row[6], nullptr, 10));
-			e.armortint_red    = static_cast<uint8_t>(strtoul(row[7], nullptr, 10));
-			e.armortint_green  = static_cast<uint8_t>(strtoul(row[8], nullptr, 10));
-			e.armortint_blue   = static_cast<uint8_t>(strtoul(row[9], nullptr, 10));
-
-			all_entries.push_back(e);
-		}
-
-		return all_entries;
-	}
-
-	static int DeleteWhere(Database& db, const std::string &where_filter)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"DELETE FROM {} WHERE {}",
-				TableName(),
-				where_filter
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int Truncate(Database& db)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"TRUNCATE TABLE {}",
-				TableName()
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int64 GetMaxId(Database& db)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"SELECT COALESCE(MAX({}), 0) FROM {}",
-				PrimaryKey(),
-				TableName()
-			)
-		);
-
-		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
-	}
-
-	static int64 Count(Database& db, const std::string &where_filter = "")
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"SELECT COUNT(*) FROM {} {}",
-				TableName(),
-				(where_filter.empty() ? "" : "WHERE " + where_filter)
-			)
-		);
-
-		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
-	}
-
-};
-
-#endif //EQEMU_BASE_MERC_ARMORINFO_REPOSITORY_H
@@ -1,504 +0,0 @@
-/**
- * DO NOT MODIFY THIS FILE
- *
- * This repository was automatically generated and is NOT to be modified directly.
- * Any repository modifications are meant to be made to the repository extending the base.
- * Any modifications to base repositories are to be made by the generator only
- *
- * @generator ./utils/scripts/generators/repository-generator.pl
- * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
- */
-
-#ifndef EQEMU_BASE_MERC_BUFFS_REPOSITORY_H
-#define EQEMU_BASE_MERC_BUFFS_REPOSITORY_H
-
-#include "../../database.h"
-#include "../../strings.h"
-#include <ctime>
-
-
-class BaseMercBuffsRepository {
-public:
-	struct MercBuffs {
-		uint32_t MercBuffId;
-		uint32_t MercId;
-		uint32_t SpellId;
-		uint32_t CasterLevel;
-		uint32_t DurationFormula;
-		int32_t  TicsRemaining;
-		uint32_t PoisonCounters;
-		uint32_t DiseaseCounters;
-		uint32_t CurseCounters;
-		uint32_t CorruptionCounters;
-		uint32_t HitCount;
-		uint32_t MeleeRune;
-		uint32_t MagicRune;
-		int32_t  dot_rune;
-		int32_t  caston_x;
-		int8_t   Persistent;
-		int32_t  caston_y;
-		int32_t  caston_z;
-		int32_t  ExtraDIChance;
-	};
-
-	static std::string PrimaryKey()
-	{
-		return std::string("MercBuffId");
-	}
-
-	static std::vector<std::string> Columns()
-	{
-		return {
-			"MercBuffId",
-			"MercId",
-			"SpellId",
-			"CasterLevel",
-			"DurationFormula",
-			"TicsRemaining",
-			"PoisonCounters",
-			"DiseaseCounters",
-			"CurseCounters",
-			"CorruptionCounters",
-			"HitCount",
-			"MeleeRune",
-			"MagicRune",
-			"dot_rune",
-			"caston_x",
-			"Persistent",
-			"caston_y",
-			"caston_z",
-			"ExtraDIChance",
-		};
-	}
-
-	static std::vector<std::string> SelectColumns()
-	{
-		return {
-			"MercBuffId",
-			"MercId",
-			"SpellId",
-			"CasterLevel",
-			"DurationFormula",
-			"TicsRemaining",
-			"PoisonCounters",
-			"DiseaseCounters",
-			"CurseCounters",
-			"CorruptionCounters",
-			"HitCount",
-			"MeleeRune",
-			"MagicRune",
-			"dot_rune",
-			"caston_x",
-			"Persistent",
-			"caston_y",
-			"caston_z",
-			"ExtraDIChance",
-		};
-	}
-
-	static std::string ColumnsRaw()
-	{
-		return std::string(Strings::Implode(", ", Columns()));
-	}
-
-	static std::string SelectColumnsRaw()
-	{
-		return std::string(Strings::Implode(", ", SelectColumns()));
-	}
-
-	static std::string TableName()
-	{
-		return std::string("merc_buffs");
-	}
-
-	static std::string BaseSelect()
-	{
-		return fmt::format(
-			"SELECT {} FROM {}",
-			SelectColumnsRaw(),
-			TableName()
-		);
-	}
-
-	static std::string BaseInsert()
-	{
-		return fmt::format(
-			"INSERT INTO {} ({}) ",
-			TableName(),
-			ColumnsRaw()
-		);
-	}
-
-	static MercBuffs NewEntity()
-	{
-		MercBuffs e{};
-
-		e.MercBuffId         = 0;
-		e.MercId             = 0;
-		e.SpellId            = 0;
-		e.CasterLevel        = 0;
-		e.DurationFormula    = 0;
-		e.TicsRemaining      = 0;
-		e.PoisonCounters     = 0;
-		e.DiseaseCounters    = 0;
-		e.CurseCounters      = 0;
-		e.CorruptionCounters = 0;
-		e.HitCount           = 0;
-		e.MeleeRune          = 0;
-		e.MagicRune          = 0;
-		e.dot_rune           = 0;
-		e.caston_x           = 0;
-		e.Persistent         = 0;
-		e.caston_y           = 0;
-		e.caston_z           = 0;
-		e.ExtraDIChance      = 0;
-
-		return e;
-	}
-
-	static MercBuffs GetMercBuffs(
-		const std::vector<MercBuffs> &merc_buffss,
-		int merc_buffs_id
-	)
-	{
-		for (auto &merc_buffs : merc_buffss) {
-			if (merc_buffs.MercBuffId == merc_buffs_id) {
-				return merc_buffs;
-			}
-		}
-
-		return NewEntity();
-	}
-
-	static MercBuffs FindOne(
-		Database& db,
-		int merc_buffs_id
-	)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} WHERE {} = {} LIMIT 1",
-				BaseSelect(),
-				PrimaryKey(),
-				merc_buffs_id
-			)
-		);
-
-		auto row = results.begin();
-		if (results.RowCount() == 1) {
-			MercBuffs e{};
-
-			e.MercBuffId         = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.MercId             = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
-			e.SpellId            = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
-			e.CasterLevel        = static_cast<uint32_t>(strtoul(row[3], nullptr, 10));
-			e.DurationFormula    = static_cast<uint32_t>(strtoul(row[4], nullptr, 10));
-			e.TicsRemaining      = static_cast<int32_t>(atoi(row[5]));
-			e.PoisonCounters     = static_cast<uint32_t>(strtoul(row[6], nullptr, 10));
-			e.DiseaseCounters    = static_cast<uint32_t>(strtoul(row[7], nullptr, 10));
-			e.CurseCounters      = static_cast<uint32_t>(strtoul(row[8], nullptr, 10));
-			e.CorruptionCounters = static_cast<uint32_t>(strtoul(row[9], nullptr, 10));
-			e.HitCount           = static_cast<uint32_t>(strtoul(row[10], nullptr, 10));
-			e.MeleeRune          = static_cast<uint32_t>(strtoul(row[11], nullptr, 10));
-			e.MagicRune          = static_cast<uint32_t>(strtoul(row[12], nullptr, 10));
-			e.dot_rune           = static_cast<int32_t>(atoi(row[13]));
-			e.caston_x           = static_cast<int32_t>(atoi(row[14]));
-			e.Persistent         = static_cast<int8_t>(atoi(row[15]));
-			e.caston_y           = static_cast<int32_t>(atoi(row[16]));
-			e.caston_z           = static_cast<int32_t>(atoi(row[17]));
-			e.ExtraDIChance      = static_cast<int32_t>(atoi(row[18]));
-
-			return e;
-		}
-
-		return NewEntity();
-	}
-
-	static int DeleteOne(
-		Database& db,
-		int merc_buffs_id
-	)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"DELETE FROM {} WHERE {} = {}",
-				TableName(),
-				PrimaryKey(),
-				merc_buffs_id
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int UpdateOne(
-		Database& db,
-		const MercBuffs &e
-	)
-	{
-		std::vector<std::string> v;
-
-		auto columns = Columns();
-
-		v.push_back(columns[1] + " = " + std::to_string(e.MercId));
-		v.push_back(columns[2] + " = " + std::to_string(e.SpellId));
-		v.push_back(columns[3] + " = " + std::to_string(e.CasterLevel));
-		v.push_back(columns[4] + " = " + std::to_string(e.DurationFormula));
-		v.push_back(columns[5] + " = " + std::to_string(e.TicsRemaining));
-		v.push_back(columns[6] + " = " + std::to_string(e.PoisonCounters));
-		v.push_back(columns[7] + " = " + std::to_string(e.DiseaseCounters));
-		v.push_back(columns[8] + " = " + std::to_string(e.CurseCounters));
-		v.push_back(columns[9] + " = " + std::to_string(e.CorruptionCounters));
-		v.push_back(columns[10] + " = " + std::to_string(e.HitCount));
-		v.push_back(columns[11] + " = " + std::to_string(e.MeleeRune));
-		v.push_back(columns[12] + " = " + std::to_string(e.MagicRune));
-		v.push_back(columns[13] + " = " + std::to_string(e.dot_rune));
-		v.push_back(columns[14] + " = " + std::to_string(e.caston_x));
-		v.push_back(columns[15] + " = " + std::to_string(e.Persistent));
-		v.push_back(columns[16] + " = " + std::to_string(e.caston_y));
-		v.push_back(columns[17] + " = " + std::to_string(e.caston_z));
-		v.push_back(columns[18] + " = " + std::to_string(e.ExtraDIChance));
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"UPDATE {} SET {} WHERE {} = {}",
-				TableName(),
-				Strings::Implode(", ", v),
-				PrimaryKey(),
-				e.MercBuffId
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static MercBuffs InsertOne(
-		Database& db,
-		MercBuffs e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.MercBuffId));
-		v.push_back(std::to_string(e.MercId));
-		v.push_back(std::to_string(e.SpellId));
-		v.push_back(std::to_string(e.CasterLevel));
-		v.push_back(std::to_string(e.DurationFormula));
-		v.push_back(std::to_string(e.TicsRemaining));
-		v.push_back(std::to_string(e.PoisonCounters));
-		v.push_back(std::to_string(e.DiseaseCounters));
-		v.push_back(std::to_string(e.CurseCounters));
-		v.push_back(std::to_string(e.CorruptionCounters));
-		v.push_back(std::to_string(e.HitCount));
-		v.push_back(std::to_string(e.MeleeRune));
-		v.push_back(std::to_string(e.MagicRune));
-		v.push_back(std::to_string(e.dot_rune));
-		v.push_back(std::to_string(e.caston_x));
-		v.push_back(std::to_string(e.Persistent));
-		v.push_back(std::to_string(e.caston_y));
-		v.push_back(std::to_string(e.caston_z));
-		v.push_back(std::to_string(e.ExtraDIChance));
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				BaseInsert(),
-				Strings::Implode(",", v)
-			)
-		);
-
-		if (results.Success()) {
-			e.MercBuffId = results.LastInsertedID();
-			return e;
-		}
-
-		e = NewEntity();
-
-		return e;
-	}
-
-	static int InsertMany(
-		Database& db,
-		const std::vector<MercBuffs> &entries
-	)
-	{
-		std::vector<std::string> insert_chunks;
-
-		for (auto &e: entries) {
-			std::vector<std::string> v;
-
-			v.push_back(std::to_string(e.MercBuffId));
-			v.push_back(std::to_string(e.MercId));
-			v.push_back(std::to_string(e.SpellId));
-			v.push_back(std::to_string(e.CasterLevel));
-			v.push_back(std::to_string(e.DurationFormula));
-			v.push_back(std::to_string(e.TicsRemaining));
-			v.push_back(std::to_string(e.PoisonCounters));
-			v.push_back(std::to_string(e.DiseaseCounters));
-			v.push_back(std::to_string(e.CurseCounters));
-			v.push_back(std::to_string(e.CorruptionCounters));
-			v.push_back(std::to_string(e.HitCount));
-			v.push_back(std::to_string(e.MeleeRune));
-			v.push_back(std::to_string(e.MagicRune));
-			v.push_back(std::to_string(e.dot_rune));
-			v.push_back(std::to_string(e.caston_x));
-			v.push_back(std::to_string(e.Persistent));
-			v.push_back(std::to_string(e.caston_y));
-			v.push_back(std::to_string(e.caston_z));
-			v.push_back(std::to_string(e.ExtraDIChance));
-
-			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
-		}
-
-		std::vector<std::string> v;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseInsert(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static std::vector<MercBuffs> All(Database& db)
-	{
-		std::vector<MercBuffs> all_entries;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{}",
-				BaseSelect()
-			)
-		);
-
-		all_entries.reserve(results.RowCount());
-
-		for (auto row = results.begin(); row != results.end(); ++row) {
-			MercBuffs e{};
-
-			e.MercBuffId         = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.MercId             = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
-			e.SpellId            = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
-			e.CasterLevel        = static_cast<uint32_t>(strtoul(row[3], nullptr, 10));
-			e.DurationFormula    = static_cast<uint32_t>(strtoul(row[4], nullptr, 10));
-			e.TicsRemaining      = static_cast<int32_t>(atoi(row[5]));
-			e.PoisonCounters     = static_cast<uint32_t>(strtoul(row[6], nullptr, 10));
-			e.DiseaseCounters    = static_cast<uint32_t>(strtoul(row[7], nullptr, 10));
-			e.CurseCounters      = static_cast<uint32_t>(strtoul(row[8], nullptr, 10));
-			e.CorruptionCounters = static_cast<uint32_t>(strtoul(row[9], nullptr, 10));
-			e.HitCount           = static_cast<uint32_t>(strtoul(row[10], nullptr, 10));
-			e.MeleeRune          = static_cast<uint32_t>(strtoul(row[11], nullptr, 10));
-			e.MagicRune          = static_cast<uint32_t>(strtoul(row[12], nullptr, 10));
-			e.dot_rune           = static_cast<int32_t>(atoi(row[13]));
-			e.caston_x           = static_cast<int32_t>(atoi(row[14]));
-			e.Persistent         = static_cast<int8_t>(atoi(row[15]));
-			e.caston_y           = static_cast<int32_t>(atoi(row[16]));
-			e.caston_z           = static_cast<int32_t>(atoi(row[17]));
-			e.ExtraDIChance      = static_cast<int32_t>(atoi(row[18]));
-
-			all_entries.push_back(e);
-		}
-
-		return all_entries;
-	}
-
-	static std::vector<MercBuffs> GetWhere(Database& db, const std::string &where_filter)
-	{
-		std::vector<MercBuffs> all_entries;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} WHERE {}",
-				BaseSelect(),
-				where_filter
-			)
-		);
-
-		all_entries.reserve(results.RowCount());
-
-		for (auto row = results.begin(); row != results.end(); ++row) {
-			MercBuffs e{};
-
-			e.MercBuffId         = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.MercId             = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
-			e.SpellId            = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
-			e.CasterLevel        = static_cast<uint32_t>(strtoul(row[3], nullptr, 10));
-			e.DurationFormula    = static_cast<uint32_t>(strtoul(row[4], nullptr, 10));
-			e.TicsRemaining      = static_cast<int32_t>(atoi(row[5]));
-			e.PoisonCounters     = static_cast<uint32_t>(strtoul(row[6], nullptr, 10));
-			e.DiseaseCounters    = static_cast<uint32_t>(strtoul(row[7], nullptr, 10));
-			e.CurseCounters      = static_cast<uint32_t>(strtoul(row[8], nullptr, 10));
-			e.CorruptionCounters = static_cast<uint32_t>(strtoul(row[9], nullptr, 10));
-			e.HitCount           = static_cast<uint32_t>(strtoul(row[10], nullptr, 10));
-			e.MeleeRune          = static_cast<uint32_t>(strtoul(row[11], nullptr, 10));
-			e.MagicRune          = static_cast<uint32_t>(strtoul(row[12], nullptr, 10));
-			e.dot_rune           = static_cast<int32_t>(atoi(row[13]));
-			e.caston_x           = static_cast<int32_t>(atoi(row[14]));
-			e.Persistent         = static_cast<int8_t>(atoi(row[15]));
-			e.caston_y           = static_cast<int32_t>(atoi(row[16]));
-			e.caston_z           = static_cast<int32_t>(atoi(row[17]));
-			e.ExtraDIChance      = static_cast<int32_t>(atoi(row[18]));
-
-			all_entries.push_back(e);
-		}
-
-		return all_entries;
-	}
-
-	static int DeleteWhere(Database& db, const std::string &where_filter)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"DELETE FROM {} WHERE {}",
-				TableName(),
-				where_filter
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int Truncate(Database& db)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"TRUNCATE TABLE {}",
-				TableName()
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int64 GetMaxId(Database& db)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"SELECT COALESCE(MAX({}), 0) FROM {}",
-				PrimaryKey(),
-				TableName()
-			)
-		);
-
-		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
-	}
-
-	static int64 Count(Database& db, const std::string &where_filter = "")
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"SELECT COUNT(*) FROM {} {}",
-				TableName(),
-				(where_filter.empty() ? "" : "WHERE " + where_filter)
-			)
-		);
-
-		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
-	}
-
-};
-
-#endif //EQEMU_BASE_MERC_BUFFS_REPOSITORY_H
@@ -1,364 +0,0 @@
-/**
- * DO NOT MODIFY THIS FILE
- *
- * This repository was automatically generated and is NOT to be modified directly.
- * Any repository modifications are meant to be made to the repository extending the base.
- * Any modifications to base repositories are to be made by the generator only
- *
- * @generator ./utils/scripts/generators/repository-generator.pl
- * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
- */
-
-#ifndef EQEMU_BASE_MERC_INVENTORY_REPOSITORY_H
-#define EQEMU_BASE_MERC_INVENTORY_REPOSITORY_H
-
-#include "../../database.h"
-#include "../../strings.h"
-#include <ctime>
-
-
-class BaseMercInventoryRepository {
-public:
-	struct MercInventory {
-		uint32_t merc_inventory_id;
-		uint32_t merc_subtype_id;
-		uint32_t item_id;
-		uint32_t min_level;
-		uint32_t max_level;
-	};
-
-	static std::string PrimaryKey()
-	{
-		return std::string("merc_inventory_id");
-	}
-
-	static std::vector<std::string> Columns()
-	{
-		return {
-			"merc_inventory_id",
-			"merc_subtype_id",
-			"item_id",
-			"min_level",
-			"max_level",
-		};
-	}
-
-	static std::vector<std::string> SelectColumns()
-	{
-		return {
-			"merc_inventory_id",
-			"merc_subtype_id",
-			"item_id",
-			"min_level",
-			"max_level",
-		};
-	}
-
-	static std::string ColumnsRaw()
-	{
-		return std::string(Strings::Implode(", ", Columns()));
-	}
-
-	static std::string SelectColumnsRaw()
-	{
-		return std::string(Strings::Implode(", ", SelectColumns()));
-	}
-
-	static std::string TableName()
-	{
-		return std::string("merc_inventory");
-	}
-
-	static std::string BaseSelect()
-	{
-		return fmt::format(
-			"SELECT {} FROM {}",
-			SelectColumnsRaw(),
-			TableName()
-		);
-	}
-
-	static std::string BaseInsert()
-	{
-		return fmt::format(
-			"INSERT INTO {} ({}) ",
-			TableName(),
-			ColumnsRaw()
-		);
-	}
-
-	static MercInventory NewEntity()
-	{
-		MercInventory e{};
-
-		e.merc_inventory_id = 0;
-		e.merc_subtype_id   = 0;
-		e.item_id           = 0;
-		e.min_level         = 0;
-		e.max_level         = 0;
-
-		return e;
-	}
-
-	static MercInventory GetMercInventory(
-		const std::vector<MercInventory> &merc_inventorys,
-		int merc_inventory_id
-	)
-	{
-		for (auto &merc_inventory : merc_inventorys) {
-			if (merc_inventory.merc_inventory_id == merc_inventory_id) {
-				return merc_inventory;
-			}
-		}
-
-		return NewEntity();
-	}
-
-	static MercInventory FindOne(
-		Database& db,
-		int merc_inventory_id
-	)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} WHERE {} = {} LIMIT 1",
-				BaseSelect(),
-				PrimaryKey(),
-				merc_inventory_id
-			)
-		);
-
-		auto row = results.begin();
-		if (results.RowCount() == 1) {
-			MercInventory e{};
-
-			e.merc_inventory_id = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.merc_subtype_id   = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
-			e.item_id           = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
-			e.min_level         = static_cast<uint32_t>(strtoul(row[3], nullptr, 10));
-			e.max_level         = static_cast<uint32_t>(strtoul(row[4], nullptr, 10));
-
-			return e;
-		}
-
-		return NewEntity();
-	}
-
-	static int DeleteOne(
-		Database& db,
-		int merc_inventory_id
-	)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"DELETE FROM {} WHERE {} = {}",
-				TableName(),
-				PrimaryKey(),
-				merc_inventory_id
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int UpdateOne(
-		Database& db,
-		const MercInventory &e
-	)
-	{
-		std::vector<std::string> v;
-
-		auto columns = Columns();
-
-		v.push_back(columns[1] + " = " + std::to_string(e.merc_subtype_id));
-		v.push_back(columns[2] + " = " + std::to_string(e.item_id));
-		v.push_back(columns[3] + " = " + std::to_string(e.min_level));
-		v.push_back(columns[4] + " = " + std::to_string(e.max_level));
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"UPDATE {} SET {} WHERE {} = {}",
-				TableName(),
-				Strings::Implode(", ", v),
-				PrimaryKey(),
-				e.merc_inventory_id
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static MercInventory InsertOne(
-		Database& db,
-		MercInventory e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.merc_inventory_id));
-		v.push_back(std::to_string(e.merc_subtype_id));
-		v.push_back(std::to_string(e.item_id));
-		v.push_back(std::to_string(e.min_level));
-		v.push_back(std::to_string(e.max_level));
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				BaseInsert(),
-				Strings::Implode(",", v)
-			)
-		);
-
-		if (results.Success()) {
-			e.merc_inventory_id = results.LastInsertedID();
-			return e;
-		}
-
-		e = NewEntity();
-
-		return e;
-	}
-
-	static int InsertMany(
-		Database& db,
-		const std::vector<MercInventory> &entries
-	)
-	{
-		std::vector<std::string> insert_chunks;
-
-		for (auto &e: entries) {
-			std::vector<std::string> v;
-
-			v.push_back(std::to_string(e.merc_inventory_id));
-			v.push_back(std::to_string(e.merc_subtype_id));
-			v.push_back(std::to_string(e.item_id));
-			v.push_back(std::to_string(e.min_level));
-			v.push_back(std::to_string(e.max_level));
-
-			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
-		}
-
-		std::vector<std::string> v;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseInsert(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static std::vector<MercInventory> All(Database& db)
-	{
-		std::vector<MercInventory> all_entries;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{}",
-				BaseSelect()
-			)
-		);
-
-		all_entries.reserve(results.RowCount());
-
-		for (auto row = results.begin(); row != results.end(); ++row) {
-			MercInventory e{};
-
-			e.merc_inventory_id = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.merc_subtype_id   = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
-			e.item_id           = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
-			e.min_level         = static_cast<uint32_t>(strtoul(row[3], nullptr, 10));
-			e.max_level         = static_cast<uint32_t>(strtoul(row[4], nullptr, 10));
-
-			all_entries.push_back(e);
-		}
-
-		return all_entries;
-	}
-
-	static std::vector<MercInventory> GetWhere(Database& db, const std::string &where_filter)
-	{
-		std::vector<MercInventory> all_entries;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} WHERE {}",
-				BaseSelect(),
-				where_filter
-			)
-		);
-
-		all_entries.reserve(results.RowCount());
-
-		for (auto row = results.begin(); row != results.end(); ++row) {
-			MercInventory e{};
-
-			e.merc_inventory_id = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.merc_subtype_id   = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
-			e.item_id           = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
-			e.min_level         = static_cast<uint32_t>(strtoul(row[3], nullptr, 10));
-			e.max_level         = static_cast<uint32_t>(strtoul(row[4], nullptr, 10));
-
-			all_entries.push_back(e);
-		}
-
-		return all_entries;
-	}
-
-	static int DeleteWhere(Database& db, const std::string &where_filter)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"DELETE FROM {} WHERE {}",
-				TableName(),
-				where_filter
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int Truncate(Database& db)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"TRUNCATE TABLE {}",
-				TableName()
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int64 GetMaxId(Database& db)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"SELECT COALESCE(MAX({}), 0) FROM {}",
-				PrimaryKey(),
-				TableName()
-			)
-		);
-
-		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
-	}
-
-	static int64 Count(Database& db, const std::string &where_filter = "")
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"SELECT COUNT(*) FROM {} {}",
-				TableName(),
-				(where_filter.empty() ? "" : "WHERE " + where_filter)
-			)
-		);
-
-		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
-	}
-
-};
-
-#endif //EQEMU_BASE_MERC_INVENTORY_REPOSITORY_H
@@ -1,344 +0,0 @@
-/**
- * DO NOT MODIFY THIS FILE
- *
- * This repository was automatically generated and is NOT to be modified directly.
- * Any repository modifications are meant to be made to the repository extending the base.
- * Any modifications to base repositories are to be made by the generator only
- *
- * @generator ./utils/scripts/generators/repository-generator.pl
- * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
- */
-
-#ifndef EQEMU_BASE_MERC_MERCHANT_ENTRIES_REPOSITORY_H
-#define EQEMU_BASE_MERC_MERCHANT_ENTRIES_REPOSITORY_H
-
-#include "../../database.h"
-#include "../../strings.h"
-#include <ctime>
-
-
-class BaseMercMerchantEntriesRepository {
-public:
-	struct MercMerchantEntries {
-		uint32_t merc_merchant_entry_id;
-		uint32_t merc_merchant_template_id;
-		uint32_t merchant_id;
-	};
-
-	static std::string PrimaryKey()
-	{
-		return std::string("merc_merchant_entry_id");
-	}
-
-	static std::vector<std::string> Columns()
-	{
-		return {
-			"merc_merchant_entry_id",
-			"merc_merchant_template_id",
-			"merchant_id",
-		};
-	}
-
-	static std::vector<std::string> SelectColumns()
-	{
-		return {
-			"merc_merchant_entry_id",
-			"merc_merchant_template_id",
-			"merchant_id",
-		};
-	}
-
-	static std::string ColumnsRaw()
-	{
-		return std::string(Strings::Implode(", ", Columns()));
-	}
-
-	static std::string SelectColumnsRaw()
-	{
-		return std::string(Strings::Implode(", ", SelectColumns()));
-	}
-
-	static std::string TableName()
-	{
-		return std::string("merc_merchant_entries");
-	}
-
-	static std::string BaseSelect()
-	{
-		return fmt::format(
-			"SELECT {} FROM {}",
-			SelectColumnsRaw(),
-			TableName()
-		);
-	}
-
-	static std::string BaseInsert()
-	{
-		return fmt::format(
-			"INSERT INTO {} ({}) ",
-			TableName(),
-			ColumnsRaw()
-		);
-	}
-
-	static MercMerchantEntries NewEntity()
-	{
-		MercMerchantEntries e{};
-
-		e.merc_merchant_entry_id    = 0;
-		e.merc_merchant_template_id = 0;
-		e.merchant_id               = 0;
-
-		return e;
-	}
-
-	static MercMerchantEntries GetMercMerchantEntries(
-		const std::vector<MercMerchantEntries> &merc_merchant_entriess,
-		int merc_merchant_entries_id
-	)
-	{
-		for (auto &merc_merchant_entries : merc_merchant_entriess) {
-			if (merc_merchant_entries.merc_merchant_entry_id == merc_merchant_entries_id) {
-				return merc_merchant_entries;
-			}
-		}
-
-		return NewEntity();
-	}
-
-	static MercMerchantEntries FindOne(
-		Database& db,
-		int merc_merchant_entries_id
-	)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} WHERE {} = {} LIMIT 1",
-				BaseSelect(),
-				PrimaryKey(),
-				merc_merchant_entries_id
-			)
-		);
-
-		auto row = results.begin();
-		if (results.RowCount() == 1) {
-			MercMerchantEntries e{};
-
-			e.merc_merchant_entry_id    = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.merc_merchant_template_id = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
-			e.merchant_id               = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
-
-			return e;
-		}
-
-		return NewEntity();
-	}
-
-	static int DeleteOne(
-		Database& db,
-		int merc_merchant_entries_id
-	)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"DELETE FROM {} WHERE {} = {}",
-				TableName(),
-				PrimaryKey(),
-				merc_merchant_entries_id
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int UpdateOne(
-		Database& db,
-		const MercMerchantEntries &e
-	)
-	{
-		std::vector<std::string> v;
-
-		auto columns = Columns();
-
-		v.push_back(columns[1] + " = " + std::to_string(e.merc_merchant_template_id));
-		v.push_back(columns[2] + " = " + std::to_string(e.merchant_id));
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"UPDATE {} SET {} WHERE {} = {}",
-				TableName(),
-				Strings::Implode(", ", v),
-				PrimaryKey(),
-				e.merc_merchant_entry_id
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static MercMerchantEntries InsertOne(
-		Database& db,
-		MercMerchantEntries e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.merc_merchant_entry_id));
-		v.push_back(std::to_string(e.merc_merchant_template_id));
-		v.push_back(std::to_string(e.merchant_id));
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				BaseInsert(),
-				Strings::Implode(",", v)
-			)
-		);
-
-		if (results.Success()) {
-			e.merc_merchant_entry_id = results.LastInsertedID();
-			return e;
-		}
-
-		e = NewEntity();
-
-		return e;
-	}
-
-	static int InsertMany(
-		Database& db,
-		const std::vector<MercMerchantEntries> &entries
-	)
-	{
-		std::vector<std::string> insert_chunks;
-
-		for (auto &e: entries) {
-			std::vector<std::string> v;
-
-			v.push_back(std::to_string(e.merc_merchant_entry_id));
-			v.push_back(std::to_string(e.merc_merchant_template_id));
-			v.push_back(std::to_string(e.merchant_id));
-
-			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
-		}
-
-		std::vector<std::string> v;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseInsert(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static std::vector<MercMerchantEntries> All(Database& db)
-	{
-		std::vector<MercMerchantEntries> all_entries;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{}",
-				BaseSelect()
-			)
-		);
-
-		all_entries.reserve(results.RowCount());
-
-		for (auto row = results.begin(); row != results.end(); ++row) {
-			MercMerchantEntries e{};
-
-			e.merc_merchant_entry_id    = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.merc_merchant_template_id = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
-			e.merchant_id               = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
-
-			all_entries.push_back(e);
-		}
-
-		return all_entries;
-	}
-
-	static std::vector<MercMerchantEntries> GetWhere(Database& db, const std::string &where_filter)
-	{
-		std::vector<MercMerchantEntries> all_entries;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} WHERE {}",
-				BaseSelect(),
-				where_filter
-			)
-		);
-
-		all_entries.reserve(results.RowCount());
-
-		for (auto row = results.begin(); row != results.end(); ++row) {
-			MercMerchantEntries e{};
-
-			e.merc_merchant_entry_id    = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.merc_merchant_template_id = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
-			e.merchant_id               = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
-
-			all_entries.push_back(e);
-		}
-
-		return all_entries;
-	}
-
-	static int DeleteWhere(Database& db, const std::string &where_filter)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"DELETE FROM {} WHERE {}",
-				TableName(),
-				where_filter
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int Truncate(Database& db)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"TRUNCATE TABLE {}",
-				TableName()
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int64 GetMaxId(Database& db)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"SELECT COALESCE(MAX({}), 0) FROM {}",
-				PrimaryKey(),
-				TableName()
-			)
-		);
-
-		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
-	}
-
-	static int64 Count(Database& db, const std::string &where_filter = "")
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"SELECT COUNT(*) FROM {} {}",
-				TableName(),
-				(where_filter.empty() ? "" : "WHERE " + where_filter)
-			)
-		);
-
-		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
-	}
-
-};
-
-#endif //EQEMU_BASE_MERC_MERCHANT_ENTRIES_REPOSITORY_H
@@ -1,344 +0,0 @@
-/**
- * DO NOT MODIFY THIS FILE
- *
- * This repository was automatically generated and is NOT to be modified directly.
- * Any repository modifications are meant to be made to the repository extending the base.
- * Any modifications to base repositories are to be made by the generator only
- *
- * @generator ./utils/scripts/generators/repository-generator.pl
- * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
- */
-
-#ifndef EQEMU_BASE_MERC_MERCHANT_TEMPLATE_ENTRIES_REPOSITORY_H
-#define EQEMU_BASE_MERC_MERCHANT_TEMPLATE_ENTRIES_REPOSITORY_H
-
-#include "../../database.h"
-#include "../../strings.h"
-#include <ctime>
-
-
-class BaseMercMerchantTemplateEntriesRepository {
-public:
-	struct MercMerchantTemplateEntries {
-		uint32_t merc_merchant_template_entry_id;
-		uint32_t merc_merchant_template_id;
-		uint32_t merc_template_id;
-	};
-
-	static std::string PrimaryKey()
-	{
-		return std::string("merc_merchant_template_entry_id");
-	}
-
-	static std::vector<std::string> Columns()
-	{
-		return {
-			"merc_merchant_template_entry_id",
-			"merc_merchant_template_id",
-			"merc_template_id",
-		};
-	}
-
-	static std::vector<std::string> SelectColumns()
-	{
-		return {
-			"merc_merchant_template_entry_id",
-			"merc_merchant_template_id",
-			"merc_template_id",
-		};
-	}
-
-	static std::string ColumnsRaw()
-	{
-		return std::string(Strings::Implode(", ", Columns()));
-	}
-
-	static std::string SelectColumnsRaw()
-	{
-		return std::string(Strings::Implode(", ", SelectColumns()));
-	}
-
-	static std::string TableName()
-	{
-		return std::string("merc_merchant_template_entries");
-	}
-
-	static std::string BaseSelect()
-	{
-		return fmt::format(
-			"SELECT {} FROM {}",
-			SelectColumnsRaw(),
-			TableName()
-		);
-	}
-
-	static std::string BaseInsert()
-	{
-		return fmt::format(
-			"INSERT INTO {} ({}) ",
-			TableName(),
-			ColumnsRaw()
-		);
-	}
-
-	static MercMerchantTemplateEntries NewEntity()
-	{
-		MercMerchantTemplateEntries e{};
-
-		e.merc_merchant_template_entry_id = 0;
-		e.merc_merchant_template_id       = 0;
-		e.merc_template_id                = 0;
-
-		return e;
-	}
-
-	static MercMerchantTemplateEntries GetMercMerchantTemplateEntries(
-		const std::vector<MercMerchantTemplateEntries> &merc_merchant_template_entriess,
-		int merc_merchant_template_entries_id
-	)
-	{
-		for (auto &merc_merchant_template_entries : merc_merchant_template_entriess) {
-			if (merc_merchant_template_entries.merc_merchant_template_entry_id == merc_merchant_template_entries_id) {
-				return merc_merchant_template_entries;
-			}
-		}
-
-		return NewEntity();
-	}
-
-	static MercMerchantTemplateEntries FindOne(
-		Database& db,
-		int merc_merchant_template_entries_id
-	)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} WHERE {} = {} LIMIT 1",
-				BaseSelect(),
-				PrimaryKey(),
-				merc_merchant_template_entries_id
-			)
-		);
-
-		auto row = results.begin();
-		if (results.RowCount() == 1) {
-			MercMerchantTemplateEntries e{};
-
-			e.merc_merchant_template_entry_id = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.merc_merchant_template_id       = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
-			e.merc_template_id                = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
-
-			return e;
-		}
-
-		return NewEntity();
-	}
-
-	static int DeleteOne(
-		Database& db,
-		int merc_merchant_template_entries_id
-	)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"DELETE FROM {} WHERE {} = {}",
-				TableName(),
-				PrimaryKey(),
-				merc_merchant_template_entries_id
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int UpdateOne(
-		Database& db,
-		const MercMerchantTemplateEntries &e
-	)
-	{
-		std::vector<std::string> v;
-
-		auto columns = Columns();
-
-		v.push_back(columns[1] + " = " + std::to_string(e.merc_merchant_template_id));
-		v.push_back(columns[2] + " = " + std::to_string(e.merc_template_id));
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"UPDATE {} SET {} WHERE {} = {}",
-				TableName(),
-				Strings::Implode(", ", v),
-				PrimaryKey(),
-				e.merc_merchant_template_entry_id
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static MercMerchantTemplateEntries InsertOne(
-		Database& db,
-		MercMerchantTemplateEntries e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.merc_merchant_template_entry_id));
-		v.push_back(std::to_string(e.merc_merchant_template_id));
-		v.push_back(std::to_string(e.merc_template_id));
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				BaseInsert(),
-				Strings::Implode(",", v)
-			)
-		);
-
-		if (results.Success()) {
-			e.merc_merchant_template_entry_id = results.LastInsertedID();
-			return e;
-		}
-
-		e = NewEntity();
-
-		return e;
-	}
-
-	static int InsertMany(
-		Database& db,
-		const std::vector<MercMerchantTemplateEntries> &entries
-	)
-	{
-		std::vector<std::string> insert_chunks;
-
-		for (auto &e: entries) {
-			std::vector<std::string> v;
-
-			v.push_back(std::to_string(e.merc_merchant_template_entry_id));
-			v.push_back(std::to_string(e.merc_merchant_template_id));
-			v.push_back(std::to_string(e.merc_template_id));
-
-			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
-		}
-
-		std::vector<std::string> v;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseInsert(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static std::vector<MercMerchantTemplateEntries> All(Database& db)
-	{
-		std::vector<MercMerchantTemplateEntries> all_entries;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{}",
-				BaseSelect()
-			)
-		);
-
-		all_entries.reserve(results.RowCount());
-
-		for (auto row = results.begin(); row != results.end(); ++row) {
-			MercMerchantTemplateEntries e{};
-
-			e.merc_merchant_template_entry_id = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.merc_merchant_template_id       = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
-			e.merc_template_id                = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
-
-			all_entries.push_back(e);
-		}
-
-		return all_entries;
-	}
-
-	static std::vector<MercMerchantTemplateEntries> GetWhere(Database& db, const std::string &where_filter)
-	{
-		std::vector<MercMerchantTemplateEntries> all_entries;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} WHERE {}",
-				BaseSelect(),
-				where_filter
-			)
-		);
-
-		all_entries.reserve(results.RowCount());
-
-		for (auto row = results.begin(); row != results.end(); ++row) {
-			MercMerchantTemplateEntries e{};
-
-			e.merc_merchant_template_entry_id = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.merc_merchant_template_id       = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
-			e.merc_template_id                = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
-
-			all_entries.push_back(e);
-		}
-
-		return all_entries;
-	}
-
-	static int DeleteWhere(Database& db, const std::string &where_filter)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"DELETE FROM {} WHERE {}",
-				TableName(),
-				where_filter
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int Truncate(Database& db)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"TRUNCATE TABLE {}",
-				TableName()
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int64 GetMaxId(Database& db)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"SELECT COALESCE(MAX({}), 0) FROM {}",
-				PrimaryKey(),
-				TableName()
-			)
-		);
-
-		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
-	}
-
-	static int64 Count(Database& db, const std::string &where_filter = "")
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"SELECT COUNT(*) FROM {} {}",
-				TableName(),
-				(where_filter.empty() ? "" : "WHERE " + where_filter)
-			)
-		);
-
-		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
-	}
-
-};
-
-#endif //EQEMU_BASE_MERC_MERCHANT_TEMPLATE_ENTRIES_REPOSITORY_H
@@ -1,344 +0,0 @@
-/**
- * DO NOT MODIFY THIS FILE
- *
- * This repository was automatically generated and is NOT to be modified directly.
- * Any repository modifications are meant to be made to the repository extending the base.
- * Any modifications to base repositories are to be made by the generator only
- *
- * @generator ./utils/scripts/generators/repository-generator.pl
- * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
- */
-
-#ifndef EQEMU_BASE_MERC_MERCHANT_TEMPLATES_REPOSITORY_H
-#define EQEMU_BASE_MERC_MERCHANT_TEMPLATES_REPOSITORY_H
-
-#include "../../database.h"
-#include "../../strings.h"
-#include <ctime>
-
-
-class BaseMercMerchantTemplatesRepository {
-public:
-	struct MercMerchantTemplates {
-		uint32_t    merc_merchant_template_id;
-		std::string name;
-		std::string qglobal;
-	};
-
-	static std::string PrimaryKey()
-	{
-		return std::string("merc_merchant_template_id");
-	}
-
-	static std::vector<std::string> Columns()
-	{
-		return {
-			"merc_merchant_template_id",
-			"name",
-			"qglobal",
-		};
-	}
-
-	static std::vector<std::string> SelectColumns()
-	{
-		return {
-			"merc_merchant_template_id",
-			"name",
-			"qglobal",
-		};
-	}
-
-	static std::string ColumnsRaw()
-	{
-		return std::string(Strings::Implode(", ", Columns()));
-	}
-
-	static std::string SelectColumnsRaw()
-	{
-		return std::string(Strings::Implode(", ", SelectColumns()));
-	}
-
-	static std::string TableName()
-	{
-		return std::string("merc_merchant_templates");
-	}
-
-	static std::string BaseSelect()
-	{
-		return fmt::format(
-			"SELECT {} FROM {}",
-			SelectColumnsRaw(),
-			TableName()
-		);
-	}
-
-	static std::string BaseInsert()
-	{
-		return fmt::format(
-			"INSERT INTO {} ({}) ",
-			TableName(),
-			ColumnsRaw()
-		);
-	}
-
-	static MercMerchantTemplates NewEntity()
-	{
-		MercMerchantTemplates e{};
-
-		e.merc_merchant_template_id = 0;
-		e.name                      = "";
-		e.qglobal                   = "";
-
-		return e;
-	}
-
-	static MercMerchantTemplates GetMercMerchantTemplates(
-		const std::vector<MercMerchantTemplates> &merc_merchant_templatess,
-		int merc_merchant_templates_id
-	)
-	{
-		for (auto &merc_merchant_templates : merc_merchant_templatess) {
-			if (merc_merchant_templates.merc_merchant_template_id == merc_merchant_templates_id) {
-				return merc_merchant_templates;
-			}
-		}
-
-		return NewEntity();
-	}
-
-	static MercMerchantTemplates FindOne(
-		Database& db,
-		int merc_merchant_templates_id
-	)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} WHERE {} = {} LIMIT 1",
-				BaseSelect(),
-				PrimaryKey(),
-				merc_merchant_templates_id
-			)
-		);
-
-		auto row = results.begin();
-		if (results.RowCount() == 1) {
-			MercMerchantTemplates e{};
-
-			e.merc_merchant_template_id = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.name                      = row[1] ? row[1] : "";
-			e.qglobal                   = row[2] ? row[2] : "";
-
-			return e;
-		}
-
-		return NewEntity();
-	}
-
-	static int DeleteOne(
-		Database& db,
-		int merc_merchant_templates_id
-	)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"DELETE FROM {} WHERE {} = {}",
-				TableName(),
-				PrimaryKey(),
-				merc_merchant_templates_id
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int UpdateOne(
-		Database& db,
-		const MercMerchantTemplates &e
-	)
-	{
-		std::vector<std::string> v;
-
-		auto columns = Columns();
-
-		v.push_back(columns[1] + " = '" + Strings::Escape(e.name) + "'");
-		v.push_back(columns[2] + " = '" + Strings::Escape(e.qglobal) + "'");
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"UPDATE {} SET {} WHERE {} = {}",
-				TableName(),
-				Strings::Implode(", ", v),
-				PrimaryKey(),
-				e.merc_merchant_template_id
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static MercMerchantTemplates InsertOne(
-		Database& db,
-		MercMerchantTemplates e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.merc_merchant_template_id));
-		v.push_back("'" + Strings::Escape(e.name) + "'");
-		v.push_back("'" + Strings::Escape(e.qglobal) + "'");
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				BaseInsert(),
-				Strings::Implode(",", v)
-			)
-		);
-
-		if (results.Success()) {
-			e.merc_merchant_template_id = results.LastInsertedID();
-			return e;
-		}
-
-		e = NewEntity();
-
-		return e;
-	}
-
-	static int InsertMany(
-		Database& db,
-		const std::vector<MercMerchantTemplates> &entries
-	)
-	{
-		std::vector<std::string> insert_chunks;
-
-		for (auto &e: entries) {
-			std::vector<std::string> v;
-
-			v.push_back(std::to_string(e.merc_merchant_template_id));
-			v.push_back("'" + Strings::Escape(e.name) + "'");
-			v.push_back("'" + Strings::Escape(e.qglobal) + "'");
-
-			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
-		}
-
-		std::vector<std::string> v;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseInsert(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static std::vector<MercMerchantTemplates> All(Database& db)
-	{
-		std::vector<MercMerchantTemplates> all_entries;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{}",
-				BaseSelect()
-			)
-		);
-
-		all_entries.reserve(results.RowCount());
-
-		for (auto row = results.begin(); row != results.end(); ++row) {
-			MercMerchantTemplates e{};
-
-			e.merc_merchant_template_id = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.name                      = row[1] ? row[1] : "";
-			e.qglobal                   = row[2] ? row[2] : "";
-
-			all_entries.push_back(e);
-		}
-
-		return all_entries;
-	}
-
-	static std::vector<MercMerchantTemplates> GetWhere(Database& db, const std::string &where_filter)
-	{
-		std::vector<MercMerchantTemplates> all_entries;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} WHERE {}",
-				BaseSelect(),
-				where_filter
-			)
-		);
-
-		all_entries.reserve(results.RowCount());
-
-		for (auto row = results.begin(); row != results.end(); ++row) {
-			MercMerchantTemplates e{};
-
-			e.merc_merchant_template_id = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.name                      = row[1] ? row[1] : "";
-			e.qglobal                   = row[2] ? row[2] : "";
-
-			all_entries.push_back(e);
-		}
-
-		return all_entries;
-	}
-
-	static int DeleteWhere(Database& db, const std::string &where_filter)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"DELETE FROM {} WHERE {}",
-				TableName(),
-				where_filter
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int Truncate(Database& db)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"TRUNCATE TABLE {}",
-				TableName()
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int64 GetMaxId(Database& db)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"SELECT COALESCE(MAX({}), 0) FROM {}",
-				PrimaryKey(),
-				TableName()
-			)
-		);
-
-		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
-	}
-
-	static int64 Count(Database& db, const std::string &where_filter = "")
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"SELECT COUNT(*) FROM {} {}",
-				TableName(),
-				(where_filter.empty() ? "" : "WHERE " + where_filter)
-			)
-		);
-
-		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
-	}
-
-};
-
-#endif //EQEMU_BASE_MERC_MERCHANT_TEMPLATES_REPOSITORY_H
@@ -1,355 +0,0 @@
-/**
- * DO NOT MODIFY THIS FILE
- *
- * This repository was automatically generated and is NOT to be modified directly.
- * Any repository modifications are meant to be made to the repository extending the base.
- * Any modifications to base repositories are to be made by the generator only
- *
- * @generator ./utils/scripts/generators/repository-generator.pl
- * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
- */
-
-#ifndef EQEMU_BASE_MERC_NAME_TYPES_REPOSITORY_H
-#define EQEMU_BASE_MERC_NAME_TYPES_REPOSITORY_H
-
-#include "../../database.h"
-#include "../../strings.h"
-#include <ctime>
-
-
-class BaseMercNameTypesRepository {
-public:
-	struct MercNameTypes {
-		uint32_t    name_type_id;
-		uint32_t    class_id;
-		std::string prefix;
-		std::string suffix;
-	};
-
-	static std::string PrimaryKey()
-	{
-		return std::string("name_type_id");
-	}
-
-	static std::vector<std::string> Columns()
-	{
-		return {
-			"name_type_id",
-			"class_id",
-			"prefix",
-			"suffix",
-		};
-	}
-
-	static std::vector<std::string> SelectColumns()
-	{
-		return {
-			"name_type_id",
-			"class_id",
-			"prefix",
-			"suffix",
-		};
-	}
-
-	static std::string ColumnsRaw()
-	{
-		return std::string(Strings::Implode(", ", Columns()));
-	}
-
-	static std::string SelectColumnsRaw()
-	{
-		return std::string(Strings::Implode(", ", SelectColumns()));
-	}
-
-	static std::string TableName()
-	{
-		return std::string("merc_name_types");
-	}
-
-	static std::string BaseSelect()
-	{
-		return fmt::format(
-			"SELECT {} FROM {}",
-			SelectColumnsRaw(),
-			TableName()
-		);
-	}
-
-	static std::string BaseInsert()
-	{
-		return fmt::format(
-			"INSERT INTO {} ({}) ",
-			TableName(),
-			ColumnsRaw()
-		);
-	}
-
-	static MercNameTypes NewEntity()
-	{
-		MercNameTypes e{};
-
-		e.name_type_id = 0;
-		e.class_id     = 0;
-		e.prefix       = "";
-		e.suffix       = "";
-
-		return e;
-	}
-
-	static MercNameTypes GetMercNameTypes(
-		const std::vector<MercNameTypes> &merc_name_typess,
-		int merc_name_types_id
-	)
-	{
-		for (auto &merc_name_types : merc_name_typess) {
-			if (merc_name_types.name_type_id == merc_name_types_id) {
-				return merc_name_types;
-			}
-		}
-
-		return NewEntity();
-	}
-
-	static MercNameTypes FindOne(
-		Database& db,
-		int merc_name_types_id
-	)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} WHERE {} = {} LIMIT 1",
-				BaseSelect(),
-				PrimaryKey(),
-				merc_name_types_id
-			)
-		);
-
-		auto row = results.begin();
-		if (results.RowCount() == 1) {
-			MercNameTypes e{};
-
-			e.name_type_id = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.class_id     = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
-			e.prefix       = row[2] ? row[2] : "";
-			e.suffix       = row[3] ? row[3] : "";
-
-			return e;
-		}
-
-		return NewEntity();
-	}
-
-	static int DeleteOne(
-		Database& db,
-		int merc_name_types_id
-	)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"DELETE FROM {} WHERE {} = {}",
-				TableName(),
-				PrimaryKey(),
-				merc_name_types_id
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int UpdateOne(
-		Database& db,
-		const MercNameTypes &e
-	)
-	{
-		std::vector<std::string> v;
-
-		auto columns = Columns();
-
-		v.push_back(columns[0] + " = " + std::to_string(e.name_type_id));
-		v.push_back(columns[1] + " = " + std::to_string(e.class_id));
-		v.push_back(columns[2] + " = '" + Strings::Escape(e.prefix) + "'");
-		v.push_back(columns[3] + " = '" + Strings::Escape(e.suffix) + "'");
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"UPDATE {} SET {} WHERE {} = {}",
-				TableName(),
-				Strings::Implode(", ", v),
-				PrimaryKey(),
-				e.name_type_id
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static MercNameTypes InsertOne(
-		Database& db,
-		MercNameTypes e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.name_type_id));
-		v.push_back(std::to_string(e.class_id));
-		v.push_back("'" + Strings::Escape(e.prefix) + "'");
-		v.push_back("'" + Strings::Escape(e.suffix) + "'");
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				BaseInsert(),
-				Strings::Implode(",", v)
-			)
-		);
-
-		if (results.Success()) {
-			e.name_type_id = results.LastInsertedID();
-			return e;
-		}
-
-		e = NewEntity();
-
-		return e;
-	}
-
-	static int InsertMany(
-		Database& db,
-		const std::vector<MercNameTypes> &entries
-	)
-	{
-		std::vector<std::string> insert_chunks;
-
-		for (auto &e: entries) {
-			std::vector<std::string> v;
-
-			v.push_back(std::to_string(e.name_type_id));
-			v.push_back(std::to_string(e.class_id));
-			v.push_back("'" + Strings::Escape(e.prefix) + "'");
-			v.push_back("'" + Strings::Escape(e.suffix) + "'");
-
-			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
-		}
-
-		std::vector<std::string> v;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseInsert(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static std::vector<MercNameTypes> All(Database& db)
-	{
-		std::vector<MercNameTypes> all_entries;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{}",
-				BaseSelect()
-			)
-		);
-
-		all_entries.reserve(results.RowCount());
-
-		for (auto row = results.begin(); row != results.end(); ++row) {
-			MercNameTypes e{};
-
-			e.name_type_id = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.class_id     = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
-			e.prefix       = row[2] ? row[2] : "";
-			e.suffix       = row[3] ? row[3] : "";
-
-			all_entries.push_back(e);
-		}
-
-		return all_entries;
-	}
-
-	static std::vector<MercNameTypes> GetWhere(Database& db, const std::string &where_filter)
-	{
-		std::vector<MercNameTypes> all_entries;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} WHERE {}",
-				BaseSelect(),
-				where_filter
-			)
-		);
-
-		all_entries.reserve(results.RowCount());
-
-		for (auto row = results.begin(); row != results.end(); ++row) {
-			MercNameTypes e{};
-
-			e.name_type_id = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.class_id     = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
-			e.prefix       = row[2] ? row[2] : "";
-			e.suffix       = row[3] ? row[3] : "";
-
-			all_entries.push_back(e);
-		}
-
-		return all_entries;
-	}
-
-	static int DeleteWhere(Database& db, const std::string &where_filter)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"DELETE FROM {} WHERE {}",
-				TableName(),
-				where_filter
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int Truncate(Database& db)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"TRUNCATE TABLE {}",
-				TableName()
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int64 GetMaxId(Database& db)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"SELECT COALESCE(MAX({}), 0) FROM {}",
-				PrimaryKey(),
-				TableName()
-			)
-		);
-
-		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
-	}
-
-	static int64 Count(Database& db, const std::string &where_filter = "")
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"SELECT COUNT(*) FROM {} {}",
-				TableName(),
-				(where_filter.empty() ? "" : "WHERE " + where_filter)
-			)
-		);
-
-		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
-	}
-
-};
-
-#endif //EQEMU_BASE_MERC_NAME_TYPES_REPOSITORY_H
@@ -1,364 +0,0 @@
-/**
- * DO NOT MODIFY THIS FILE
- *
- * This repository was automatically generated and is NOT to be modified directly.
- * Any repository modifications are meant to be made to the repository extending the base.
- * Any modifications to base repositories are to be made by the generator only
- *
- * @generator ./utils/scripts/generators/repository-generator.pl
- * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
- */
-
-#ifndef EQEMU_BASE_MERC_NPC_TYPES_REPOSITORY_H
-#define EQEMU_BASE_MERC_NPC_TYPES_REPOSITORY_H
-
-#include "../../database.h"
-#include "../../strings.h"
-#include <ctime>
-
-
-class BaseMercNpcTypesRepository {
-public:
-	struct MercNpcTypes {
-		uint32_t    merc_npc_type_id;
-		uint8_t     proficiency_id;
-		uint8_t     tier_id;
-		uint32_t    class_id;
-		std::string name;
-	};
-
-	static std::string PrimaryKey()
-	{
-		return std::string("merc_npc_type_id");
-	}
-
-	static std::vector<std::string> Columns()
-	{
-		return {
-			"merc_npc_type_id",
-			"proficiency_id",
-			"tier_id",
-			"class_id",
-			"name",
-		};
-	}
-
-	static std::vector<std::string> SelectColumns()
-	{
-		return {
-			"merc_npc_type_id",
-			"proficiency_id",
-			"tier_id",
-			"class_id",
-			"name",
-		};
-	}
-
-	static std::string ColumnsRaw()
-	{
-		return std::string(Strings::Implode(", ", Columns()));
-	}
-
-	static std::string SelectColumnsRaw()
-	{
-		return std::string(Strings::Implode(", ", SelectColumns()));
-	}
-
-	static std::string TableName()
-	{
-		return std::string("merc_npc_types");
-	}
-
-	static std::string BaseSelect()
-	{
-		return fmt::format(
-			"SELECT {} FROM {}",
-			SelectColumnsRaw(),
-			TableName()
-		);
-	}
-
-	static std::string BaseInsert()
-	{
-		return fmt::format(
-			"INSERT INTO {} ({}) ",
-			TableName(),
-			ColumnsRaw()
-		);
-	}
-
-	static MercNpcTypes NewEntity()
-	{
-		MercNpcTypes e{};
-
-		e.merc_npc_type_id = 0;
-		e.proficiency_id   = 0;
-		e.tier_id          = 0;
-		e.class_id         = 0;
-		e.name             = "";
-
-		return e;
-	}
-
-	static MercNpcTypes GetMercNpcTypes(
-		const std::vector<MercNpcTypes> &merc_npc_typess,
-		int merc_npc_types_id
-	)
-	{
-		for (auto &merc_npc_types : merc_npc_typess) {
-			if (merc_npc_types.merc_npc_type_id == merc_npc_types_id) {
-				return merc_npc_types;
-			}
-		}
-
-		return NewEntity();
-	}
-
-	static MercNpcTypes FindOne(
-		Database& db,
-		int merc_npc_types_id
-	)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} WHERE {} = {} LIMIT 1",
-				BaseSelect(),
-				PrimaryKey(),
-				merc_npc_types_id
-			)
-		);
-
-		auto row = results.begin();
-		if (results.RowCount() == 1) {
-			MercNpcTypes e{};
-
-			e.merc_npc_type_id = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.proficiency_id   = static_cast<uint8_t>(strtoul(row[1], nullptr, 10));
-			e.tier_id          = static_cast<uint8_t>(strtoul(row[2], nullptr, 10));
-			e.class_id         = static_cast<uint32_t>(strtoul(row[3], nullptr, 10));
-			e.name             = row[4] ? row[4] : "";
-
-			return e;
-		}
-
-		return NewEntity();
-	}
-
-	static int DeleteOne(
-		Database& db,
-		int merc_npc_types_id
-	)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"DELETE FROM {} WHERE {} = {}",
-				TableName(),
-				PrimaryKey(),
-				merc_npc_types_id
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int UpdateOne(
-		Database& db,
-		const MercNpcTypes &e
-	)
-	{
-		std::vector<std::string> v;
-
-		auto columns = Columns();
-
-		v.push_back(columns[1] + " = " + std::to_string(e.proficiency_id));
-		v.push_back(columns[2] + " = " + std::to_string(e.tier_id));
-		v.push_back(columns[3] + " = " + std::to_string(e.class_id));
-		v.push_back(columns[4] + " = '" + Strings::Escape(e.name) + "'");
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"UPDATE {} SET {} WHERE {} = {}",
-				TableName(),
-				Strings::Implode(", ", v),
-				PrimaryKey(),
-				e.merc_npc_type_id
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static MercNpcTypes InsertOne(
-		Database& db,
-		MercNpcTypes e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.merc_npc_type_id));
-		v.push_back(std::to_string(e.proficiency_id));
-		v.push_back(std::to_string(e.tier_id));
-		v.push_back(std::to_string(e.class_id));
-		v.push_back("'" + Strings::Escape(e.name) + "'");
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				BaseInsert(),
-				Strings::Implode(",", v)
-			)
-		);
-
-		if (results.Success()) {
-			e.merc_npc_type_id = results.LastInsertedID();
-			return e;
-		}
-
-		e = NewEntity();
-
-		return e;
-	}
-
-	static int InsertMany(
-		Database& db,
-		const std::vector<MercNpcTypes> &entries
-	)
-	{
-		std::vector<std::string> insert_chunks;
-
-		for (auto &e: entries) {
-			std::vector<std::string> v;
-
-			v.push_back(std::to_string(e.merc_npc_type_id));
-			v.push_back(std::to_string(e.proficiency_id));
-			v.push_back(std::to_string(e.tier_id));
-			v.push_back(std::to_string(e.class_id));
-			v.push_back("'" + Strings::Escape(e.name) + "'");
-
-			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
-		}
-
-		std::vector<std::string> v;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseInsert(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static std::vector<MercNpcTypes> All(Database& db)
-	{
-		std::vector<MercNpcTypes> all_entries;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{}",
-				BaseSelect()
-			)
-		);
-
-		all_entries.reserve(results.RowCount());
-
-		for (auto row = results.begin(); row != results.end(); ++row) {
-			MercNpcTypes e{};
-
-			e.merc_npc_type_id = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.proficiency_id   = static_cast<uint8_t>(strtoul(row[1], nullptr, 10));
-			e.tier_id          = static_cast<uint8_t>(strtoul(row[2], nullptr, 10));
-			e.class_id         = static_cast<uint32_t>(strtoul(row[3], nullptr, 10));
-			e.name             = row[4] ? row[4] : "";
-
-			all_entries.push_back(e);
-		}
-
-		return all_entries;
-	}
-
-	static std::vector<MercNpcTypes> GetWhere(Database& db, const std::string &where_filter)
-	{
-		std::vector<MercNpcTypes> all_entries;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} WHERE {}",
-				BaseSelect(),
-				where_filter
-			)
-		);
-
-		all_entries.reserve(results.RowCount());
-
-		for (auto row = results.begin(); row != results.end(); ++row) {
-			MercNpcTypes e{};
-
-			e.merc_npc_type_id = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.proficiency_id   = static_cast<uint8_t>(strtoul(row[1], nullptr, 10));
-			e.tier_id          = static_cast<uint8_t>(strtoul(row[2], nullptr, 10));
-			e.class_id         = static_cast<uint32_t>(strtoul(row[3], nullptr, 10));
-			e.name             = row[4] ? row[4] : "";
-
-			all_entries.push_back(e);
-		}
-
-		return all_entries;
-	}
-
-	static int DeleteWhere(Database& db, const std::string &where_filter)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"DELETE FROM {} WHERE {}",
-				TableName(),
-				where_filter
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int Truncate(Database& db)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"TRUNCATE TABLE {}",
-				TableName()
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int64 GetMaxId(Database& db)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"SELECT COALESCE(MAX({}), 0) FROM {}",
-				PrimaryKey(),
-				TableName()
-			)
-		);
-
-		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
-	}
-
-	static int64 Count(Database& db, const std::string &where_filter = "")
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"SELECT COUNT(*) FROM {} {}",
-				TableName(),
-				(where_filter.empty() ? "" : "WHERE " + where_filter)
-			)
-		);
-
-		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
-	}
-
-};
-
-#endif //EQEMU_BASE_MERC_NPC_TYPES_REPOSITORY_H
@@ -1,404 +0,0 @@
-/**
- * DO NOT MODIFY THIS FILE
- *
- * This repository was automatically generated and is NOT to be modified directly.
- * Any repository modifications are meant to be made to the repository extending the base.
- * Any modifications to base repositories are to be made by the generator only
- *
- * @generator ./utils/scripts/generators/repository-generator.pl
- * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
- */
-
-#ifndef EQEMU_BASE_MERC_SPELL_LIST_ENTRIES_REPOSITORY_H
-#define EQEMU_BASE_MERC_SPELL_LIST_ENTRIES_REPOSITORY_H
-
-#include "../../database.h"
-#include "../../strings.h"
-#include <ctime>
-
-
-class BaseMercSpellListEntriesRepository {
-public:
-	struct MercSpellListEntries {
-		uint32_t merc_spell_list_entry_id;
-		uint32_t merc_spell_list_id;
-		uint32_t spell_id;
-		uint32_t spell_type;
-		uint8_t  stance_id;
-		uint8_t  minlevel;
-		uint8_t  maxlevel;
-		int8_t   slot;
-		uint8_t  procChance;
-	};
-
-	static std::string PrimaryKey()
-	{
-		return std::string("merc_spell_list_entry_id");
-	}
-
-	static std::vector<std::string> Columns()
-	{
-		return {
-			"merc_spell_list_entry_id",
-			"merc_spell_list_id",
-			"spell_id",
-			"spell_type",
-			"stance_id",
-			"minlevel",
-			"maxlevel",
-			"slot",
-			"procChance",
-		};
-	}
-
-	static std::vector<std::string> SelectColumns()
-	{
-		return {
-			"merc_spell_list_entry_id",
-			"merc_spell_list_id",
-			"spell_id",
-			"spell_type",
-			"stance_id",
-			"minlevel",
-			"maxlevel",
-			"slot",
-			"procChance",
-		};
-	}
-
-	static std::string ColumnsRaw()
-	{
-		return std::string(Strings::Implode(", ", Columns()));
-	}
-
-	static std::string SelectColumnsRaw()
-	{
-		return std::string(Strings::Implode(", ", SelectColumns()));
-	}
-
-	static std::string TableName()
-	{
-		return std::string("merc_spell_list_entries");
-	}
-
-	static std::string BaseSelect()
-	{
-		return fmt::format(
-			"SELECT {} FROM {}",
-			SelectColumnsRaw(),
-			TableName()
-		);
-	}
-
-	static std::string BaseInsert()
-	{
-		return fmt::format(
-			"INSERT INTO {} ({}) ",
-			TableName(),
-			ColumnsRaw()
-		);
-	}
-
-	static MercSpellListEntries NewEntity()
-	{
-		MercSpellListEntries e{};
-
-		e.merc_spell_list_entry_id = 0;
-		e.merc_spell_list_id       = 0;
-		e.spell_id                 = 0;
-		e.spell_type               = 0;
-		e.stance_id                = 0;
-		e.minlevel                 = 1;
-		e.maxlevel                 = 255;
-		e.slot                     = -1;
-		e.procChance               = 0;
-
-		return e;
-	}
-
-	static MercSpellListEntries GetMercSpellListEntries(
-		const std::vector<MercSpellListEntries> &merc_spell_list_entriess,
-		int merc_spell_list_entries_id
-	)
-	{
-		for (auto &merc_spell_list_entries : merc_spell_list_entriess) {
-			if (merc_spell_list_entries.merc_spell_list_entry_id == merc_spell_list_entries_id) {
-				return merc_spell_list_entries;
-			}
-		}
-
-		return NewEntity();
-	}
-
-	static MercSpellListEntries FindOne(
-		Database& db,
-		int merc_spell_list_entries_id
-	)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} WHERE {} = {} LIMIT 1",
-				BaseSelect(),
-				PrimaryKey(),
-				merc_spell_list_entries_id
-			)
-		);
-
-		auto row = results.begin();
-		if (results.RowCount() == 1) {
-			MercSpellListEntries e{};
-
-			e.merc_spell_list_entry_id = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.merc_spell_list_id       = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
-			e.spell_id                 = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
-			e.spell_type               = static_cast<uint32_t>(strtoul(row[3], nullptr, 10));
-			e.stance_id                = static_cast<uint8_t>(strtoul(row[4], nullptr, 10));
-			e.minlevel                 = static_cast<uint8_t>(strtoul(row[5], nullptr, 10));
-			e.maxlevel                 = static_cast<uint8_t>(strtoul(row[6], nullptr, 10));
-			e.slot                     = static_cast<int8_t>(atoi(row[7]));
-			e.procChance               = static_cast<uint8_t>(strtoul(row[8], nullptr, 10));
-
-			return e;
-		}
-
-		return NewEntity();
-	}
-
-	static int DeleteOne(
-		Database& db,
-		int merc_spell_list_entries_id
-	)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"DELETE FROM {} WHERE {} = {}",
-				TableName(),
-				PrimaryKey(),
-				merc_spell_list_entries_id
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int UpdateOne(
-		Database& db,
-		const MercSpellListEntries &e
-	)
-	{
-		std::vector<std::string> v;
-
-		auto columns = Columns();
-
-		v.push_back(columns[1] + " = " + std::to_string(e.merc_spell_list_id));
-		v.push_back(columns[2] + " = " + std::to_string(e.spell_id));
-		v.push_back(columns[3] + " = " + std::to_string(e.spell_type));
-		v.push_back(columns[4] + " = " + std::to_string(e.stance_id));
-		v.push_back(columns[5] + " = " + std::to_string(e.minlevel));
-		v.push_back(columns[6] + " = " + std::to_string(e.maxlevel));
-		v.push_back(columns[7] + " = " + std::to_string(e.slot));
-		v.push_back(columns[8] + " = " + std::to_string(e.procChance));
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"UPDATE {} SET {} WHERE {} = {}",
-				TableName(),
-				Strings::Implode(", ", v),
-				PrimaryKey(),
-				e.merc_spell_list_entry_id
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static MercSpellListEntries InsertOne(
-		Database& db,
-		MercSpellListEntries e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.merc_spell_list_entry_id));
-		v.push_back(std::to_string(e.merc_spell_list_id));
-		v.push_back(std::to_string(e.spell_id));
-		v.push_back(std::to_string(e.spell_type));
-		v.push_back(std::to_string(e.stance_id));
-		v.push_back(std::to_string(e.minlevel));
-		v.push_back(std::to_string(e.maxlevel));
-		v.push_back(std::to_string(e.slot));
-		v.push_back(std::to_string(e.procChance));
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				BaseInsert(),
-				Strings::Implode(",", v)
-			)
-		);
-
-		if (results.Success()) {
-			e.merc_spell_list_entry_id = results.LastInsertedID();
-			return e;
-		}
-
-		e = NewEntity();
-
-		return e;
-	}
-
-	static int InsertMany(
-		Database& db,
-		const std::vector<MercSpellListEntries> &entries
-	)
-	{
-		std::vector<std::string> insert_chunks;
-
-		for (auto &e: entries) {
-			std::vector<std::string> v;
-
-			v.push_back(std::to_string(e.merc_spell_list_entry_id));
-			v.push_back(std::to_string(e.merc_spell_list_id));
-			v.push_back(std::to_string(e.spell_id));
-			v.push_back(std::to_string(e.spell_type));
-			v.push_back(std::to_string(e.stance_id));
-			v.push_back(std::to_string(e.minlevel));
-			v.push_back(std::to_string(e.maxlevel));
-			v.push_back(std::to_string(e.slot));
-			v.push_back(std::to_string(e.procChance));
-
-			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
-		}
-
-		std::vector<std::string> v;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseInsert(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static std::vector<MercSpellListEntries> All(Database& db)
-	{
-		std::vector<MercSpellListEntries> all_entries;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{}",
-				BaseSelect()
-			)
-		);
-
-		all_entries.reserve(results.RowCount());
-
-		for (auto row = results.begin(); row != results.end(); ++row) {
-			MercSpellListEntries e{};
-
-			e.merc_spell_list_entry_id = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.merc_spell_list_id       = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
-			e.spell_id                 = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
-			e.spell_type               = static_cast<uint32_t>(strtoul(row[3], nullptr, 10));
-			e.stance_id                = static_cast<uint8_t>(strtoul(row[4], nullptr, 10));
-			e.minlevel                 = static_cast<uint8_t>(strtoul(row[5], nullptr, 10));
-			e.maxlevel                 = static_cast<uint8_t>(strtoul(row[6], nullptr, 10));
-			e.slot                     = static_cast<int8_t>(atoi(row[7]));
-			e.procChance               = static_cast<uint8_t>(strtoul(row[8], nullptr, 10));
-
-			all_entries.push_back(e);
-		}
-
-		return all_entries;
-	}
-
-	static std::vector<MercSpellListEntries> GetWhere(Database& db, const std::string &where_filter)
-	{
-		std::vector<MercSpellListEntries> all_entries;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} WHERE {}",
-				BaseSelect(),
-				where_filter
-			)
-		);
-
-		all_entries.reserve(results.RowCount());
-
-		for (auto row = results.begin(); row != results.end(); ++row) {
-			MercSpellListEntries e{};
-
-			e.merc_spell_list_entry_id = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.merc_spell_list_id       = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
-			e.spell_id                 = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
-			e.spell_type               = static_cast<uint32_t>(strtoul(row[3], nullptr, 10));
-			e.stance_id                = static_cast<uint8_t>(strtoul(row[4], nullptr, 10));
-			e.minlevel                 = static_cast<uint8_t>(strtoul(row[5], nullptr, 10));
-			e.maxlevel                 = static_cast<uint8_t>(strtoul(row[6], nullptr, 10));
-			e.slot                     = static_cast<int8_t>(atoi(row[7]));
-			e.procChance               = static_cast<uint8_t>(strtoul(row[8], nullptr, 10));
-
-			all_entries.push_back(e);
-		}
-
-		return all_entries;
-	}
-
-	static int DeleteWhere(Database& db, const std::string &where_filter)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"DELETE FROM {} WHERE {}",
-				TableName(),
-				where_filter
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int Truncate(Database& db)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"TRUNCATE TABLE {}",
-				TableName()
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int64 GetMaxId(Database& db)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"SELECT COALESCE(MAX({}), 0) FROM {}",
-				PrimaryKey(),
-				TableName()
-			)
-		);
-
-		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
-	}
-
-	static int64 Count(Database& db, const std::string &where_filter = "")
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"SELECT COUNT(*) FROM {} {}",
-				TableName(),
-				(where_filter.empty() ? "" : "WHERE " + where_filter)
-			)
-		);
-
-		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
-	}
-
-};
-
-#endif //EQEMU_BASE_MERC_SPELL_LIST_ENTRIES_REPOSITORY_H
@@ -1,354 +0,0 @@
-/**
- * DO NOT MODIFY THIS FILE
- *
- * This repository was automatically generated and is NOT to be modified directly.
- * Any repository modifications are meant to be made to the repository extending the base.
- * Any modifications to base repositories are to be made by the generator only
- *
- * @generator ./utils/scripts/generators/repository-generator.pl
- * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
- */
-
-#ifndef EQEMU_BASE_MERC_SPELL_LISTS_REPOSITORY_H
-#define EQEMU_BASE_MERC_SPELL_LISTS_REPOSITORY_H
-
-#include "../../database.h"
-#include "../../strings.h"
-#include <ctime>
-
-
-class BaseMercSpellListsRepository {
-public:
-	struct MercSpellLists {
-		uint32_t    merc_spell_list_id;
-		uint32_t    class_id;
-		uint8_t     proficiency_id;
-		std::string name;
-	};
-
-	static std::string PrimaryKey()
-	{
-		return std::string("merc_spell_list_id");
-	}
-
-	static std::vector<std::string> Columns()
-	{
-		return {
-			"merc_spell_list_id",
-			"class_id",
-			"proficiency_id",
-			"name",
-		};
-	}
-
-	static std::vector<std::string> SelectColumns()
-	{
-		return {
-			"merc_spell_list_id",
-			"class_id",
-			"proficiency_id",
-			"name",
-		};
-	}
-
-	static std::string ColumnsRaw()
-	{
-		return std::string(Strings::Implode(", ", Columns()));
-	}
-
-	static std::string SelectColumnsRaw()
-	{
-		return std::string(Strings::Implode(", ", SelectColumns()));
-	}
-
-	static std::string TableName()
-	{
-		return std::string("merc_spell_lists");
-	}
-
-	static std::string BaseSelect()
-	{
-		return fmt::format(
-			"SELECT {} FROM {}",
-			SelectColumnsRaw(),
-			TableName()
-		);
-	}
-
-	static std::string BaseInsert()
-	{
-		return fmt::format(
-			"INSERT INTO {} ({}) ",
-			TableName(),
-			ColumnsRaw()
-		);
-	}
-
-	static MercSpellLists NewEntity()
-	{
-		MercSpellLists e{};
-
-		e.merc_spell_list_id = 0;
-		e.class_id           = 0;
-		e.proficiency_id     = 0;
-		e.name               = "";
-
-		return e;
-	}
-
-	static MercSpellLists GetMercSpellLists(
-		const std::vector<MercSpellLists> &merc_spell_listss,
-		int merc_spell_lists_id
-	)
-	{
-		for (auto &merc_spell_lists : merc_spell_listss) {
-			if (merc_spell_lists.merc_spell_list_id == merc_spell_lists_id) {
-				return merc_spell_lists;
-			}
-		}
-
-		return NewEntity();
-	}
-
-	static MercSpellLists FindOne(
-		Database& db,
-		int merc_spell_lists_id
-	)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} WHERE {} = {} LIMIT 1",
-				BaseSelect(),
-				PrimaryKey(),
-				merc_spell_lists_id
-			)
-		);
-
-		auto row = results.begin();
-		if (results.RowCount() == 1) {
-			MercSpellLists e{};
-
-			e.merc_spell_list_id = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.class_id           = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
-			e.proficiency_id     = static_cast<uint8_t>(strtoul(row[2], nullptr, 10));
-			e.name               = row[3] ? row[3] : "";
-
-			return e;
-		}
-
-		return NewEntity();
-	}
-
-	static int DeleteOne(
-		Database& db,
-		int merc_spell_lists_id
-	)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"DELETE FROM {} WHERE {} = {}",
-				TableName(),
-				PrimaryKey(),
-				merc_spell_lists_id
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int UpdateOne(
-		Database& db,
-		const MercSpellLists &e
-	)
-	{
-		std::vector<std::string> v;
-
-		auto columns = Columns();
-
-		v.push_back(columns[1] + " = " + std::to_string(e.class_id));
-		v.push_back(columns[2] + " = " + std::to_string(e.proficiency_id));
-		v.push_back(columns[3] + " = '" + Strings::Escape(e.name) + "'");
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"UPDATE {} SET {} WHERE {} = {}",
-				TableName(),
-				Strings::Implode(", ", v),
-				PrimaryKey(),
-				e.merc_spell_list_id
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static MercSpellLists InsertOne(
-		Database& db,
-		MercSpellLists e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.merc_spell_list_id));
-		v.push_back(std::to_string(e.class_id));
-		v.push_back(std::to_string(e.proficiency_id));
-		v.push_back("'" + Strings::Escape(e.name) + "'");
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				BaseInsert(),
-				Strings::Implode(",", v)
-			)
-		);
-
-		if (results.Success()) {
-			e.merc_spell_list_id = results.LastInsertedID();
-			return e;
-		}
-
-		e = NewEntity();
-
-		return e;
-	}
-
-	static int InsertMany(
-		Database& db,
-		const std::vector<MercSpellLists> &entries
-	)
-	{
-		std::vector<std::string> insert_chunks;
-
-		for (auto &e: entries) {
-			std::vector<std::string> v;
-
-			v.push_back(std::to_string(e.merc_spell_list_id));
-			v.push_back(std::to_string(e.class_id));
-			v.push_back(std::to_string(e.proficiency_id));
-			v.push_back("'" + Strings::Escape(e.name) + "'");
-
-			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
-		}
-
-		std::vector<std::string> v;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseInsert(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static std::vector<MercSpellLists> All(Database& db)
-	{
-		std::vector<MercSpellLists> all_entries;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{}",
-				BaseSelect()
-			)
-		);
-
-		all_entries.reserve(results.RowCount());
-
-		for (auto row = results.begin(); row != results.end(); ++row) {
-			MercSpellLists e{};
-
-			e.merc_spell_list_id = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.class_id           = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
-			e.proficiency_id     = static_cast<uint8_t>(strtoul(row[2], nullptr, 10));
-			e.name               = row[3] ? row[3] : "";
-
-			all_entries.push_back(e);
-		}
-
-		return all_entries;
-	}
-
-	static std::vector<MercSpellLists> GetWhere(Database& db, const std::string &where_filter)
-	{
-		std::vector<MercSpellLists> all_entries;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} WHERE {}",
-				BaseSelect(),
-				where_filter
-			)
-		);
-
-		all_entries.reserve(results.RowCount());
-
-		for (auto row = results.begin(); row != results.end(); ++row) {
-			MercSpellLists e{};
-
-			e.merc_spell_list_id = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.class_id           = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
-			e.proficiency_id     = static_cast<uint8_t>(strtoul(row[2], nullptr, 10));
-			e.name               = row[3] ? row[3] : "";
-
-			all_entries.push_back(e);
-		}
-
-		return all_entries;
-	}
-
-	static int DeleteWhere(Database& db, const std::string &where_filter)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"DELETE FROM {} WHERE {}",
-				TableName(),
-				where_filter
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int Truncate(Database& db)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"TRUNCATE TABLE {}",
-				TableName()
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int64 GetMaxId(Database& db)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"SELECT COALESCE(MAX({}), 0) FROM {}",
-				PrimaryKey(),
-				TableName()
-			)
-		);
-
-		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
-	}
-
-	static int64 Count(Database& db, const std::string &where_filter = "")
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"SELECT COUNT(*) FROM {} {}",
-				TableName(),
-				(where_filter.empty() ? "" : "WHERE " + where_filter)
-			)
-		);
-
-		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
-	}
-
-};
-
-#endif //EQEMU_BASE_MERC_SPELL_LISTS_REPOSITORY_H
@@ -1,364 +0,0 @@
-/**
- * DO NOT MODIFY THIS FILE
- *
- * This repository was automatically generated and is NOT to be modified directly.
- * Any repository modifications are meant to be made to the repository extending the base.
- * Any modifications to base repositories are to be made by the generator only
- *
- * @generator ./utils/scripts/generators/repository-generator.pl
- * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
- */
-
-#ifndef EQEMU_BASE_MERC_STANCE_ENTRIES_REPOSITORY_H
-#define EQEMU_BASE_MERC_STANCE_ENTRIES_REPOSITORY_H
-
-#include "../../database.h"
-#include "../../strings.h"
-#include <ctime>
-
-
-class BaseMercStanceEntriesRepository {
-public:
-	struct MercStanceEntries {
-		uint32_t merc_stance_entry_id;
-		uint32_t class_id;
-		uint8_t  proficiency_id;
-		uint8_t  stance_id;
-		int8_t   isdefault;
-	};
-
-	static std::string PrimaryKey()
-	{
-		return std::string("merc_stance_entry_id");
-	}
-
-	static std::vector<std::string> Columns()
-	{
-		return {
-			"merc_stance_entry_id",
-			"class_id",
-			"proficiency_id",
-			"stance_id",
-			"isdefault",
-		};
-	}
-
-	static std::vector<std::string> SelectColumns()
-	{
-		return {
-			"merc_stance_entry_id",
-			"class_id",
-			"proficiency_id",
-			"stance_id",
-			"isdefault",
-		};
-	}
-
-	static std::string ColumnsRaw()
-	{
-		return std::string(Strings::Implode(", ", Columns()));
-	}
-
-	static std::string SelectColumnsRaw()
-	{
-		return std::string(Strings::Implode(", ", SelectColumns()));
-	}
-
-	static std::string TableName()
-	{
-		return std::string("merc_stance_entries");
-	}
-
-	static std::string BaseSelect()
-	{
-		return fmt::format(
-			"SELECT {} FROM {}",
-			SelectColumnsRaw(),
-			TableName()
-		);
-	}
-
-	static std::string BaseInsert()
-	{
-		return fmt::format(
-			"INSERT INTO {} ({}) ",
-			TableName(),
-			ColumnsRaw()
-		);
-	}
-
-	static MercStanceEntries NewEntity()
-	{
-		MercStanceEntries e{};
-
-		e.merc_stance_entry_id = 0;
-		e.class_id             = 0;
-		e.proficiency_id       = 0;
-		e.stance_id            = 0;
-		e.isdefault            = 0;
-
-		return e;
-	}
-
-	static MercStanceEntries GetMercStanceEntries(
-		const std::vector<MercStanceEntries> &merc_stance_entriess,
-		int merc_stance_entries_id
-	)
-	{
-		for (auto &merc_stance_entries : merc_stance_entriess) {
-			if (merc_stance_entries.merc_stance_entry_id == merc_stance_entries_id) {
-				return merc_stance_entries;
-			}
-		}
-
-		return NewEntity();
-	}
-
-	static MercStanceEntries FindOne(
-		Database& db,
-		int merc_stance_entries_id
-	)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} WHERE {} = {} LIMIT 1",
-				BaseSelect(),
-				PrimaryKey(),
-				merc_stance_entries_id
-			)
-		);
-
-		auto row = results.begin();
-		if (results.RowCount() == 1) {
-			MercStanceEntries e{};
-
-			e.merc_stance_entry_id = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.class_id             = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
-			e.proficiency_id       = static_cast<uint8_t>(strtoul(row[2], nullptr, 10));
-			e.stance_id            = static_cast<uint8_t>(strtoul(row[3], nullptr, 10));
-			e.isdefault            = static_cast<int8_t>(atoi(row[4]));
-
-			return e;
-		}
-
-		return NewEntity();
-	}
-
-	static int DeleteOne(
-		Database& db,
-		int merc_stance_entries_id
-	)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"DELETE FROM {} WHERE {} = {}",
-				TableName(),
-				PrimaryKey(),
-				merc_stance_entries_id
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int UpdateOne(
-		Database& db,
-		const MercStanceEntries &e
-	)
-	{
-		std::vector<std::string> v;
-
-		auto columns = Columns();
-
-		v.push_back(columns[1] + " = " + std::to_string(e.class_id));
-		v.push_back(columns[2] + " = " + std::to_string(e.proficiency_id));
-		v.push_back(columns[3] + " = " + std::to_string(e.stance_id));
-		v.push_back(columns[4] + " = " + std::to_string(e.isdefault));
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"UPDATE {} SET {} WHERE {} = {}",
-				TableName(),
-				Strings::Implode(", ", v),
-				PrimaryKey(),
-				e.merc_stance_entry_id
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static MercStanceEntries InsertOne(
-		Database& db,
-		MercStanceEntries e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.merc_stance_entry_id));
-		v.push_back(std::to_string(e.class_id));
-		v.push_back(std::to_string(e.proficiency_id));
-		v.push_back(std::to_string(e.stance_id));
-		v.push_back(std::to_string(e.isdefault));
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				BaseInsert(),
-				Strings::Implode(",", v)
-			)
-		);
-
-		if (results.Success()) {
-			e.merc_stance_entry_id = results.LastInsertedID();
-			return e;
-		}
-
-		e = NewEntity();
-
-		return e;
-	}
-
-	static int InsertMany(
-		Database& db,
-		const std::vector<MercStanceEntries> &entries
-	)
-	{
-		std::vector<std::string> insert_chunks;
-
-		for (auto &e: entries) {
-			std::vector<std::string> v;
-
-			v.push_back(std::to_string(e.merc_stance_entry_id));
-			v.push_back(std::to_string(e.class_id));
-			v.push_back(std::to_string(e.proficiency_id));
-			v.push_back(std::to_string(e.stance_id));
-			v.push_back(std::to_string(e.isdefault));
-
-			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
-		}
-
-		std::vector<std::string> v;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseInsert(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static std::vector<MercStanceEntries> All(Database& db)
-	{
-		std::vector<MercStanceEntries> all_entries;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{}",
-				BaseSelect()
-			)
-		);
-
-		all_entries.reserve(results.RowCount());
-
-		for (auto row = results.begin(); row != results.end(); ++row) {
-			MercStanceEntries e{};
-
-			e.merc_stance_entry_id = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.class_id             = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
-			e.proficiency_id       = static_cast<uint8_t>(strtoul(row[2], nullptr, 10));
-			e.stance_id            = static_cast<uint8_t>(strtoul(row[3], nullptr, 10));
-			e.isdefault            = static_cast<int8_t>(atoi(row[4]));
-
-			all_entries.push_back(e);
-		}
-
-		return all_entries;
-	}
-
-	static std::vector<MercStanceEntries> GetWhere(Database& db, const std::string &where_filter)
-	{
-		std::vector<MercStanceEntries> all_entries;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} WHERE {}",
-				BaseSelect(),
-				where_filter
-			)
-		);
-
-		all_entries.reserve(results.RowCount());
-
-		for (auto row = results.begin(); row != results.end(); ++row) {
-			MercStanceEntries e{};
-
-			e.merc_stance_entry_id = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.class_id             = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
-			e.proficiency_id       = static_cast<uint8_t>(strtoul(row[2], nullptr, 10));
-			e.stance_id            = static_cast<uint8_t>(strtoul(row[3], nullptr, 10));
-			e.isdefault            = static_cast<int8_t>(atoi(row[4]));
-
-			all_entries.push_back(e);
-		}
-
-		return all_entries;
-	}
-
-	static int DeleteWhere(Database& db, const std::string &where_filter)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"DELETE FROM {} WHERE {}",
-				TableName(),
-				where_filter
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int Truncate(Database& db)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"TRUNCATE TABLE {}",
-				TableName()
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int64 GetMaxId(Database& db)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"SELECT COALESCE(MAX({}), 0) FROM {}",
-				PrimaryKey(),
-				TableName()
-			)
-		);
-
-		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
-	}
-
-	static int64 Count(Database& db, const std::string &where_filter = "")
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"SELECT COUNT(*) FROM {} {}",
-				TableName(),
-				(where_filter.empty() ? "" : "WHERE " + where_filter)
-			)
-		);
-
-		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
-	}
-
-};
-
-#endif //EQEMU_BASE_MERC_STANCE_ENTRIES_REPOSITORY_H
--- a/Show More
+++ b/Show More