.devcontainer/.gitignore

@@ -1,5 +1,6 @@
-base/
+!Makefile
-!base/*.json
+base/*.sql
-override/
+base/*.zip
-repo/
+base/db/
-cache/
+base/maps/
+!base/expansion/Makefile

.devcontainer/Makefile

@@ -1,127 +1,196 @@
-# Build binaries: make cmake, make build
-# One time initial setup (or to reset db): make prep, make inject-mariadb, make maps
-# Update custom db edits: make inject-custom
-# Start up server: make shared, make login, make world, make zone
-# in game, stop combat spam #logs set gmsay 79 0
-# in game, stop loot spam #logs set gmsay 69 0
 NAME := eqemu-server
+.ONESHELL:
 
-.PHONY: prep
+DOCKER_ARGS := --rm  --name ${NAME} -v $$PWD:/src -w /src ${NAME}
-prep: is-vscode
+DOCKER_ARM64_ARGS := --rm --platform linux/arm64 --name ${NAME}-arm64 -v $$PWD:/src -w /src ${NAME}-arm64
-	@echo "Preparing build/bin for usage..."
 
-	@echo "Prepping folders..."
+.PHONY: build
-	@mkdir -p .devcontainer/override
+build:
-	@mkdir -p .devcontainer/repo
+ifeq ($(findstring .devcontainer,$(CURDIR)),.devcontainer)
-	@mkdir -p .devcontainer/cache
+	@make -C ../ -f .devcontainer/Makefile build --no-print-directory
-	@mkdir -p build/bin/logs
+	exit
-	@mkdir -p build/bin/shared
+endif
-	@mkdir -p build/bin/assets
+	cd build$$BUILD_SUFFIX && cmake --build . --config Release --target all --
 
-	@echo "Applying overrides..."
+.PHONY: cmake
-	@if [ ! -f .devcontainer/override/eqemu_config.json ]; then cp .devcontainer/base/eqemu_config.json .devcontainer/override/eqemu_config.json; fi
+cmake:
-	@if [ -f build/bin/eqemu_config.json ]; then unlink build/bin/eqemu_config.json; fi
+ifeq ($(findstring .devcontainer,$(CURDIR)),.devcontainer)
-	cd build/bin && ln -s ../../.devcontainer/override/eqemu_config.json eqemu_config.json
+	@make -C ../ -f .devcontainer/Makefile cmake --no-print-directory
-	@if [ ! -f .devcontainer/override/login.json ]; then cp .devcontainer/base/login.json .devcontainer/override/login.json; fi
+	exit
-	@if [ -f build/bin/login.json ]; then unlink build/bin/login.json; fi
+endif
-	cd build/bin && ln -s ../../.devcontainer/override/login.json login.json
+	@echo "working directory: $$PWD"
+	mkdir -p build$$BUILD_SUFFIX
+	@cd build$$BUILD_SUFFIX && cmake -DEQEMU_BUILD_LOGIN=ON \
+			-DEQEMU_BUILD_TESTS=ON \
+			-DCMAKE_CXX_COMPILER_LAUNCHER=ccache -G Ninja ..
 
-	@echo "Cloning repositories..."
+clean:
-	cd .devcontainer/repo && if [ ! -d "quests" ]; then cd ../../.devcontainer/repo/ && git clone https://github.com/ProjectEQ/projecteqquests.git quests; fi
+ifneq (,$(findstring .devcontainer,$$PWD))
-	cd .devcontainer/repo && if [ ! -d "eqemu-definitions" ]; then cd ../../.devcontainer/repo/ && git clone https://github.com/xackery/eqemu-definitions.git eqemu-definitions; fi
+	@make -C ../ -f .devcontainer/Makefile clean --no-print-directory
-	cd .devcontainer/repo && if [ ! -d "maps" ]; then cd ../../ && make maps; fi
+endif
-	@if [ -d build/bin/quests ]; then unlink build/bin/quests; fi
-	cd build/bin && ln -s ../../.devcontainer/repo/quests quests
-	@if [ -d build/bin/maps ]; then unlink build/bin/maps; fi
-	cd build/bin && ln -s ../../.devcontainer/repo/maps maps
-	@if [ -d build/bin/eqemu-definitions ]; then unlink build/bin/eqemu-definitions; fi
-	cd build/bin && ln -s ../../.devcontainer/repo/eqemu-definitions eqemu-definitions
-	@mkdir -p build/bin/quests/mods
-
-	@echo "Applying base links..."
-	cp -R -u -p utils/patches .devcontainer/base/
-	@if [ -d build/bin/assets/patches ]; then unlink build/bin/assets/patches; fi
-	cd build/bin/assets && ln -s ../../../.devcontainer/base/patches patches
-	@if [ -d build/bin/lua_modules ]; then unlink build/bin/lua_modules; fi
-	cd build/bin && ln -s ../../.devcontainer/repo/quests/lua_modules lua_modules
-	@if [ -d build/bin/mods ]; then unlink build/bin/mods; fi
-	cd build/bin && ln -s ../../.devcontainer/repo/quests/mods mods
-	@if [ -d build/bin/plugins ]; then unlink build/bin/plugins; fi
-	cd build/bin && ln -s ../../.devcontainer/repo/quests/plugins plugins
-
-	@echo "Eqemu is prepared. Edit build/bin/eqemu_config.json to configure."
-
-is-vscode:
-	@if [ -z "$$REMOTE_CONTAINERS" ]; then \
-		echo "Not running in VS Code devcontainer"; \
-		exit 1; \
-	fi
-
-clean: is-vscode
 	rm -rf build
 
-.PHONY: maps
+docker-cmake:
-maps: is-vscode
+ifeq ($(findstring .devcontainer,$(CURDIR)),.devcontainer)
+	@make -C ../ -f .devcontainer/Makefile docker-cmake --no-print-directory
+	exit
+endif
+	@echo "working directory: $$PWD"
+	git submodule update --init --recursive
+	docker run ${DOCKER_ARGS} make cmake
+
+docker-build:
+ifeq ($(findstring .devcontainer,$(CURDIR)),.devcontainer)
+	@make -C ../ -f .devcontainer/Makefile docker-build --no-print-directory
+	exit
+endif
+	docker run ${DOCKER_ARGS} make build
+
+# Build image if it doesn't exist
+docker-image-build:
+ifeq ($(findstring .devcontainer,$(CURDIR)),.devcontainer)
+	@make -C ../ -f .devcontainer/Makefile docker-image-build --no-print-directory
+	exit
+endif
+ifeq ($(shell docker images -q ${NAME} 2> /dev/null),)
+	@echo "Docker image not found. Building..."
+	docker build -f Dockerfile.debian.dev -t ${NAME} .
+endif
+
+docker-arm-cmake: docker-arm-image-build
+ifeq ($(findstring .devcontainer,$(CURDIR)),.devcontainer)
+	@make -C ../ -f .devcontainer/Makefile docker-arm-cmake --no-print-directory
+	exit
+endif
+	git submodule update --init --recursive
+	docker run ${DOCKER_ARM64_ARGS} make cmake BUILD_SUFFIX=arm64
+
+docker-arm-build: docker-arm-image-build
+ifeq ($(findstring .devcontainer,$(CURDIR)),.devcontainer)
+	@make -C ../ -f .devcontainer/Makefile docker-arm-build --no-print-directory
+	exit
+endif
+	docker run ${DOCKER_ARM64_ARGS} make build BUILD_SUFFIX=arm64
+
+docker-arm-image-build:
+ifeq ($(shell docker images -q ${NAME}-arm64 2> /dev/null),)
+	@echo "Docker image not found. Building..."
+	docker build -f Dockerfile.debian.arm.dev -t ${NAME}-arm64 .
+endif
+
+docker-clean: clean
+
+.PHONY: prep
+prep:
+ifeq ($(findstring .devcontainer,$(CURDIR)),.devcontainer)
+	@make -C ../ -f .devcontainer/Makefile prep --no-print-directory
+	exit
+endif
+	@echo "Preparing build/bin for usage..."
+	mkdir -p build/bin/assets/patches
+	cp -R -u -p .devcontainer/base/eqemu_config.json build/bin/eqemu_config.json
+	cp -R -u -p .devcontainer/base/login.json build/bin/login.json
+	cp -R -u -p loginserver/login_util/* build/bin/assets/patches/
+	mkdir -p build/bin/assets
+	cp -R -u -p utils/patches build/bin/assets/
+	-unlink build/bin/lua_modules
+	cd build/bin && ln -s quests/lua_modules lua_modules
+	-unlink build/bin/mods
+	cd build/bin && ln -s quests/mods mods
+	-unlink build/bin/maps
+	cd build/bin && ln -s ../../base/maps maps
+	mkdir -p build/bin/logs
+	mkdir -p build/bin/shared
+	@echo "Eqemu is prepared. Edit build/bin/eqemu_config.json to configure."
+
+maps:
 	@echo "Downloading maps..."
-	@mkdir -p .devcontainer/repo/maps
+	@mkdir -p base/maps
-	@cd .devcontainer/repo/maps && wget -nc https://github.com/EQEmu/maps/archive/refs/heads/master.zip
+	@cd base/maps && wget -nc https://github.com/Akkadius/eqemu-maps/archive/refs/heads/master.zip
-	@cd .devcontainer/repo/maps && unzip -o master.zip
+	@cd base/maps && unzip -o master.zip
-	@cd .devcontainer/repo/maps && mv maps-master/* .
+	@cd base/maps && mv eqemu-maps-master/* .
-	@cd .devcontainer/repo/maps && rm -rf maps-master
+	@cd base/maps && rm -rf eqemu-maps-master
 	@echo "Maps downloaded."
 
+quests:
+ifeq ($(findstring .devcontainer,$(CURDIR)),.devcontainer)
+	@make -C ../ -f .devcontainer/Makefile quests --no-print-directory
+	exit
+endif
+	@cd build/bin && git clone https://github.com/ProjectEQ/projecteqquests.git quests
+
 # Runs tests
 .PHONY: test
-test: is-vscode
+test:
+ifeq ($(findstring .devcontainer,$(CURDIR)),.devcontainer)
+	@make -C ../ -f .devcontainer/Makefile test --no-print-directory
+	exit
+endif
 	cd build/bin && ./tests
 
 # Runs login binary
 .PHONY: login
-login: is-vscode check-mariadb
+login:
+ifeq ($(findstring .devcontainer,$(CURDIR)),.devcontainer)
+	@make -C ../ -f .devcontainer/Makefile login --no-print-directory
+	exit
+endif
 	cd build/bin && ./loginserver
 
-.PHONY: hotfix
-hotfix: shared
-
 # Runs shared_memory binary
 .PHONY: shared
-shared: is-vscode check-mariadb
+shared:
+ifeq ($(findstring .devcontainer,$(CURDIR)),.devcontainer)
+	@make -C ../ -f .devcontainer/Makefile shared --no-print-directory
+	exit
+endif
 	cd build/bin && ./shared_memory
 
 # Runs zone binary
 .PHONY: zone
-zone: is-vscode check-mariadb
+zone:
-	@find build/bin/logs/zone/ -type f -name 'zone*.log' -exec rm -f {} +
+ifeq ($(findstring .devcontainer,$(CURDIR)),.devcontainer)
+	@make -C ../ -f .devcontainer/Makefile zone --no-print-directory
+	exit
+endif
+	@-rm build/bin/logs/zone/zone*.log
 	cd build/bin && ./zone
 
-check-mariadb: is-vscode
-	@if ! sudo service mariadb status | grep -q 'active (running)'; then \
-		sudo service mariadb start; \
-	fi
-
 # Runs world binary
 .PHONY: world
-world: is-vscode check-mariadb
+world:
-	@find build/bin/logs/ -type f -name 'world*.log' -exec rm -f {} +
+ifeq ($(findstring .devcontainer,$(CURDIR)),.devcontainer)
+	@make -C ../ -f .devcontainer/Makefile world --no-print-directory
+	exit
+endif
+	@-rm build/bin/logs/world*.log
 	cd build/bin && ./world
 
 # Runs ucs binary
 .PHONY: ucs
-ucs: is-vscode check-mariadb
+ucs:
-	@find build/bin/logs/ -type f -name 'ucs*.log' -exec rm -f {} +
+ifeq ($(findstring .devcontainer,$(CURDIR)),.devcontainer)
+	@make -C ../ -f .devcontainer/Makefile ucs --no-print-directory
+	exit
+endif
+	@-rm build/bin/logs/ucs*.log
 	cd build/bin && ./ucs
 
 # Runs queryserv binary
 .PHONY: queryserv
-queryserv: is-vscode check-mariadb
+queryserv:
-	@find build/bin/logs/ -type f -name 'query_server*.log' -exec rm -f {} +
+ifeq ($(findstring .devcontainer,$(CURDIR)),.devcontainer)
+	@make -C ../ -f .devcontainer/Makefile queryserv --no-print-directory
+	exit
+endif
+	@-rm build/bin/logs/query_server*.log
 	cd build/bin && ./queryserv
 
-reset-content:
+valgrind-%:
-	@echo "Resetting content tables in database peq..."
+ifeq ($(findstring .devcontainer,$(CURDIR)),.devcontainer)
-	cd .devcontainer/cache/db/peq-dump && sudo mariadb --database peq -e "source create_tables_content.sql"
+	@make -C ../ -f .devcontainer/Makefile valgrind --no-print-directory
-
+	exit
-valgrind-%: is-vscode
+endif
 	cd build/bin && valgrind --leak-check=full --show-leak-kinds=all --track-origins=yes --verbose --log-file=logs/$*.valgrind.log ./$*
 
 # Start mariaDB standalone
@@ -132,33 +201,30 @@ mariadb:
 .PHONY: inject-mariadb
 inject-mariadb:
 	-sudo service mariadb start
-	-mkdir -p .devcontainer/cache/db/
+	-mkdir -p base/db/
 	-sudo mariadb -e 'DROP DATABASE IF EXISTS peq;'
 	-sudo mariadb -e 'CREATE DATABASE peq;'
-	-sudo mariadb -e "CREATE USER IF NOT EXISTS 'peq'@'127.0.0.1' IDENTIFIED BY 'peqpass';"
+	-sudo mariadb -e "CREATE USER 'peq'@'127.0.0.1' IDENTIFIED BY 'peqpass';"
 	-sudo mariadb -e "GRANT ALL PRIVILEGES ON *.* TO 'peq'@'127.0.0.1';"
-ifeq (,$(wildcard .devcontainer/cache/db/db.sql.zip))
+ifeq (,$(wildcard base/db/db.sql.zip))
-	@echo ".devcontainer/cache/db.sql.zip not found. Downloading database from https://db.eqemu.dev/latest"
+	@echo "base/db.sql.zip not found. Downloading latest from https://db.projecteq.net/"
-	wget -nc https://db.eqemu.dev/latest -O .devcontainer/cache/db/db.sql.zip
+	wget -nc https://db.projecteq.net/latest -O base/db/db.sql.zip
-	-cd .devcontainer/cache/db && unzip db.sql.zip
+	-cd base/db && unzip db.sql.zip
 endif
 	@echo "Sourcing db may take a while, please wait..."
-
+	@cd base/db/peq-dump && sudo mariadb --database peq -e "source create_all_tables.sql"
-	@cd .devcontainer/cache/db/peq-dump && sudo mariadb --database peq -e "source create_tables_content.sql"
-	@cd .devcontainer/cache/db/peq-dump && sudo mariadb --database peq -e "source create_tables_login.sql"
-	@cd .devcontainer/cache/db/peq-dump && sudo mariadb --database peq -e "source create_tables_player.sql"
-	@# deprecated cd .devcontainer/cache/db/peq-dump && sudo mariadb --database peq -e "source create_tables_queryserv.sql"
-	@cd .devcontainer/cache/db/peq-dump && sudo mariadb --database peq -e "source create_tables_state.sql"
-	@cd .devcontainer/cache/db/peq-dump && sudo mariadb --database peq -e "source create_tables_system.sql"
-
 	@echo "MariaDB is now injected."
 
 .PHONY: gm-%
-gm-%: is-vscode
+gm-%:
 	sudo mariadb --database peq -e "UPDATE account SET status=255 WHERE name = '$*';"
 	@echo "Account $* is now a GM. /camp to have it go into effect."
 
-depends: is-vscode
+depends:
+ifeq ($(findstring .devcontainer,$(CURDIR)),.devcontainer)
+	@make -C ../ -f .devcontainer/Makefile depends --no-print-directory
+	exit
+endif
 	sudo apt install graphviz pip time
 	pip3 install graphviz
 	mkdir -p build/depends
@@ -175,54 +241,44 @@ depends: is-vscode
 	@echo "Common..."
 	time python3 build/depends/dependency_graph.py -f png common build/depends/common.dot
 
-backup: is-vscode
+backup:
+ifeq ($(findstring .devcontainer,$(CURDIR)),.devcontainer)
+	@make -C ../ -f .devcontainer/Makefile backup --no-print-directory
+	exit
+endif
 	@mkdir -p build/bin/backup
 	cd build/bin && ./world database:dump --compress --player-tables --state-tables --system-tables --query-serv-tables
 
-restore-%: is-vscode
+cpu-zone:
-	@if [ -z "$*" ]; then \
-		echo "Please provide a backup file to restore from. Example: make restore-backup.sql"; \
-		exit 1; \
-	fi
-	@echo "Restoring from backup $*"
-	@sudo mariadb --database peq -e "$*"
-
-
-cpu-zone: is-vscode
 ifeq ($(findstring .devcontainer,$(CURDIR)),.devcontainer)
-	@echo "This makefile is not intended to be run from the .devcontainer directory."
+	@make -C ../ -f .devcontainer/Makefile cpu-zone --no-print-directory
 	exit
 endif
 	@cd build/bin && mkdir -p tmp
 	cd build/bin && CPUPROFILE=prof.out ./zone
 
-pprof-zone: is-vscode
+pprof-zone:
 ifeq ($(findstring .devcontainer,$(CURDIR)),.devcontainer)
-	@echo "This makefile is not intended to be run from the .devcontainer directory."
+	@make -C ../ -f .devcontainer/Makefile pprof-zone --no-print-directory
 	exit
 endif
 	cd build/bin && google-pprof --pdf zone prof.out > prof.pdf
-
+pprof-web-zone:
-pprof-gv-zone: is-vscode
 ifeq ($(findstring .devcontainer,$(CURDIR)),.devcontainer)
-	@echo "This makefile is not intended to be run from the .devcontainer directory."
+	@make -C ../ -f .devcontainer/Makefile pprof-web-zone --no-print-directory
+	exit
+endif
+	cd build/bin && google-pprof --web zone prof.out
+pprof-gv-zone:
+ifeq ($(findstring .devcontainer,$(CURDIR)),.devcontainer)
+	@make -C ../ -f .devcontainer/Makefile pprof-gv-zone --no-print-directory
 	exit
 endif
 	cd build/bin && google-pprof --gv zone prof.out > prof.gv
-
+heap-zone:
-heap-zone: is-vscode
 ifeq ($(findstring .devcontainer,$(CURDIR)),.devcontainer)
-	@echo "This makefile is not intended to be run from the .devcontainer directory."
+	@make -C ../ -f .devcontainer/Makefile heap-zone --no-print-directory
 	exit
 endif
 	@cd build/bin && mkdir -p tmp
 	cd build/bin && HEAPPROFILE=prof.out ./zone
-
-
-.PHONY: pull
-pull:
-	git pull
-	@if [ ! -d "quests" ]; then git clone https://github.com/rebuildeq/quests.git quests; fi
-	cd quests && git pull
-	@if [ ! -d "eqemu-definitions" ]; then git clone https://github.com/xackery/eqemu-definitions.git eqemu-definitions; fi
-	cd eqemu-definitions && git pull

.devcontainer/devcontainer.json

@@ -40,41 +40,10 @@
 				"GitHub.copilot",
 				"xackery.make-magic",
 				"Gruntfuggly.todo-tree",
-				"ms-vscode.cmake-tools",
+				"ms-vscode.cmake-tools"
-				"sumneko.lua"
+			]
-			],
-			"settings": {
-				"Lua.runtime.version": "Lua 5.1",
-			    "Lua.workspace.library": [
-			        "/src/repo/eqemu-definitions"
-			    ],
-			    "Lua.diagnostics.disable": [
-			        "lowercase-global"
-			    ],
-				"cmake.statusbar.advanced": {
-					"kit": {
-						"visibility": "hidden"
-					},
-					"debug": {
-						"visibility": "hidden"
-					},
-					"buildTarget": {
-						"visibility": "compact"
-					},
-					"launch": {
-						"visibility": "hidden"
-					},
-					"ctest": {
-						"visibility": "icon"
-					}
-				}
-			}
 		}
 	},
-	"mounts": [
-    "source=${localWorkspaceFolder}/.devcontainer/Makefile,target=/src/Makefile,type=bind,consistency=cached"
-	],
-
 	"workspaceFolder": "/src",
 	"workspaceMount": "source=${localWorkspaceFolder},target=/src,type=bind,consistency=cached"
 }

.drone.yml

@@ -0,0 +1,98 @@
+---
+
+kind: pipeline
+type: docker
+name: Build Linux
+
+# Limits how many of these builds can run on the drone runner at a time, this isn't about cores
+concurrency:
+  limit: 1
+
+volumes:
+  - name: cache
+    host:
+      path: /var/lib/cache-release
+
+steps:
+  - name: Build Linux X64
+    image: akkadius/eqemu-server:v14
+    environment:
+      GITHUB_TOKEN:
+        from_secret: GH_RELEASE_GITHUB_API_TOKEN
+      RCLONE_CONFIG_REMOTE_TYPE: ftp
+      RCLONE_FTP_HOST: drone.akkadius.com
+      RCLONE_FTP_USER: artifacts
+      RCLONE_FTP_PASS:
+        from_secret: RCLONE_FTP_PASS
+    commands:
+      - ./utils/scripts/build/linux-build.sh
+    volumes:
+      - name: cache
+        path: /home/eqemu/.ccache/
+
+---
+
+kind: pipeline
+type: exec
+name: Build Windows
+
+# Limits how many of these builds can run on the drone runner at a time, this isn't about cores
+concurrency:
+  limit: 1
+
+platform:
+  os: windows
+  arch: amd64
+
+steps:
+  - name: Build Windows X64
+    environment:
+      RCLONE_CONFIG_REMOTE_TYPE: ftp
+      RCLONE_FTP_HOST: drone.akkadius.com
+      RCLONE_FTP_USER: artifacts
+      RCLONE_FTP_PASS:
+        from_secret: RCLONE_FTP_PASS
+      GITHUB_TOKEN:
+        from_secret: GH_RELEASE_GITHUB_API_TOKEN
+    commands:
+      - .\utils\scripts\build\windows-build.ps1
+
+---
+
+kind: pipeline
+type: docker
+name: Publish Artifacts to Github
+
+steps:
+  - name: Upload Artifacts
+    image: akkadius/eqemu-build-releaser:v3
+    environment:
+      RCLONE_CONFIG_REMOTE_TYPE: ftp
+      RCLONE_FTP_HOST: drone.akkadius.com
+      RCLONE_FTP_USER: artifacts
+      RCLONE_FTP_PASS:
+        from_secret: RCLONE_FTP_PASS
+      GH_RELEASE_GITHUB_API_TOKEN:
+        from_secret: GH_RELEASE_GITHUB_API_TOKEN
+      GITHUB_TOKEN:
+        from_secret: GH_RELEASE_GITHUB_API_TOKEN
+    commands:
+      - ./utils/scripts/build/should-release/should-release
+      - rclone config create remote ftp env_auth true > /dev/null
+      - |
+        rclone copy remote: --include "eqemu-server*.zip" .
+      - gh-release --assets=eqemu-server-linux-x64.zip,eqemu-server-windows-x64.zip -y
+      - |
+        rclone delete remote: --include "eqemu-server*.zip"
+
+trigger:
+  branch:
+    - master
+  event:
+    - push
+
+depends_on:
+  - Build Windows
+  - Build Linux
+
+

.github/workflows/build.yaml

@@ -1,81 +0,0 @@
-name: Build
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-
-jobs:
-  linux:
-    name: Linux
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout source
-        uses: actions/checkout@v5
-        with:
-          submodules: recursive
-
-      - name: Setup ccache
-        uses: hendrikmuhs/ccache-action@v1.2
-        with:
-          key: ${{ runner.os }}-ccache
-
-      - name: Install dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y build-essential ninja-build ccache uuid-dev
-
-      - name: Configure
-        run: |
-          cmake -S . -B build -G Ninja \
-            -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-            -DCMAKE_C_COMPILER_LAUNCHER=ccache \
-            -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-            -DEQEMU_BUILD_TESTS=ON \
-            -DEQEMU_BUILD_LOGIN=ON \
-            -DEQEMU_BUILD_LUA=ON \
-            -DEQEMU_BUILD_PERL=ON \
-            -DEQEMU_BUILD_CLIENT_FILES=ON
-
-      - name: Build
-        run: cmake --build build --parallel
-
-      - name: Test
-        working-directory: build
-        run: ./bin/tests
-
-  windows:
-    name: Windows
-    runs-on: windows-latest
-    steps:
-      - name: Checkout source
-        uses: actions/checkout@v5
-        with:
-          submodules: recursive
-
-      - name: Enable long paths
-        run: git config --global core.longpaths true
-
-      - name: Setup MSVC environment
-        uses: ilammy/msvc-dev-cmd@v1
-        with:
-          arch: x64
-
-      - name: Configure
-        shell: pwsh
-        run: |
-          cmake -S . -B build -G "Visual Studio 17 2022" -A x64 `
-            -DCMAKE_BUILD_TYPE=RelWithDebInfo `
-            -DEQEMU_BUILD_TESTS=ON `
-            -DEQEMU_BUILD_LOGIN=ON `
-            -DEQEMU_BUILD_LUA=ON `
-            -DEQEMU_BUILD_ZLIB=ON `
-            -DEQEMU_BUILD_CLIENT_FILES=ON
-
-      - name: Build
-        shell: pwsh
-        run: cmake --build build --config RelWithDebInfo --target ALL_BUILD -- /m
-
-      - name: Test
-        working-directory: build
-        run: ./bin/RelWithDebInfo/tests.exe

.gitmodules

@@ -1,6 +1,18 @@
+[submodule "submodules/glm"]
+	path = submodules/glm
+	url = https://github.com/g-truc/glm.git
+[submodule "submodules/fmt"]
+	path = submodules/fmt
+	url = https://github.com/fmtlib/fmt.git
+[submodule "submodules/libuv"]
+	path = submodules/libuv
+	url = https://github.com/libuv/libuv.git
+[submodule "submodules/cereal"]
+	path = submodules/cereal
+	url = https://github.com/USCiLab/cereal.git
 [submodule "submodules/websocketpp"]
 	path = submodules/websocketpp
 	url = https://github.com/zaphoyd/websocketpp.git
-[submodule "submodules/vcpkg"]
+[submodule "submodules/recastnavigation"]
-	path = submodules/vcpkg
+	path = submodules/recastnavigation
-	url = https://github.com/microsoft/vcpkg.git
+	url = https://github.com/EQEmu/recastnavigation.git

.vscode/settings.json

@@ -21,6 +21,14 @@
 		"${workspaceFolder}/dependencies/zlibng"
 	],
 	"telemetry.enableTelemetry": false,
+	"cmake.buildDirectory": "${workspaceFolder}/build",
+	"cmake.configureArgs": [
+		"-DEQEMU_BUILD_LOGIN=ON",
+		"-DEQEMU_BUILD_TESTS=ON",
+		"-DCMAKE_CXX_COMPILER_LAUNCHER=ccache",
+		"-DEQEMU_ADD_PROFILER=ON",
+		"Ninja"
+	],
 	"cmake.skipConfigureIfCachePresent": true,
 	"cmake.configureOnOpen": false,
 	"files.associations": {
@@ -107,5 +115,22 @@
 		"format": "cpp",
 		"ranges": "cpp",
 		"span": "cpp"
+	},
+	"cmake.statusbar.advanced": {
+		"kit": {
+			"visibility": "hidden",
+		},
+		"debug": {
+			"visibility": "hidden",
+		},
+		"buildTarget": {
+			"visibility": "hidden",
+		},
+		"launch": {
+			"visibility": "hidden",
+		},
+		"ctest": {
+			"visibility": "icon",
+		}
 	}
 }

BUILD.md

@@ -4,35 +4,46 @@ This guide is far from exhaustive, you should expect to have some experience wit
 
 ### CMake
 
-EQEmu uses CMake as the build system on all platforms.  You will need CMake 3.20 or higher to build from source.
+EQEmu uses CMake as the build system on all platforms.  You will need CMake 3.2 or higher to build from source.
 
 ### Dependencies
 
 The following libraries are required to build from source:
-- uuid (unix)
+- [boost](https://www.boost.org/ "boost")
+- [zlib](https://www.zlib.net/ "zlib") (If not included the source will build [zlib-ng](https://github.com/zlib-ng/zlib-ng "zlib-ng") instead)
+- [libmysql](https://dev.mysql.com/downloads/connector/c/ "libmysql") or [libmariadb](https://github.com/MariaDB/mariadb-connector-c "libmariadb")
 
 The following libraries are not strictly required but in many cased recommended.
+- [OpenSSL](https://www.openssl.org/ "OpenSSL") or [mbedTLS](https://tls.mbed.org/ "mbedTLS") (Required for the loginserver and headless client)
+- [libsodium](https://github.com/jedisct1/libsodium "libsodium") (Required for strong password hashing on the loginserver)
+- [Lua 5.1](https://www.lua.org/ "Lua 5.1") or [LuaJit](http://luajit.org/ "LuaJit") (Required for Lua Quest Scripting)
 - [Perl](https://www.perl.org/ "Perl") (Required for Perl Quest Scripting)
 
 ##### Windows
+For windows it is suggested you make use of [vcpkg](https://github.com/microsoft/vcpkg "vcpkg") if you wish to build your own dependencies.
+
 If you wish to use Perl then you should use whichever version of Perl you have installed on the target system.
 
+You can also download a vcpkg export from our releases section for Visual Studio [x86](https://github.com/EQEmu/Server/releases/download/v1.2/vcpkg-export-x86.zip "x86") or [x64](https://github.com/EQEmu/Server/releases/download/v1.2/vcpkg-export-x64.zip "x64") that includes a toolchain file you can pass to CMake.
+
 ##### Linux
 For Linux you simply can install the dependencies from your package manager, below is an example of doing it on Ubuntu using apt-get.
 
-    sudo apt-get install libperl-dev uuid-dev
+    sudo apt-get install libmysqlclient-dev libperl-dev libboost-dev liblua5.1-0-dev zlib1g-dev uuid-dev libssl-dev
 
 ### Running CMake
 
 ##### Windows
 The following is a modified command our automated build server uses to run CMake via the release vcpkg export and its toolchain file. 
 
+Assuming it is starting in c:/projects/eqemu and the x64 dependencies were extracted to c:/projects/eqemu/vcpkg.
+
 	mkdir build
 	cd build
-	cmake -G "Visual Studio 15 2022 Win64" -DEQEMU_BUILD_TESTS=ON -DEQEMU_BUILD_LOGIN=ON ..
+	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" ..
 
 ##### Linux
-Similarly to Windows running CMake on Linux is simple it just uses a different generator.
+Similarly to Windows running CMake on Linux is simple it just omits the toolchain file and uses a different generator.
 
 	mkdir build
 	cd build

CHANGELOG.md

@@ -1,283 +1,3 @@
-## [23.10.3] 9/16/2025
-
-### Hotfix
-
-* Hotfix crashes occurring in #4987. @Akkadius 2025-09-17
-
-## [23.10.2] 9/16/2025
-
-### Hotfix
-
-* Revert #4996 as it was causing critical issues with spells that needs to be further investigated. @Akkadius 2025-09-17
-
-## [23.10.1] 9/16/2025
-
-### Hotfix
-* Fixed Mail Key Bug ([#5015](https://github.com/EQEmu/Server/pull/5015)) @Kinglykrab 2025-09-16
-
-## [23.10.0] 9/15/2025
-
-### Build
-
-* Fix Linking with GCC ([#4969](https://github.com/EQEmu/Server/pull/4969)) @solar984 2025-08-03
-
-### Code
-
-* Add #npcedit npc_tint_id Help Message ([#4982](https://github.com/EQEmu/Server/pull/4982)) @Kinglykrab 2025-08-17
-* Cleanup #show ip_lookup Message ([#5005](https://github.com/EQEmu/Server/pull/5005)) @Kinglykrab 2025-08-30
-* Fix #set race 0 Message ([#5004](https://github.com/EQEmu/Server/pull/5004)) @Kinglykrab 2025-08-30
-* Fix Issues with Strings::Commify and Mob::SendStatsWindow ([#4984](https://github.com/EQEmu/Server/pull/4984)) @Kinglykrab 2025-08-17
-* Remove Attributions ([#4988](https://github.com/EQEmu/Server/pull/4988)) @KimLS 2025-08-16
-* Remove Unused errorname Variable ([#5001](https://github.com/EQEmu/Server/pull/5001)) @Kinglykrab 2025-08-29
-
-### Commands
-
-* Add #find account Subcommand ([#4981](https://github.com/EQEmu/Server/pull/4981)) @Kinglykrab 2025-08-17
-* Add #show keyring Subcommand ([#4973](https://github.com/EQEmu/Server/pull/4973)) @Kinglykrab 2025-08-03
-* Add #task complete Saylink to #task show ([#4985](https://github.com/EQEmu/Server/pull/4985)) @Kinglykrab 2025-08-17
-
-### Constants
-
-* Change Race Changes to Race Namespace ([#5000](https://github.com/EQEmu/Server/pull/5000)) @Kinglykrab 2025-08-30
-* Convert SE Defines to SpellEffect Namespace ([#4999](https://github.com/EQEmu/Server/pull/4999)) @Kinglykrab 2025-08-30
-
-### Database
-
-* Add `heal_amount` to `character_stats_record` ([#4986](https://github.com/EQEmu/Server/pull/4986)) @Kinglykrab 2025-08-17
-
-### Fixes
-
-* Fix #show recipe uint16 Cap ([#4978](https://github.com/EQEmu/Server/pull/4978)) @Kinglykrab 2025-08-11
-* Fix Race 474 for Titanium ([#4979](https://github.com/EQEmu/Server/pull/4979)) @regneq 2025-08-11
-* Fix Recipe Inspect Bug ([#4994](https://github.com/EQEmu/Server/pull/4994)) @Kinglykrab 2025-08-30
-* Fix Several Evolving Item Bugs ([#4992](https://github.com/EQEmu/Server/pull/4992)) @neckkola 2025-09-08
-* Fix Task Reloading ([#5002](https://github.com/EQEmu/Server/pull/5002)) @Kinglykrab 2025-08-29
-
-### Loginserver
-
-* Fix Legacy World When Using Local DB ([#4970](https://github.com/EQEmu/Server/pull/4970)) @solar984 2025-08-03
-
-### Pets
-
-* Add Pet Constants and Methods ([#4987](https://github.com/EQEmu/Server/pull/4987)) @Kinglykrab 2025-08-17
-
-### Quest API
-
-* Add EVENT_CHARM_START and EVENT_CHARM_END ([#5013](https://github.com/EQEmu/Server/pull/5013)) @Kinglykrab 2025-09-15
-* Add GetKeyRing() to Perl/Lua ([#4980](https://github.com/EQEmu/Server/pull/4980)) @Kinglykrab 2025-08-17
-* Add GetNPCTintIndex() to Perl/Lua ([#4983](https://github.com/EQEmu/Server/pull/4983)) @Kinglykrab 2025-08-17
-* Add GetTimers() and GetPausedTimers() to Perl/Lua ([#4965](https://github.com/EQEmu/Server/pull/4965)) @Kinglykrab 2025-08-03
-* Add Identifiers to Get/Modify NPC Stat Methods ([#5012](https://github.com/EQEmu/Server/pull/5012)) @Kinglykrab 2025-09-15
-
-### Repositories
-
-* Convert Character Inspect Messages to Repositories ([#4997](https://github.com/EQEmu/Server/pull/4997)) @Kinglykrab 2025-08-30
-* Convert Damage Shield Types to Repositories ([#4995](https://github.com/EQEmu/Server/pull/4995)) @Kinglykrab 2025-08-30
-* Convert Item Loading to Repositories ([#4998](https://github.com/EQEmu/Server/pull/4998)) @Kinglykrab 2025-08-30
-* Convert Mail Key to Repositories ([#5007](https://github.com/EQEmu/Server/pull/5007)) @Kinglykrab 2025-09-15
-* Convert Shared Bank Platinum to Repositories ([#5006](https://github.com/EQEmu/Server/pull/5006)) @Kinglykrab 2025-09-02
-* Convert Spell Loading to Repositories ([#4996](https://github.com/EQEmu/Server/pull/4996)) @Kinglykrab 2025-08-30
-* Convert Total Time Played to Repositories ([#5008](https://github.com/EQEmu/Server/pull/5008)) @Kinglykrab 2025-09-15
-
-## [23.9.1] 8/2/2025
-
-### Hotfix
-
-* Fix Quest Ownership Edge Case ([#4977](https://github.com/EQEmu/Server/pull/4977)) @Kinglykrab 2025-08-02
-
-## [23.9.0] 8/2/2025
-
-### Bots
-
-* Fix FinishBuffing rule ([#4961](https://github.com/EQEmu/Server/pull/4961)) @nytmyr 2025-07-01
-* Fix ^cast resurrects ([#4958](https://github.com/EQEmu/Server/pull/4958)) @nytmyr 2025-06-29
-
-### Build
-
-* Fix Linking with GCC ([#4969](https://github.com/EQEmu/Server/pull/4969)) @solar984 2025-08-03
-* More Build Speed Improvements ([#4959](https://github.com/EQEmu/Server/pull/4959)) @Akkadius 2025-06-30
-
-### Commands
-
-* Add #show keyring Subcommand ([#4973](https://github.com/EQEmu/Server/pull/4973)) @Kinglykrab 2025-08-03
-
-### Database
-
-* Add Indexes to NPC's Spawns Loot ([#4972](https://github.com/EQEmu/Server/pull/4972)) @Akkadius 2025-07-30
-
-### Feature
-
-* Zone Scripting ([#4908](https://github.com/EQEmu/Server/pull/4908)) @Kinglykrab 2025-07-10
-
-### Fixes
-
-* Add a missing Froglok starting area for Titanium Startzone. ([#4962](https://github.com/EQEmu/Server/pull/4962)) @regneq 2025-07-04
-* Fix Hero's Forge Ingame and Character Select ([#4966](https://github.com/EQEmu/Server/pull/4966)) @Kinglykrab 2025-07-30
-* Show player count on the server list status. ([#4971](https://github.com/EQEmu/Server/pull/4971)) @regneq 2025-07-30
-
-### Loginserver
-
-* Fix Legacy World When Using Local DB ([#4970](https://github.com/EQEmu/Server/pull/4970)) @solar984 2025-08-03
-
-### Performance
-
-* Clear Wearchange Deduplication Cache ([#4960](https://github.com/EQEmu/Server/pull/4960)) @Akkadius 2025-06-30
-
-### Quest API
-
-* Add GetMemberRole() to Perl/Lua ([#4963](https://github.com/EQEmu/Server/pull/4963)) @Barathos 2025-07-10
-* Add GetTimers() and GetPausedTimers() to Perl/Lua ([#4965](https://github.com/EQEmu/Server/pull/4965)) @Kinglykrab 2025-08-03
-
-## [23.8.1] 6/28/2025
-
-### Crash Fix
-
-* Fix Possible Crashes with Raid Methods ([#4955](https://github.com/EQEmu/Server/pull/4955)) @Kinglykrab 2025-06-26
-
-### Databuckets
-
-* Revert Caching Changes of #4917 ([#4957](https://github.com/EQEmu/Server/pull/4957)) @Akkadius 2025-06-28
-
-### Fixes
-
-* Fix FindCharacter Using content_db ([#4956](https://github.com/EQEmu/Server/pull/4956)) @Kinglykrab 2025-06-26
-* Fix Hero Forge on Character Select ([#4954](https://github.com/EQEmu/Server/pull/4954)) @Kinglykrab 2025-06-26
-
-## [23.8.0] 6/25/2025
-
-### API
-
-* Add wwmarquee <type> <message> ([#4919](https://github.com/EQEmu/Server/pull/4919)) @Akkadius 2025-06-23
-
-### Build
-
-* Significantly Improve Build Times Using Unity Builds ([#4948](https://github.com/EQEmu/Server/pull/4948)) @Akkadius 2025-06-22
-
-### Code
-
-* AdventureManager Global to Singleton Cleanup ([#4931](https://github.com/EQEmu/Server/pull/4931)) @Kinglykrab 2025-06-25
-* Cleanup Strings Header ([#4950](https://github.com/EQEmu/Server/pull/4950)) @Akkadius 2025-06-22
-* ClientList Global to Singleton Cleanup ([#4942](https://github.com/EQEmu/Server/pull/4942)) @Kinglykrab 2025-06-25
-* DatabaseUpdate Global to Singleton Cleanup ([#4943](https://github.com/EQEmu/Server/pull/4943)) @Kinglykrab 2025-06-25
-* DiscordManager Global to Singleton Cleanup ([#4926](https://github.com/EQEmu/Server/pull/4926)) @Kinglykrab 2025-06-25
-* EQ::Random Global to Singleton Cleanup ([#4936](https://github.com/EQEmu/Server/pull/4936)) @Kinglykrab 2025-06-22
-* EQEmuLogSys Global to Singleton Cleanup ([#4925](https://github.com/EQEmu/Server/pull/4925)) @Akkadius 2025-06-25
-* EvolvingItemsManager Global to Singleton Cleanup ([#4929](https://github.com/EQEmu/Server/pull/4929)) @Kinglykrab 2025-06-25
-* LFGuildManager Global to Singleton Cleanup ([#4927](https://github.com/EQEmu/Server/pull/4927)) @Kinglykrab 2025-06-25
-* LoginServerList Global to Singleton Cleanup ([#4941](https://github.com/EQEmu/Server/pull/4941)) @Kinglykrab 2025-06-25
-* Optimize PCH Config (Faster Builds) ([#4951](https://github.com/EQEmu/Server/pull/4951)) @Akkadius 2025-06-22
-* PCH Cleanup ([#4952](https://github.com/EQEmu/Server/pull/4952)) @Akkadius 2025-06-25
-* PathManager Global to Singleton Cleanup ([#4924](https://github.com/EQEmu/Server/pull/4924)) @Akkadius 2025-06-22
-* PetitionList Global to Singleton Cleanup ([#4944](https://github.com/EQEmu/Server/pull/4944)) @Kinglykrab 2025-06-25
-* PlayerEventLogs Global to Singleton Cleanup ([#4928](https://github.com/EQEmu/Server/pull/4928)) @Kinglykrab 2025-06-25
-* QueryServConnection Global to Singleton Cleanup ([#4938](https://github.com/EQEmu/Server/pull/4938)) @Kinglykrab 2025-06-25
-* Remove Lua Rule Constants ([#4949](https://github.com/EQEmu/Server/pull/4949)) @Akkadius 2025-06-22
-* Remove Regex Compile Bloat ([#4947](https://github.com/EQEmu/Server/pull/4947)) @Akkadius 2025-06-22
-* Remove Unused MZoneShutdown Mutex ([#4946](https://github.com/EQEmu/Server/pull/4946)) @Kinglykrab 2025-06-22
-* SharedTaskManager Global to Singleton Cleanup ([#4930](https://github.com/EQEmu/Server/pull/4930)) @Kinglykrab 2025-06-25
-* SkillCaps Global to Singleton Cleanup ([#4933](https://github.com/EQEmu/Server/pull/4933)) @Kinglykrab 2025-06-22
-* TaskManager Global to Singleton Cleanup ([#4945](https://github.com/EQEmu/Server/pull/4945)) @Kinglykrab 2025-06-22
-* UCSConnection Global to Singleton Cleanup ([#4937](https://github.com/EQEmu/Server/pull/4937)) @Kinglykrab 2025-06-25
-* WebInterfaceList Global to Singleton Cleanup ([#4935](https://github.com/EQEmu/Server/pull/4935)) @Kinglykrab 2025-06-25
-* WorldContentServer Global to Singleton Cleanup ([#4939](https://github.com/EQEmu/Server/pull/4939)) @Kinglykrab 2025-06-25
-* WorldEventScheduler and ZoneEventScheduler Global to Singleton Cleanup ([#4932](https://github.com/EQEmu/Server/pull/4932)) @Kinglykrab 2025-06-25
-* ZSList Global to Singleton Cleanup ([#4940](https://github.com/EQEmu/Server/pull/4940)) @Kinglykrab 2025-06-25
-* ZoneStore Global to Singleton Cleanup ([#4934](https://github.com/EQEmu/Server/pull/4934)) @Kinglykrab 2025-06-23
-
-### Corpses
-
-* Add corpse entity variables to DB ([#4911](https://github.com/EQEmu/Server/pull/4911)) @fryguy503 2025-06-25
-
-### Databuckets
-
-* Move Databuckets to Common ([#4918](https://github.com/EQEmu/Server/pull/4918)) @Akkadius 2025-06-16
-* Nested Caching ([#4917](https://github.com/EQEmu/Server/pull/4917)) @Akkadius 2025-06-25
-
-### Doors
-
-* Fix door saving for versions ([#4905](https://github.com/EQEmu/Server/pull/4905)) @nytmyr 2025-06-09
-
-### Fixes
-
-* Bulk Send Corpses after Idle State ([#4910](https://github.com/EQEmu/Server/pull/4910)) @Akkadius 2025-06-09
-* Fix ClientList Singleton Shortcomings of #4942  @Akkadius 2025-06-25
-* Fix breaking changes to Titanium, SoF, SoD patches causes by big bags update ([#4922](https://github.com/EQEmu/Server/pull/4922)) @regneq 2025-06-25
-
-### Logs
-
-* Fix output for tasks in logs ([#4907](https://github.com/EQEmu/Server/pull/4907)) @joligario 2025-06-09
-
-### Performance
-
-* Auto Idle / AFK ([#4903](https://github.com/EQEmu/Server/pull/4903)) @Akkadius 2025-05-22
-* Wearchange Packet Send Deduplication ([#4916](https://github.com/EQEmu/Server/pull/4916)) @Akkadius 2025-06-25
-
-### Player Event Logs
-
-* Don't Clear Event Data on ETL Events ([#4913](https://github.com/EQEmu/Server/pull/4913)) @Akkadius 2025-06-25
-
-### Player Events
-
-* Don't Write Empty Data ([#4912](https://github.com/EQEmu/Server/pull/4912)) @Akkadius 2025-06-25
-* Zone Fetch Settings from QS if Enabled ([#4915](https://github.com/EQEmu/Server/pull/4915)) @Akkadius 2025-06-25
-
-### Quest API
-
-* Add CompleteTask and UncompleteTask methods to Perl/Lua ([#4921](https://github.com/EQEmu/Server/pull/4921)) @Barathos 2025-06-25
-* Lua Client Scoped EnableTitleSets ([#4914](https://github.com/EQEmu/Server/pull/4914)) @fryguy503 2025-06-25
-
-### Quests
-
-* Support Multiple Quest, Plugin, and Lua Module Paths ([#4906](https://github.com/EQEmu/Server/pull/4906)) @Akkadius 2025-06-09
-
-### World API
-
-* Input Validation ([#4904](https://github.com/EQEmu/Server/pull/4904)) @Akkadius 2025-05-22
-
-## [23.7.0] 5/19/2025
-
-### CLI
-
-* Add custom database version output ([#4901](https://github.com/EQEmu/Server/pull/4901)) @joligario 2025-05-18
-* Fix MySQL check in database dumper ([#4897](https://github.com/EQEmu/Server/pull/4897)) @joligario 2025-05-16
-
-### Commands
-
-* Add #zonevariable Command ([#4882](https://github.com/EQEmu/Server/pull/4882)) @Kinglykrab 2025-05-15
-
-### Database
-
-* Add Custom Database Migrations for Operators ([#4892](https://github.com/EQEmu/Server/pull/4892)) @Akkadius 2025-05-16
-* Remove Transaction Wrapped Character Save ([#4894](https://github.com/EQEmu/Server/pull/4894)) @Akkadius 2025-05-16
-
-### Fixes
-
-* Deadlock on failed #copycharacter commands ([#4887](https://github.com/EQEmu/Server/pull/4887)) @Akkadius 2025-05-16
-
-### Logging
-
-* Auto Update Log Category Names ([#4890](https://github.com/EQEmu/Server/pull/4890)) @Akkadius 2025-05-16
-
-### Netcode
-
-* Resend Logic Adjustments ([#4900](https://github.com/EQEmu/Server/pull/4900)) @Akkadius 2025-05-18
-
-### Player Events
-
-* Add rule to ignore configured GM commands ([#4888](https://github.com/EQEmu/Server/pull/4888)) @Akkadius 2025-05-16
-
-### Rules
-
-* Auto Update Rule Notes from Source ([#4891](https://github.com/EQEmu/Server/pull/4891)) @Akkadius 2025-05-16
-
-### World
-
-* Fix Rarer Reload Deadlock ([#4893](https://github.com/EQEmu/Server/pull/4893)) @Akkadius 2025-05-16
-
-### Zone State
-
-* Load New Spawn2 Data When Present ([#4889](https://github.com/EQEmu/Server/pull/4889)) @Akkadius 2025-05-16
-
 ## [23.6.0] 5/14/2025
 
 ### Bots

CMakeLists.txt

@@ -1,180 +1,487 @@
-cmake_minimum_required(VERSION 3.20.0)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.12)
 
-set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/" ${CMAKE_MODULE_PATH})
+SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/" ${CMAKE_MODULE_PATH})
 
-if(NOT CMAKE_TOOLCHAIN_FILE)
+IF(POLICY CMP0074)
-	if(DEFINED ENV{VCPKG_ROOT})
+	CMAKE_POLICY(SET CMP0074 NEW)
-		message(STATUS "Using vcpkg from VCPKG_ROOT")
+ENDIF()
-        set(CMAKE_TOOLCHAIN_FILE
-            "$ENV{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake"
-            CACHE FILEPATH "Vcpkg toolchain file"
-        )
-	else()
-        message(STATUS "Using vcpkg submodule")
-        set(CMAKE_TOOLCHAIN_FILE
-            "${CMAKE_CURRENT_SOURCE_DIR}/submodules/vcpkg/scripts/buildsystems/vcpkg.cmake"
-            CACHE FILEPATH "Vcpkg toolchain file"
-        )
-    endif()
-endif()
 
-project(EQEmu
+PROJECT(EQEmu)
-	VERSION 24.10.3
-	LANGUAGES CXX 
-)
 
-#explicitly set CMP0167 for Find Boost
+IF(NOT CMAKE_BUILD_TYPE)
-if(POLICY CMP0167)
+	SET(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING "Choose the type of build." FORCE)
-  cmake_policy(SET CMP0167 NEW)
+ENDIF(NOT CMAKE_BUILD_TYPE)
-endif()
 
-if(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
+SET(CMAKE_CXX_STANDARD 20)
-	set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING "Build type")
+SET(CMAKE_CXX_STANDARD_REQUIRED ON)
-endif()
+SET(CMAKE_CXX_EXTENSIONS OFF)
 
-set(CMAKE_CXX_STANDARD 20)
+OPTION(EQEMU_BUILD_STATIC "Build with static linking" OFF)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
+OPTION(EQEMU_BUILD_PCH "Build with precompiled headers (Windows)" ON)
-set(CMAKE_CXX_EXTENSIONS OFF)
 
-option(EQEMU_BUILD_PCH "Build with precompiled headers (Windows)" ON)
+IF (EQEMU_BUILD_STATIC)
+	SET(BUILD_SHARED_LIBS OFF)
+	SET(CMAKE_FIND_LIBRARY_SUFFIXES ".lib" ".a")
+	MESSAGE(STATUS "Building with static linking")
+	SET(CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++")
+	IF (UNIX)
+		SET(PERL_LIBRARY "/opt/eqemu-perl/lib/5.32.1/x86_64-linux-thread-multi/CORE/libperl.so")
+		SET(PERL_INCLUDE_PATH "/opt/eqemu-perl/lib/5.32.1/x86_64-linux-thread-multi/CORE/")
+		SET(PERL_EXECUTABLE "/opt/eqemu-perl/bin/perl")
+	ENDIF ()
+ENDIF (EQEMU_BUILD_STATIC)
 
-if(MSVC)
-	add_compile_options(/bigobj)
-	add_compile_definitions(_CRT_SECURE_NO_WARNINGS NOMINMAX CRASH_LOGGING _HAS_AUTO_PTR_ETC)
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
 
-	option(EQEMU_DISABLE_MSVC_WARNINGS "Disable MSVC compile warnings." ON)
+# Requires libgoogle-perftools-dev google-perftools packages for linux (debian)
-	if(EQEMU_DISABLE_MSVC_WARNINGS)
+IF(EQEMU_ADD_PROFILER)
-		add_compile_options(/W0 /wd4005 /wd4996 /nologo /Os)
+	SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--no-as-needed,-lprofiler,--as-needed")
-	endif()
+ENDIF(EQEMU_ADD_PROFILER)
-else()
+
-	add_compile_definitions(HAS_UNION_SEMUN)
+IF(USE_MAP_MMFS)
-endif()
+	ADD_DEFINITIONS(-DUSE_MAP_MMFS)
+ENDIF (USE_MAP_MMFS)
+
+IF(MSVC)
+	ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS)
+	ADD_DEFINITIONS(-DNOMINMAX)
+	ADD_DEFINITIONS(-DCRASH_LOGGING)
+	ADD_DEFINITIONS(-D_HAS_AUTO_PTR_ETC) # for Luabind on C++17
+
+	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
+
+	OPTION(EQEMU_DISABLE_MSVC_WARNINGS "Disable MSVC compile warnings." ON)
+	IF(EQEMU_DISABLE_MSVC_WARNINGS)
+		ADD_DEFINITIONS( "/W0 /D_CRT_SECURE_NO_WARNINGS /wd4005 /wd4996 /nologo /Os")
+	ENDIF(EQEMU_DISABLE_MSVC_WARNINGS)
+ELSE(MSVC)
+	ADD_DEFINITIONS(-DHAS_UNION_SEMUN)
+ENDIF(MSVC)
 
 #FreeBSD support
-if(UNIX)
+IF(UNIX)
-	if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
+	IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
-		add_compile_definitions(FREEBSD)
+		ADD_DEFINITIONS(-DFREEBSD)
-		add_compile_definitions(_GLIBCXX_USE_C99)
+		ADD_DEFINITIONS(-D_GLIBCXX_USE_C99)
-		set(FREEBSD TRUE)
+		SET(FREEBSD TRUE)
-	endif()
+	ENDIF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
-	if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
+	IF(CMAKE_SYSTEM_NAME MATCHES "Darwin")
-		add_compile_definitions(DARWIN)
+		ADD_DEFINITIONS(-DDARWIN)
-		set(DARWIN TRUE)
+		SET(DARWIN TRUE)
-	endif()
+	ENDIF(CMAKE_SYSTEM_NAME MATCHES "Darwin")
-endif()
+ENDIF(UNIX)
 
-find_package(Boost REQUIRED COMPONENTS dynamic_bitset foreach tuple)
+ADD_DEFINITIONS(-DGLM_FORCE_RADIANS)
-find_package(cereal CONFIG REQUIRED)
+ADD_DEFINITIONS(-DGLM_FORCE_CTOR_INIT)
-find_package(fmt CONFIG REQUIRED)
+ADD_DEFINITIONS(-DGLM_ENABLE_EXPERIMENTAL)
-find_package(glm CONFIG REQUIRED)
-find_package(unofficial-libmariadb CONFIG REQUIRED)
-find_package(libuv CONFIG REQUIRED)
-find_package(OpenSSL REQUIRED)
-find_package(recastnavigation CONFIG REQUIRED)
-find_package(ZLIB REQUIRED)
-find_package(LuaJit REQUIRED)
-find_package(unofficial-sodium CONFIG REQUIRED)
-find_package(PerlLibs)
 
-message(STATUS "**************************************************")
+#MSVC can fetch dependencies automatically.
-message(STATUS "* Library Detection                              *")
+IF(MSVC)
-message(STATUS "**************************************************")
+	INCLUDE("${CMAKE_SOURCE_DIR}/cmake/DependencyHelperMSVC.cmake")
+ENDIF()
 
-if(MARIADB_FOUND)
+#Find everything we need
-	message(STATUS "* MariaDB:                                 FOUND *")
+FIND_PACKAGE(Boost REQUIRED)
-else()
+FIND_PACKAGE(MySQL)
-	message(STATUS "* MariaDB:                               MISSING *")
+FIND_PACKAGE(MariaDB)
-endif()
+FIND_PACKAGE(ZLIB)
+FIND_PACKAGE(OpenSSL)
+FIND_PACKAGE(Lua51)
+FIND_PACKAGE(LuaJit)
+FIND_PACKAGE(PerlLibs)
+FIND_PACKAGE(Sodium)
+FIND_PACKAGE(mbedTLS)
 
-if(ZLIB_FOUND)
+MESSAGE(STATUS "**************************************************")
-	message(STATUS "* ZLIB:                                    FOUND *")
+MESSAGE(STATUS "* Library Detection                              *")
-else()
+MESSAGE(STATUS "**************************************************")
-	message(STATUS "* ZLIB:                                  MISSING *")
-endif()
 
-if(LuaJit_FOUND)
+IF(MYSQL_FOUND)
-	message(STATUS "* LuaJIT:                                  FOUND *")
+	MESSAGE(STATUS "* MySQL:                                   FOUND *")
-else()
+ELSE()
-	message(STATUS "* LuaJIT:                                MISSING *")
+	MESSAGE(STATUS "* MySQL:                                 MISSING *")
-endif()
+ENDIF()
 
-if(PerlLibs_FOUND)
+IF(MARIADB_FOUND)
-	message(STATUS "* Perl:                                    FOUND *")
+	MESSAGE(STATUS "* MariaDB:                                 FOUND *")
-else()
+ELSE()
-	message(STATUS "* Perl:                                  MISSING *")
+	MESSAGE(STATUS "* MariaDB:                               MISSING *")
-endif()
+ENDIF()
 
-if(OpenSSL_FOUND)
+IF(ZLIB_FOUND)
-	message(STATUS "* OpenSSL:                                 FOUND *")
+	MESSAGE(STATUS "* ZLIB:                                    FOUND *")
-else()
+ELSE()
-	message(STATUS "* OpenSSL:                               MISSING *")
+	MESSAGE(STATUS "* ZLIB:                                  MISSING *")
-endif()
+ENDIF()
 
-message(STATUS "PERL_INCLUDE_PATH: ${PERL_INCLUDE_PATH}")
+IF(Lua51_FOUND)
-message(STATUS "PERL_LIBRARY: ${PERL_LIBRARY}")
+	MESSAGE(STATUS "* Lua:                                     FOUND *")
-message(STATUS "PERL_INCLUDE_DIR: ${PERL_INCLUDE_DIR}")
+ELSE()
-message(STATUS "PERL_INCLUDE_DIRS: ${PERL_INCLUDE_DIRS}")
+	MESSAGE(STATUS "* Lua:                                   MISSING *")
-message(STATUS "PERL_LIBRARIES: ${PERL_LIBRARIES}")
+ENDIF()
-message(STATUS "PERL_VERSION: ${PERL_VERSION}")
+
-message(STATUS "**************************************************")
+IF(LuaJit_FOUND)
+	MESSAGE(STATUS "* LuaJIT:                                  FOUND *")
+ELSE()
+	MESSAGE(STATUS "* LuaJIT:                                MISSING *")
+ENDIF()
+
+IF(PerlLibs_FOUND)
+	MESSAGE(STATUS "* Perl:                                    FOUND *")
+ELSE()
+	MESSAGE(STATUS "* Perl:                                  MISSING *")
+ENDIF()
+
+IF(SODIUM_FOUND)
+	MESSAGE(STATUS "* libsodium:                               FOUND *")
+ELSE()
+	MESSAGE(STATUS "* libsodium:                             MISSING *")
+ENDIF()
+
+IF(OpenSSL_FOUND)
+	MESSAGE(STATUS "* OpenSSL:                                 FOUND *")
+ELSE()
+	MESSAGE(STATUS "* OpenSSL:                               MISSING *")
+ENDIF()
+
+IF(MBEDTLS_FOUND)
+	MESSAGE(STATUS "* mbedTLS:                                 FOUND *")
+ELSE()
+	MESSAGE(STATUS "* mbedTLS:                               MISSING *")
+ENDIF()
+
+MESSAGE(STATUS "PERL_INCLUDE_PATH: ${PERL_INCLUDE_PATH}")
+MESSAGE(STATUS "PERL_LIBRARY: ${PERL_LIBRARY}")
+MESSAGE(STATUS "PERL_INCLUDE_DIR: ${PERL_INCLUDE_DIR}")
+MESSAGE(STATUS "PERL_INCLUDE_DIRS: ${PERL_INCLUDE_DIRS}")
+MESSAGE(STATUS "PERL_LIBRARIES: ${PERL_LIBRARIES}")
+MESSAGE(STATUS "PERL_VERSION: ${PERL_VERSION}")
+
+MESSAGE(STATUS "**************************************************")
 
 #options
-option(EQEMU_BUILD_SERVER "Build the game server." ON)
+OPTION(EQEMU_COMMANDS_LOGGING "Enable GM Command logs" ON)
-option(EQEMU_BUILD_LOGIN "Build the login server." ON)
+OPTION(EQEMU_BUILD_SERVER "Build the game server." ON)
-option(EQEMU_BUILD_TESTS "Build utility tests." OFF)
+OPTION(EQEMU_BUILD_LOGIN "Build the login server." ON)
-option(EQEMU_BUILD_CLIENT_FILES "Build Client Import/Export Data Programs." ON)
+OPTION(EQEMU_BUILD_HC "Build the headless client." OFF)
+OPTION(EQEMU_BUILD_TESTS "Build utility tests." OFF)
+OPTION(EQEMU_BUILD_CLIENT_FILES "Build Client Import/Export Data Programs." ON)
+OPTION(EQEMU_PREFER_LUA "Build with normal Lua even if LuaJIT is found." OFF)
 
-if(PerlLibs_FOUND)
+#PRNG options
-	option(EQEMU_BUILD_PERL "Build Perl parser." ON)
+OPTION(EQEMU_ADDITIVE_LFIB_PRNG "Use Additive LFib for PRNG." OFF)
+MARK_AS_ADVANCED(EQEMU_ADDITIVE_LFIB_PRNG)
+OPTION(EQEMU_BIASED_INT_DIST "Use biased int dist instead of uniform." OFF)
+MARK_AS_ADVANCED(EQEMU_BIASED_INT_DIST)
+SET(EQEMU_CUSTOM_PRNG_ENGINE "" CACHE STRING "Custom random engine. (ex. std::default_random_engine)")
+MARK_AS_ADVANCED(EQEMU_CUSTOM_PRNG_ENGINE)
 
-	if(EQEMU_BUILD_PERL)
+IF(CMAKE_COMPILER_IS_GNUCXX)
-		set(PERL_LIBRARY_TYPE "    Perl")
+	OPTION(EQEMU_SFMT19937 "Use GCC's extention for SIMD Fast MT19937." OFF)
-	else()
+	MARK_AS_ADVANCED(EQEMU_SFMT19937)
-		set(PERL_LIBRARY_TYPE " Missing")
+ENDIF()
-	endif()
-else()
-	set(PERL_LIBRARY_TYPE "Disabled")
-endif()
 
-message(STATUS "")
+IF(EQEMU_ADDITIVE_LFIB_PRNG)
-message(STATUS "**************************************************")
+	ADD_DEFINITIONS(-DUSE_ADDITIVE_LFIB_PRNG)
-message(STATUS "* Library Usage                                  *")
+	IF(EQEMU_SFMT19937)
-message(STATUS "**************************************************")
+		MESSAGE(STATUS "SFMT19937 and ADDITITVE_LFIB_PRNG both set, SFMT19937 ignored.")
-message(STATUS "* Database:                              MariaDB *")
+		SET(EQEMU_SFMT19937 OFF)
-message(STATUS "* TLS:                                   OpenSSL *")
+	ENDIF()
-message(STATUS "* Lua:                                    LuaJIT *")
+	IF(NOT EQEMU_CUSTOM_PRNG_ENGINE STREQUAL "")
-message(STATUS "* Perl:                                 ${PERL_LIBRARY_TYPE} *")
+		MESSAGE(STATUS "CUSTOM_PRNG_ENGINE and ADDITITVE_LFIB_PRNG both set, CUSTOM_PRNG_ENGINE ignored.")
-message(STATUS "* zlib:                                     ZLIB *")
+		SET(EQEMU_CUSTOM_PRNG_ENGINE "")
-message(STATUS "**************************************************")
+	ENDIF()
+ENDIF()
 
+IF(EQEMU_SFMT19937)
+	ADD_DEFINITIONS(-DUSE_SFMT19937)
+	IF(NOT EQEMU_CUSTOM_PRNG_ENGINE STREQUAL "")
+		MESSAGE(STATUS "CUSTOM_PRNG_ENGINE and SFMT19937 both set, CUSTOM_PRNG_ENGINE ignored.")
+		SET(EQEMU_CUSTOM_PRNG_ENGINE "")
+	ENDIF()
+ENDIF()
 
-option(EQEMU_BUILD_LUA "Build Lua parser." ON)
+IF(NOT EQEMU_CUSTOM_PRNG_ENGINE STREQUAL "")
+	ADD_DEFINITIONS(-DUSE_CUSTOM_PRNG_ENGINE=${EQEMU_CUSTOM_PRNG_ENGINE})
+ENDIF()
 
-if(EQEMU_BUILD_SERVER OR EQEMU_BUILD_LOGIN OR EQEMU_BUILD_TESTS OR EQEMU_BUILD_CLIENT_FILES)
+IF(EQEMU_BIASED_INT_DIST)
-	add_subdirectory(common)
+	ADD_DEFINITIONS(-DBIASED_INT_DIST)
-	add_subdirectory(libs)
+ENDIF()
-else()
-	message(FATAL_ERROR "No targets were selected to build, we must build at least one target.")
-endif()
 
-if(EQEMU_BUILD_SERVER)
+IF(EQEMU_COMMANDS_LOGGING)
-	add_subdirectory(shared_memory)
+	ADD_DEFINITIONS(-DCOMMANDS_LOGGING)
-	add_subdirectory(world)
+ENDIF(EQEMU_COMMANDS_LOGGING)
-	add_subdirectory(zone)
-	add_subdirectory(ucs)
-	add_subdirectory(queryserv)
-	add_subdirectory(eqlaunch)
-endif()
 
-if(EQEMU_BUILD_LOGIN)
+#database
-	add_subdirectory(loginserver)
+IF(MySQL_FOUND AND MariaDB_FOUND)
-endif()
+	SET(DATABASE_LIBRARY_SELECTION MariaDB CACHE STRING "Database library to use:
+			MySQL
+			MariaDB"
+	)
 
-if(EQEMU_BUILD_TESTS)
+	IF(DATABASE_LIBRARY_SELECTION STREQUAL "MySQL")
-	add_subdirectory(tests)
+		SET(DATABASE_LIBRARY_TYPE "  MySQL")
-endif()
+		SET(DATABASE_LIBRARY_LIBS ${MySQL_LIBRARIES})
+		SET(DATABASE_LIBRARY_INCLUDE ${MySQL_INCLUDE_DIR})
+	ELSEIF(DATABASE_LIBRARY_SELECTION STREQUAL "MariaDB")
+		SET(DATABASE_LIBRARY_TYPE "MariaDB")
+		SET(DATABASE_LIBRARY_LIBS ${MariaDB_LIBRARIES})
+		SET(DATABASE_LIBRARY_INCLUDE ${MariaDB_INCLUDE_DIR})
+	ELSE()
+		MESSAGE(FATAL_ERROR "Unknown database library set, should be one of: MySQL, MariaDB")
+	ENDIF()
+ELSEIF(MariaDB_FOUND)
+	SET(DATABASE_LIBRARY_TYPE "MariaDB")
+	SET(DATABASE_LIBRARY_LIBS ${MariaDB_LIBRARIES})
+	SET(DATABASE_LIBRARY_INCLUDE ${MariaDB_INCLUDE_DIR})
+ELSEIF(MySQL_FOUND)
+	SET(DATABASE_LIBRARY_TYPE "  MySQL")
+	SET(DATABASE_LIBRARY_LIBS ${MySQL_LIBRARIES})
+	SET(DATABASE_LIBRARY_INCLUDE ${MySQL_INCLUDE_DIR})
+ELSE()
+	MESSAGE(FATAL_ERROR "One of MySQL or MariaDB is a required dependency.")
+ENDIF()
 
-if(EQEMU_BUILD_CLIENT_FILES)
+#security
-	add_subdirectory(client_files)
+#prefer openssl to mbedtls (arbitrary)
-endif()
+IF(OpenSSL_FOUND AND MBEDTLS_FOUND)
+	SET(TLS_LIBRARY_SELECTION OpenSSL CACHE STRING "TLS library to use:
+			OpenSSL
+			mbedTLS"
+	)
+
+	IF(TLS_LIBRARY_SELECTION STREQUAL "OpenSSL")
+		SET(TLS_LIBRARY_TYPE " OpenSSL")
+		SET(TLS_LIBRARY_ENABLED ON)
+		SET(TLS_LIBRARY_LIBS ${OPENSSL_LIBRARIES})
+		SET(TLS_LIBRARY_INCLUDE ${OPENSSL_INCLUDE_DIR})
+		ADD_DEFINITIONS(-DEQEMU_USE_OPENSSL)
+		IF(${OPENSSL_VERSION} VERSION_GREATER_EQUAL "1.1.1")
+			ADD_DEFINITIONS(-DCPPHTTPLIB_OPENSSL_SUPPORT)
+		ENDIF()
+	ELSEIF(TLS_LIBRARY_SELECTION STREQUAL "mbedTLS")
+		SET(TLS_LIBRARY_TYPE " mbedTLS")
+		SET(TLS_LIBRARY_ENABLED ON)
+		SET(TLS_LIBRARY_LIBS ${MBEDTLS_LIBRARY} ${MBEDX509_LIBRARY} ${MBEDCRYPTO_LIBRARY})
+		SET(TLS_LIBRARY_INCLUDE ${MBEDTLS_INCLUDE_DIR})
+		ADD_DEFINITIONS(-DEQEMU_USE_MBEDTLS)
+	ELSE()
+		MESSAGE(FATAL_ERROR "Unknown TLS library set, should be one of: OpenSSL, mbedTLS")
+	ENDIF()
+ELSEIF(OpenSSL_FOUND)
+	SET(TLS_LIBRARY_TYPE " OpenSSL")
+	SET(TLS_LIBRARY_ENABLED ON)
+	SET(TLS_LIBRARY_LIBS ${OPENSSL_LIBRARIES})
+	SET(TLS_LIBRARY_INCLUDE ${OPENSSL_INCLUDE_DIR})
+	ADD_DEFINITIONS(-DEQEMU_USE_OPENSSL)
+	IF(${OPENSSL_VERSION} VERSION_GREATER_EQUAL "1.1.1")
+		ADD_DEFINITIONS(-DCPPHTTPLIB_OPENSSL_SUPPORT)
+	ENDIF()
+ELSEIF(MBEDTLS_FOUND)
+	SET(TLS_LIBRARY_TYPE " mbedTLS")
+	SET(TLS_LIBRARY_ENABLED ON)
+	SET(TLS_LIBRARY_LIBS ${MBEDTLS_LIBRARY} ${MBEDX509_LIBRARY} ${MBEDCRYPTO_LIBRARY})
+	SET(TLS_LIBRARY_INCLUDE ${MBEDTLS_INCLUDE_DIR})
+	ADD_DEFINITIONS(-DEQEMU_USE_MBEDTLS)
+ELSE()
+	SET(TLS_LIBRARY_TYPE "Disabled")
+	SET(TLS_LIBRARY_ENABLED OFF)
+ENDIF()
+
+IF(SODIUM_FOUND)
+	SET(SODIUM_LIBRARY_TYPE "Libsodium")
+	SET(SODIUM_LIBRARY_ENABLED ON)
+	SET(SODIUM_LIBRARY_LIBS ${SODIUM_LIBRARIES})
+	SET(SODIUM_LIBRARY_INCLUDE ${SODIUM_INCLUDE_DIRS})
+	ADD_DEFINITIONS(-DENABLE_SECURITY)
+ELSE()
+	SET(SODIUM_LIBRARY_TYPE " Disabled")
+	SET(SODIUM_LIBRARY_ENABLED OFF)
+ENDIF()
+
+IF(LUAJIT_FOUND AND NOT (EQEMU_PREFER_LUA AND Lua51_FOUND))
+	SET(LUA_LIBRARY_TYPE "  LuaJIT")
+	SET(LUA_LIBRARY_ENABLED ON)
+	SET(LUA_LIBRARY_LIBS ${LUAJIT_LIBRARY} luabind)
+	SET(LUA_LIBRARY_INCLUDE ${LUAJIT_INCLUDE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/libs/luabind")
+ELSEIF(Lua51_FOUND )
+	SET(LUA_LIBRARY_TYPE " Lua 5.1")
+	SET(LUA_LIBRARY_ENABLED ON)
+	SET(LUA_LIBRARY_LIBS ${LUA_LIBRARY} luabind)
+	SET(LUA_LIBRARY_INCLUDE ${LUA_INCLUDE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/libs/luabind")
+ELSE()
+	SET(LUA_LIBRARY_TYPE "Disabled")
+	SET(LUA_LIBRARY_ENABLED OFF)
+ENDIF()
+
+IF(PerlLibs_FOUND)
+	SET(PERL_LIBRARY_TYPE "    Perl")
+	SET(PERL_LIBRARY_ENABLED ON)
+	SET(PERL_LIBRARY_LIBS ${PERL_LIBRARY})
+	SET(PERL_LIBRARY_INCLUDE ${PERL_INCLUDE_PATH})
+ELSE()
+	SET(PERL_LIBRARY_TYPE "Disabled")
+	SET(PERL_LIBRARY_ENABLED OFF)
+ENDIF()
+
+#use zlib if exists
+IF(ZLIB_FOUND)
+	OPTION(EQEMU_BUILD_ZLIB "Build internal version of zlib." ON)
+	IF(EQEMU_BUILD_ZLIB)
+		SET(ZLIB_LIBRARY_TYPE "zlib-ng")
+		SET(ZLIB_LIBRARY_LIBS "zlibstatic")
+		SET(ZLIB_LIBRARY_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/libs/zlibng")
+		INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_BINARY_DIR}/libs/zlibng")
+	ELSE()
+		SET(ZLIB_LIBRARY_TYPE "   zlib")
+		SET(ZLIB_LIBRARY_LIBS ${ZLIB_LIBRARY})
+		SET(ZLIB_LIBRARY_INCLUDE ${ZLIB_INCLUDE_DIRS})
+	ENDIF()
+ELSE()
+	SET(ZLIB_LIBRARY_TYPE "zlib-ng")
+	SET(ZLIB_LIBRARY_LIBS "zlibstatic")
+	SET(ZLIB_LIBRARY_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/libs/zlibng")
+ENDIF()
+
+IF (EQEMU_BUILD_STATIC)
+	SET(ZLIB_LIBRARY_LIBS libz.a)
+ENDIF(EQEMU_BUILD_STATIC)
+
+MESSAGE(STATUS "")
+MESSAGE(STATUS "**************************************************")
+MESSAGE(STATUS "* Library Usage                                  *")
+MESSAGE(STATUS "**************************************************")
+MESSAGE(STATUS "* Database:                              ${DATABASE_LIBRARY_TYPE} *")
+MESSAGE(STATUS "* TLS:                                  ${TLS_LIBRARY_TYPE} *")
+MESSAGE(STATUS "* Sodium:                              ${SODIUM_LIBRARY_TYPE} *")
+MESSAGE(STATUS "* Lua:                                  ${LUA_LIBRARY_TYPE} *")
+MESSAGE(STATUS "* Perl:                                 ${PERL_LIBRARY_TYPE} *")
+MESSAGE(STATUS "* zlib:                                  ${ZLIB_LIBRARY_TYPE} *")
+MESSAGE(STATUS "**************************************************")
+
+#setup server libs and headers
+SET(SERVER_LIBS common ${DATABASE_LIBRARY_LIBS} ${ZLIB_LIBRARY_LIBS} ${Boost_LIBRARIES} uv_a fmt RecastNavigation::Detour)
+
+INCLUDE_DIRECTORIES(SYSTEM "${DATABASE_LIBRARY_INCLUDE}")
+INCLUDE_DIRECTORIES(SYSTEM "${ZLIB_LIBRARY_INCLUDE}")
+INCLUDE_DIRECTORIES(SYSTEM "${Boost_INCLUDE_DIRS}")
+INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/glm")
+INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/cereal/include")
+INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/fmt/include")
+INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/libuv/include" )
+INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/recastnavigation/DebugUtils/Include")
+INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/recastnavigation/Detour/Include")
+INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/recastnavigation/DetourCrowd/Include")
+INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/recastnavigation/DetourTileCache/Include")
+INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/recastnavigation/Recast/Include")
+INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/websocketpp")
+
+# silence obnoxious deprecation message
+ADD_DEFINITIONS(-DBOOST_BIND_GLOBAL_PLACEHOLDERS)
+
+IF(TLS_LIBRARY_ENABLED)
+	SET(SERVER_LIBS ${SERVER_LIBS} ${TLS_LIBRARY_LIBS})
+	INCLUDE_DIRECTORIES(SYSTEM "${TLS_LIBRARY_INCLUDE}")
+ENDIF()
+
+IF(SODIUM_LIBRARY_ENABLED)
+	SET(SERVER_LIBS ${SERVER_LIBS} ${SODIUM_LIBRARY_LIBS})
+	INCLUDE_DIRECTORIES(SYSTEM "${SODIUM_LIBRARY_INCLUDE}")
+ENDIF()
+
+IF(LUA_LIBRARY_ENABLED)
+	OPTION(EQEMU_BUILD_LUA "Build Lua parser." ON)
+
+	IF(EQEMU_BUILD_LUA)
+		ADD_DEFINITIONS(-DLUA_EQEMU)
+		SET(ZONE_LIBS ${LUA_LIBRARY_LIBS})
+		INCLUDE_DIRECTORIES(SYSTEM "${LUA_LIBRARY_INCLUDE}")
+
+		OPTION(EQEMU_SANITIZE_LUA_LIBS "Sanitize Lua Libraries (Remove OS and IO standard libraries from being able to run)." ON)
+		IF(EQEMU_SANITIZE_LUA_LIBS)
+			ADD_DEFINITIONS(-DSANITIZE_LUA_LIBS)
+		ENDIF()
+	ENDIF()
+ENDIF()
+
+IF(PERL_LIBRARY_ENABLED)
+	OPTION(EQEMU_BUILD_PERL "Build Perl parser." ON)
+	IF(EQEMU_BUILD_PERL)
+		SET(SERVER_LIBS ${SERVER_LIBS} ${PERL_LIBRARY_LIBS} perlbind)
+		INCLUDE_DIRECTORIES(SYSTEM "${PERL_LIBRARY_INCLUDE}")
+		ADD_DEFINITIONS(-DEMBPERL)
+		ADD_DEFINITIONS(-DEMBPERL_PLUGIN)
+		ADD_DEFINITIONS(-DPERLBIND_NO_STRICT_SCALAR_TYPES)
+		IF (UNIX AND EQEMU_BUILD_STATIC)
+			SET(SERVER_LIBS ${SERVER_LIBS} libcrypt.a)
+		ENDIF ()
+	ENDIF()
+ENDIF()
+
+IF(WIN32)
+	SET(SERVER_LIBS ${SERVER_LIBS} "ws2_32" "psapi" "iphlpapi" "userenv")
+ENDIF()
+
+IF(UNIX)
+	SET(SERVER_LIBS ${SERVER_LIBS} ${CMAKE_DL_LIBS} "z" "m" "pthread")
+	IF(NOT DARWIN)
+		SET(SERVER_LIBS ${SERVER_LIBS} "rt")
+	ENDIF()
+	# Freebsd provides uuids in the C library
+	IF(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
+		SET(SERVER_LIBS ${SERVER_LIBS} "uuid")
+	ENDIF()
+ENDIF()
+
+SET(ZONE_LIBS ${ZONE_LIBS} ${SERVER_LIBS})
+
+IF(EQEMU_BUILD_LOGIN AND NOT TLS_LIBRARY_ENABLED)
+	MESSAGE(FATAL_ERROR "Login server requires a TLS Library to build.")
+ENDIF()
+
+IF(EQEMU_BUILD_HC AND NOT TLS_LIBRARY_ENABLED)
+	MESSAGE(FATAL_ERROR "Headless client requires a TLS Library to build.")
+ENDIF()
+
+IF(EQEMU_BUILD_SERVER OR EQEMU_BUILD_LOGIN OR EQEMU_BUILD_TESTS OR EQEMU_BUILD_HC)
+	ADD_SUBDIRECTORY(common)
+	ADD_SUBDIRECTORY(libs)
+	ADD_SUBDIRECTORY(submodules/fmt)
+	ADD_SUBDIRECTORY(submodules/libuv)
+
+	IF(EQEMU_BUILD_ZLIB)
+		SET(ZLIB_COMPAT ON CACHE BOOL "Compile with zlib compatible API")
+		SET(ZLIB_ENABLE_TESTS OFF CACHE BOOL "Build test binaries")
+		ADD_SUBDIRECTORY(libs/zlibng)
+	ENDIF()
+
+	SET(RECASTNAVIGATION_DEMO OFF CACHE BOOL "Build demo")
+	SET(RECASTNAVIGATION_TESTS OFF CACHE BOOL "Build tests")
+	SET(RECASTNAVIGATION_EXAMPLES OFF CACHE BOOL "Build examples")
+	ADD_SUBDIRECTORY(submodules/recastnavigation)
+ENDIF(EQEMU_BUILD_SERVER OR EQEMU_BUILD_LOGIN OR EQEMU_BUILD_TESTS OR EQEMU_BUILD_HC)
+
+IF(EQEMU_BUILD_SERVER)
+	ADD_SUBDIRECTORY(shared_memory)
+	ADD_SUBDIRECTORY(world)
+	ADD_SUBDIRECTORY(zone)
+	ADD_SUBDIRECTORY(ucs)
+	ADD_SUBDIRECTORY(queryserv)
+	ADD_SUBDIRECTORY(eqlaunch)
+ENDIF(EQEMU_BUILD_SERVER)
+
+IF(EQEMU_BUILD_LOGIN)
+	ADD_SUBDIRECTORY(loginserver)
+ENDIF(EQEMU_BUILD_LOGIN)
+
+IF(EQEMU_BUILD_HC)
+	ADD_SUBDIRECTORY(hc)
+ENDIF(EQEMU_BUILD_HC)
+
+IF(EQEMU_BUILD_TESTS)
+	ADD_SUBDIRECTORY(tests)
+ENDIF(EQEMU_BUILD_TESTS)
+
+IF(EQEMU_BUILD_CLIENT_FILES)
+	ADD_SUBDIRECTORY(client_files)
+ENDIF(EQEMU_BUILD_CLIENT_FILES)

CMakePresets.json

@@ -1,49 +0,0 @@
-{
-  "version": 3,
-  "cmakeMinimumRequired": {
-    "major": 3,
-    "minor": 19,
-    "patch": 0
-  },
-  "configurePresets": [
-    {
-      "name": "linux-debug",
-      "displayName": "Linux Debug",
-      "generator": "Ninja",
-      "binaryDir": "${sourceDir}/build",
-      "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "Debug",
-        "CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
-        "CMAKE_C_COMPILER_LAUNCHER": "ccache",
-        "CMAKE_CXX_COMPILER_LAUNCHER": "ccache",
-		"EQEMU_BUILD_LOGIN": "ON",
-		"EQEMU_BUILD_TESTS": "ON",
-		"EQEMU_ADD_PROFILER": "ON"
-      }
-    },
-    {
-      "name": "linux-release",
-      "displayName": "Linux Release",
-      "generator": "Ninja",
-      "binaryDir": "${sourceDir}/build/release",
-      "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "Release",
-        "CMAKE_C_COMPILER_LAUNCHER": "ccache",
-        "CMAKE_CXX_COMPILER_LAUNCHER": "ccache",
-		"EQEMU_BUILD_LOGIN": "ON"
-      }
-    },
-	{
-      "name": "win-msvc",
-      "displayName": "Windows MSVC (VS 2022)",
-      "generator": "Visual Studio 17 2022",
-	  "binaryDir": "${sourceDir}/build/{presetName}",
-      "architecture": { "value": "x64" },
-      "cacheVariables": {
-        "CMAKE_CONFIGURATION_TYPES": "Debug;Release",
-		"EQEMU_BUILD_LOGIN": "ON",
-		"EQEMU_BUILD_TESTS": "ON"
-      }
-    }
-  ]
-}

README.md

@@ -1,150 +1,83 @@
-<h1 align="center">EQEmulator Server Platform</h1>
+# EQEmulator Core Server
-
+| Drone (Linux x64) | Drone (Windows x64)   |
-<p align="center">
+|:---:|:---:|
- <img src="https://github.com/user-attachments/assets/11942e15-b512-402d-a619-0543c7f1151e" style="border-radius: 10px">
+|[![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)   |
-</p>
-
-<p align="center">
-<b>EQEmulator - A Fan-Made Project Honoring a Legendary MMORPG</b>
-</p>
-
-<p align="center">
-<a href="https://github.com/eqemu/server/graphs/contributors"><img src="https://img.shields.io/github/contributors/eqemu/server" alt="Contributors"></a>
-<a href="https://discord.gg/QHsm7CD"><img src="https://img.shields.io/discord/212663220849213441?label=Discord&amp;logo=discord&amp;color=7289DA" alt="Discord"></a>
-<a href="https://docs.eqemu.io"><img src="https://img.shields.io/badge/docs-MkDocs%20Powered-blueviolet" alt="Docs"></a>
-<a href="./LICENSE"><img src="https://img.shields.io/github/license/EQEmu/Server" alt="License"></a> 
-<a href="https://github.com/eqemu/server/releases"><img src="https://img.shields.io/github/v/release/eqemu/server" alt="Latest Release"></a>
-<a href="https://github.com/EQEmu/Server/releases"><img src="https://img.shields.io/github/release-date/EQEmu/Server" alt="Release Date"></a>
-<img src="https://img.shields.io/github/downloads/eqemu/server/total.svg" alt="Github All Releases"></a>
-<a href="http://drone.akkadius.com/EQEmu/Server"><img src="http://drone.akkadius.com/api/badges/EQEmu/Server/status.svg" alt="Build Status"></a> 
-<img src="https://img.shields.io/github/issues-pr-closed/eqemu/server" alt="GitHub Issues or Pull Requests">
-<img src="https://img.shields.io/docker/pulls/akkadius/eqemu-server" alt="Docker Pulls">
-<a href="http://drone.akkadius.com/EQEmu/Server"><img src="http://drone.akkadius.com/api/badges/EQEmu/Server/status.svg" alt="Build Status"></a> <img src="https://jb.gg/badges/official-plastic.svg" alt="Official"> 
-
-</p>
 
 ***
 
-<p align="center">
+**EQEmulator is a custom completely from-scratch open source server implementation for EverQuest built mostly on C++**
-EQEmulator is a <b>passion-driven</b>, <b>open source server emulator</b> project dedicated to preserving and celebrating the legacy of a groundbreaking classic MMORPG.
+ * MySQL/MariaDB is used as the database engine (over 200+ tables)
-</p>
+ * Perl and LUA are both supported scripting languages for NPC/Player/Quest oriented events
+ * Open source database (Project EQ) has content up to expansion OoW (included in server installs)
+  * Game server environments and databases can be heavily customized to create all new experiences
+ * Hundreds of Quests/events created and maintained by Project EQ
 
-<p align="center">
+## Server Installs
-For over two decades and continuing, EQEmulator has served as a <strong>fan tribute</strong>, providing tools and technology that allow players to explore, customize, and experience the legendary game's iconic gameplay in new ways. This project exists solely out of <strong>deep admiration</strong> for the original developers, artists, designers, and visionaries who created one of the most influential online worlds of all time.
+| |Windows|Linux|
-</p>
+|:---:|:---:|:---:|
+|**Install Count**|![Windows Install Count](http://analytics.akkadius.com/?install_count&windows_count)|![Linux Install Count](http://analytics.akkadius.com/?install_count&linux_count)| 
+### > Windows 
 
-<p align="center">
+* [Install Guide](https://docs.eqemu.io/server/installation/server-installation-windows/)
-We do not claim ownership of the original game or its assets. <strong>All credit and respect belong to the original creators and Daybreak Game Company</strong>, whose work continues to inspire generations of players and developers alike.
-</p>
 
-<p align="center">
+### > Debian/Ubuntu/CentOS/Fedora
-EQEmulator has for over 20 years and always will be a <strong>fan-based, non-commercial open-source effort</strong> made by players, for players—preserving the legacy of the game while empowering community-driven creativity, learning and joy that the game and its creators has so strongly inspired in us all.
-</p>
 
-***
+* [Install Guide](https://docs.eqemu.io/server/installation/server-installation-linux/)
 
-<h3 align="center">
+* You can use curl or wget to kick off the installer (whichever your OS has)
- Technical Overview & Reverse Engineering Effort
+> curl -O https://raw.githubusercontent.com/EQEmu/Server/master/utils/scripts/linux_installer/install.sh install.sh && chmod 755 install.sh && ./install.sh
-</h1>
 
-<p align="center">EQEmulator represents <strong>over two decades of collaborative reverse engineering</strong>, building the server from the ground up without access to the original source code. This effort was achieved entirely through <strong>community-driven analysis, network protocol decoding, and in-game behavioral research</strong>.</p>
+> wget --no-check-certificate https://raw.githubusercontent.com/EQEmu/Server/master/utils/scripts/linux_installer/install.sh -O install.sh && chmod 755 install.sh && ./install.sh 
 
-<h1 align="center">
+## Supported Clients
- 💡 How We Did It
-</h1>
-
-<p align="center">
- <img src="https://github.com/user-attachments/assets/b6b48cf7-f64a-4497-9750-71f442a3d132" height="300px">
- </p>
-
-
-<p align="center">
- <strong>Reverse Engineering</strong> 
-Every system, packet, opcode, and game mechanic has been reconstructed through countless hours of live packet sniffing, client disassembly, and in-game experimentation by dedicated contributors over the years.
-</p>
-
-<p align="center">
- No proprietary code or server sources were ever used.
-</p>
-
-<p align="center">
- All implementations are the result of clean-room engineering.
-</p>
-
-
-<h1 align="center">
- 🛠️ Technology Stack
-</h1>
-
-<p align="center">
- <img src="https://github.com/user-attachments/assets/df5ea809-86c5-439d-a8fa-651fb04ba477" style="border-radius: 10px">
-</p>
-
-**C++ Core Engine**
-
-* High-performance networking and gameplay logic built in C++
-* Cross-platform support for Linux and Windows
-
-**MySQL / MariaDB Backend**
-
-* Fully structured schema with over 200+ tables
-* Supports content customization, expansions, and custom worlds
-
-**Scripting Engine**
-
-* Native support for **Perl** and **Lua** scripting
-* Powerfully extendable for quests, NPC behaviors, and custom events
-
-**Open Source Content Database**
-
-* Includes ProjectEQ’s world data up through *Dragons of Norrath*
-* 100% customizable to create entirely new game worlds
-
-<h1 align="center">
- 🚀 Why It Matters
-</h1>
-
-<p align="center">🧬 EQEmulator stands as a <strong>technical preservation project</strong>, ensuring that the magic of classic and custom servers lives on for future generations of players, tinkerers, and game designers.
-</p>
-
-> We humbly acknowledge and thank the original developers for creating one of the most influential online experiences in gaming history.
-
-<h1 align="center">
- 🧑‍💻🖥️ Supported Clients
-</h1>
 
 |Titanium Edition|Secrets of Faydwer|Seeds of Destruction|Underfoot|Rain of Fear|
 |:---:|:---:|:---:|:---:|:---:|
 |<img src="http://i.imgur.com/hrwDxoM.jpg" height="150">|<img src="http://i.imgur.com/cRDW5tn.png" height="150">|<img src="http://i.imgur.com/V48kuVn.jpg" height="150">|<img src="http://i.imgur.com/IJQ0XMa.jpg" height="150">|<img src="http://i.imgur.com/OMpHkKa.png" height="100">|
 
-## 📚 Resources
+## Bug Reports <img src="http://i.imgur.com/daf1Vjw.png" height="20">
+* Please use the [issue tracker](https://github.com/EQEmu/Server/issues) provided by GitHub to send us bug
+reports or feature requests.
+* The [EQEmu Forums](http://www.eqemulator.org/forums/) are also a place to submit and get help with bugs.
 
-| Resource             | Badges                                                                                                                                                    | Link                                                                                              |
+## Contributions <img src="http://image.flaticon.com/icons/png/512/25/25231.png" width="20">
-|---------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------|
-| **EQEmulator Docs**  | [![Docs](https://img.shields.io/badge/docs-MkDocs%20Powered-blueviolet)](https://docs.eqemu.io)                                                             | [docs.eqemu.io](https://docs.eqemu.io/)                                                           |
-| **Discord Community**| [![Discord](https://img.shields.io/discord/212663220849213441?label=Discord&logo=discord&color=7289DA)](https://discord.gg/QHsm7CD)                         | [Join Discord](https://discord.gg/QHsm7CD)                                                        |
-| **Latest Release**   | [![Latest Release](https://img.shields.io/github/v/release/eqemu/server)](https://github.com/eqemu/server/releases) <br> [![Release Date](https://img.shields.io/github/release-date/EQEmu/Server)](https://github.com/EQEmu/Server/releases) <br> [![All Releases](https://img.shields.io/github/downloads/eqemu/server/total.svg)](https://github.com/eqemu/server/releases) | [View Releases](https://github.com/eqemu/server/releases)                                         |
-| **License**          | [![License](https://img.shields.io/github/license/EQEmu/Server)](./LICENSE)                                                                                | [View License](./LICENSE)                                                                        |
-| **Build Status**     | [![Build Status](http://drone.akkadius.com/api/badges/EQEmu/Server/status.svg)](http://drone.akkadius.com/EQEmu/Server)                                     | [View Build Status](http://drone.akkadius.com/EQEmu/Server)                                       |
-| **Docker Pulls**     | [![Docker Pulls](https://img.shields.io/docker/pulls/akkadius/eqemu-server)](https://hub.docker.com/r/akkadius/eqemu-server)                                | [Docker Hub](https://hub.docker.com/r/akkadius/eqemu-server)                                      |
-| **Contributions**    | [![GitHub PRs](https://img.shields.io/github/issues-pr-closed/eqemu/server)](https://github.com/eqemu/server/pulls?q=is%3Apr+is%3Aclosed)                   | [Closed PRs & Issues](https://github.com/eqemu/server/pulls?q=is%3Apr+is%3Aclosed)                |
 
-## 🛠️ Getting Started
+* The preferred way to contribute is to fork the repo and submit a pull request on
+GitHub. If you need help with your changes, you can always post on the forums or
+try Discord. You can also post unified diffs (`git diff` should do the trick) on the
+[Server Code Submissions](http://www.eqemulator.org/forums/forumdisplay.php?f=669)
+forum, although pull requests will be much quicker and easier on all parties.
 
-If you want to set up your own EQEmulator server, please refer to the current [server installation guides](https://docs.eqemu.io/#server-installation). We've had 100,000s of players and developers use our guides to set up their own servers, and we hope you will too!
+## Contact <img src="http://gamerescape.com/wp-content/uploads/2015/06/discord.png" height="20">
 
-## 🗂️ Related Repositories
+ - Discord Channel: https://discord.gg/QHsm7CD
+ - **User Discord Channel**: `#general`
+ - **Developer Discord Channel**: `#eqemucoders`
 
-| Repository         | Description                                                                      |
+## Resources
-|--------------------|----------------------------------------------------------------------------------|
+- [EQEmulator Forums](http://www.eqemulator.org/forums)
-| [ProjectEQ Quests](https://github.com/ProjectEQ/projecteqquests)  | Official quests and event scripts for ProjectEQ                       |
+- [EQEmulator Wiki](https://docs.eqemu.io/)
-| [Maps](https://github.com/Akkadius/EQEmuMaps)                     | EQEmu-compatible zone maps                                            |
-| [Installer Resources](https://github.com/Akkadius/EQEmuInstall)   | Scripts and assets for setting up EQEmu servers                       |
-| [Zone Utilities](https://github.com/EQEmu/zone-utilities)         | Utilities for parsing, rendering, and manipulating EQ zone files      |
 
+## Related Repositories
+* [ProjectEQ Quests](https://github.com/ProjectEQ/projecteqquests)
+* [Maps](https://github.com/Akkadius/EQEmuMaps)
+* [Installer Resources](https://github.com/Akkadius/EQEmuInstall)
+* [Zone Utilities](https://github.com/EQEmu/zone-utilities) - Various utilities and libraries for parsing, rendering and manipulating EQ Zone files.
+
+## Other License Info
+
+* The server code and utilities are released under **GPLv3**
+* We also include some small libraries for convienence that may be under different licensing
+  * SocketLib - GPL LibXML
+  * zlib - zlib license
+  * MariaDB/MySQL - GPL
+  * GPL Perl - GPL / ActiveState (under the assumption that this is a free project)
+  * CPPUnit - GLP StringUtilities - Apache
+  * LUA - MIT
 
 ## Contributors
 
 <a href="https://github.com/EQEmu/server/graphs/contributors">
   <img src="https://contributors-img.firebaseapp.com/image?repo=EQEmu/server" />
 </a>
+

client_files/CMakeLists.txt

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

client_files/export/CMakeLists.txt

@@ -1,16 +1,16 @@
-cmake_minimum_required(VERSION 3.20.0)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.12)
 
-set(export_sources
+SET(export_sources
 	main.cpp
 )
 
-set(export_headers
+SET(export_headers
 )
 
-add_executable(export_client_files ${export_sources} ${export_headers})
+ADD_EXECUTABLE(export_client_files ${export_sources} ${export_headers})
 
-install(TARGETS export_client_files RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
+INSTALL(TARGETS export_client_files RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
 
-target_link_libraries(export_client_files common)
+TARGET_LINK_LIBRARIES(export_client_files ${SERVER_LIBS})
 
-set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
+SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)

client_files/export/main.cpp

@@ -38,6 +38,13 @@
 #include "../../common/skill_caps.h"
 #include "../../common/evolving_items.h"
 
+EQEmuLogSys          LogSys;
+WorldContentService  content_service;
+ZoneStore            zone_store;
+PathManager          path;
+PlayerEventLogs      player_event_logs;
+EvolvingItemsManager evolving_items_manager;
+
 void ExportSpells(SharedDatabase *db);
 void ExportSkillCaps(SharedDatabase *db);
 void ExportBaseData(SharedDatabase *db);
@@ -46,10 +53,10 @@ void ExportDBStrings(SharedDatabase *db);
 int main(int argc, char **argv)
 {
 	RegisterExecutablePlatform(ExePlatformClientExport);
-	EQEmuLogSys::Instance()->LoadLogSettingsDefaults();
+	LogSys.LoadLogSettingsDefaults();
 	set_exception_handler();
 
-	PathManager::Instance()->Init();
+	path.LoadPaths();
 
 	LogInfo("Client Files Export Utility");
 	if (!EQEmuConfig::LoadConfig()) {
@@ -92,8 +99,8 @@ int main(int argc, char **argv)
 		content_db.SetMySQL(database);
 	}
 
-	EQEmuLogSys::Instance()->SetDatabase(&database)
+	LogSys.SetDatabase(&database)
-		->SetLogPath(PathManager::Instance()->GetLogPath())
+		->SetLogPath(path.GetLogPath())
 		->LoadLogDatabaseSettings()
 		->StartFileLogs();
 
@@ -122,14 +129,14 @@ int main(int argc, char **argv)
 	ExportBaseData(&content_db);
 	ExportDBStrings(&database);
 
-	EQEmuLogSys::Instance()->CloseFileLogs();
+	LogSys.CloseFileLogs();
 
 	return 0;
 }
 
 void ExportSpells(SharedDatabase* db)
 {
-	std::ofstream file(fmt::format("{}/export/spells_us.txt", PathManager::Instance()->GetServerPath()));
+	std::ofstream file(fmt::format("{}/export/spells_us.txt", path.GetServerPath()));
 	if (!file || !file.is_open()) {
 		LogError("Unable to open export/spells_us.txt to write, skipping.");
 		return;
@@ -148,7 +155,7 @@ void ExportSpells(SharedDatabase* db)
 
 void ExportSkillCaps(SharedDatabase* db)
 {
-	std::ofstream file(fmt::format("{}/export/SkillCaps.txt", PathManager::Instance()->GetServerPath()));
+	std::ofstream file(fmt::format("{}/export/SkillCaps.txt", path.GetServerPath()));
 	if (!file || !file.is_open()) {
 		LogError("Unable to open export/SkillCaps.txt to write, skipping.");
 		return;
@@ -167,7 +174,7 @@ void ExportSkillCaps(SharedDatabase* db)
 
 void ExportBaseData(SharedDatabase *db)
 {
-	std::ofstream file(fmt::format("{}/export/BaseData.txt", PathManager::Instance()->GetServerPath()));
+	std::ofstream file(fmt::format("{}/export/BaseData.txt", path.GetServerPath()));
 	if (!file || !file.is_open()) {
 		LogError("Unable to open export/BaseData.txt to write, skipping.");
 		return;
@@ -186,7 +193,7 @@ void ExportBaseData(SharedDatabase *db)
 
 void ExportDBStrings(SharedDatabase *db)
 {
-	std::ofstream file(fmt::format("{}/export/dbstr_us.txt", PathManager::Instance()->GetServerPath()));
+	std::ofstream file(fmt::format("{}/export/dbstr_us.txt", path.GetServerPath()));
 	if (!file || !file.is_open()) {
 		LogError("Unable to open export/dbstr_us.txt to write, skipping.");
 		return;

client_files/import/CMakeLists.txt

@@ -1,16 +1,16 @@
-cmake_minimum_required(VERSION 3.20.0)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.12)
 
-set(import_sources
+SET(import_sources
 	main.cpp
 )
 
-set(import_headers
+SET(import_headers
 )
 
-add_executable(import_client_files ${import_sources} ${import_headers})
+ADD_EXECUTABLE(import_client_files ${import_sources} ${import_headers})
 
-install(TARGETS import_client_files RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
+INSTALL(TARGETS import_client_files RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
 
-target_link_libraries(import_client_files common)
+TARGET_LINK_LIBRARIES(import_client_files ${SERVER_LIBS})
 
-set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
+SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)

client_files/import/main.cpp

@@ -32,6 +32,13 @@
 #include "../../common/events/player_event_logs.h"
 #include "../../common/evolving_items.h"
 
+EQEmuLogSys          LogSys;
+WorldContentService  content_service;
+ZoneStore            zone_store;
+PathManager          path;
+PlayerEventLogs      player_event_logs;
+EvolvingItemsManager evolving_items_manager;
+
 void ImportSpells(SharedDatabase *db);
 void ImportSkillCaps(SharedDatabase *db);
 void ImportBaseData(SharedDatabase *db);
@@ -39,10 +46,10 @@ void ImportDBStrings(SharedDatabase *db);
 
 int main(int argc, char **argv) {
 	RegisterExecutablePlatform(ExePlatformClientImport);
-	EQEmuLogSys::Instance()->LoadLogSettingsDefaults();
+	LogSys.LoadLogSettingsDefaults();
 	set_exception_handler();
 
-	PathManager::Instance()->Init();
+	path.LoadPaths();
 
 	LogInfo("Client Files Import Utility");
 	if(!EQEmuConfig::LoadConfig()) {
@@ -85,8 +92,8 @@ int main(int argc, char **argv) {
 		content_db.SetMySQL(database);
 	}
 
-	EQEmuLogSys::Instance()->SetDatabase(&database)
+	LogSys.SetDatabase(&database)
-		->SetLogPath(PathManager::Instance()->GetLogPath())
+		->SetLogPath(path.GetLogPath())
 		->LoadLogDatabaseSettings()
 		->StartFileLogs();
 
@@ -95,7 +102,7 @@ int main(int argc, char **argv) {
 	ImportBaseData(&content_db);
 	ImportDBStrings(&database);
 
-	EQEmuLogSys::Instance()->CloseFileLogs();
+	LogSys.CloseFileLogs();
 
 	return 0;
 }
@@ -131,7 +138,7 @@ bool IsStringField(int i) {
 
 void ImportSpells(SharedDatabase *db) {
 	LogInfo("Importing Spells");
-	std::string file = fmt::format("{}/import/spells_us.txt", PathManager::Instance()->GetServerPath());
+	std::string file = fmt::format("{}/import/spells_us.txt", path.GetServerPath());
 	FILE *f = fopen(file.c_str(), "r");
 	if(!f) {
 		LogError("Unable to open {} to read, skipping.", file);
@@ -221,7 +228,7 @@ void ImportSpells(SharedDatabase *db) {
 void ImportSkillCaps(SharedDatabase *db) {
 	LogInfo("Importing Skill Caps");
 
-	std::string file = fmt::format("{}/import/SkillCaps.txt", PathManager::Instance()->GetServerPath());
+	std::string file = fmt::format("{}/import/SkillCaps.txt", path.GetServerPath());
 	FILE *f = fopen(file.c_str(), "r");
 	if(!f) {
 		LogError("Unable to open {} to read, skipping.", file);
@@ -258,7 +265,7 @@ void ImportBaseData(SharedDatabase *db)
 {
 	LogInfo("Importing Base Data");
 
-	const std::string& file_name = fmt::format("{}/import/BaseData.txt", PathManager::Instance()->GetServerPath());
+	const std::string& file_name = fmt::format("{}/import/BaseData.txt", path.GetServerPath());
 
 	const auto& file_contents = File::GetContents(file_name);
 	if (!file_contents.error.empty()) {
@@ -298,7 +305,7 @@ void ImportBaseData(SharedDatabase *db)
 void ImportDBStrings(SharedDatabase *db) {
 	LogInfo("Importing DB Strings");
 
-	std::string file = fmt::format("{}/import/dbstr_us.txt", PathManager::Instance()->GetServerPath());
+	std::string file = fmt::format("{}/import/dbstr_us.txt", path.GetServerPath());
 	FILE *f = fopen(file.c_str(), "r");
 	if(!f) {
 		LogError("Unable to open {} to read, skipping.", file);

cmake/DependencyHelperMSVC.cmake

@@ -0,0 +1,94 @@
+OPTION(EQEMU_FETCH_MSVC_DEPENDENCIES_VCPKG "Automatically fetch vcpkg dependencies for MSCV" ON)
+OPTION(EQEMU_FETCH_MSVC_DEPENDENCIES_PERL "Automatically fetch perl dependencies for MSCV" ON)
+
+MARK_AS_ADVANCED(EQEMU_FETCH_MSVC_DEPENDENCIES_VCPKG)
+MARK_AS_ADVANCED(EQEMU_FETCH_MSVC_DEPENDENCIES_PERL)
+
+SET(EQEMU_MSVC_DEPENDENCIES_VCPKG_X86 "https://github.com/EQEmu/Server/releases/download/v1.2/vcpkg-export-x86.zip")
+SET(EQEMU_MSVC_DEPENDENCIES_VCPKG_X64 "https://github.com/EQEmu/Server/releases/download/v1.2/vcpkg-export-x64.zip")
+SET(EQEMU_MSVC_DEPENDENCIES_PERL_X86 "http://strawberryperl.com/download/5.24.4.1/strawberry-perl-5.24.4.1-32bit-portable.zip")
+SET(EQEMU_MSVC_DEPENDENCIES_PERL_X64 "http://strawberryperl.com/download/5.24.4.1/strawberry-perl-5.24.4.1-64bit-portable.zip")
+SET(EQEMU_MSVC_DEPENDENCIES_VCPKG_X86_ZIP "vcpkg-export-x86.zip")
+SET(EQEMU_MSVC_DEPENDENCIES_VCPKG_X64_ZIP "vcpkg-export-x64.zip")
+SET(EQEMU_MSVC_DEPENDENCIES_VCPKG_X86_DIR "vcpkg-export-x86")
+SET(EQEMU_MSVC_DEPENDENCIES_VCPKG_X64_DIR "vcpkg-export-x64")
+SET(EQEMU_MSVC_DEPENDENCIES_PERL_X86_ZIP "strawberry-perl-5.24.4.1-32bit-portable.zip")
+SET(EQEMU_MSVC_DEPENDENCIES_PERL_X64_ZIP "strawberry-perl-5.24.4.1-64bit-portable.zip")
+SET(EQEMU_MSVC_DEPENDENCIES_PERL_X86_DIR "x86")
+SET(EQEMU_MSVC_DEPENDENCIES_PERL_X64_DIR "x64")
+
+IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
+	SET(EQEMU_VCPKG_URL ${EQEMU_MSVC_DEPENDENCIES_VCPKG_X64})
+	SET(EQEMU_PERL_URL ${EQEMU_MSVC_DEPENDENCIES_PERL_X64})
+	SET(EQEMU_VCPKG_ZIP ${EQEMU_MSVC_DEPENDENCIES_VCPKG_X64_ZIP})
+	SET(EQEMU_VCPKG_DIR ${EQEMU_MSVC_DEPENDENCIES_VCPKG_X64_DIR})
+	SET(EQEMU_PERL_ZIP ${EQEMU_MSVC_DEPENDENCIES_PERL_X64_ZIP})
+	SET(EQEMU_PERL_DIR ${EQEMU_MSVC_DEPENDENCIES_PERL_X64_DIR})
+ELSE()
+	SET(EQEMU_VCPKG_URL ${EQEMU_MSVC_DEPENDENCIES_VCPKG_X86})
+	SET(EQEMU_PERL_URL ${EQEMU_MSVC_DEPENDENCIES_PERL_X86})
+	SET(EQEMU_VCPKG_ZIP ${EQEMU_MSVC_DEPENDENCIES_VCPKG_X86_ZIP})
+	SET(EQEMU_VCPKG_DIR ${EQEMU_MSVC_DEPENDENCIES_VCPKG_X86_DIR})
+	SET(EQEMU_PERL_ZIP ${EQEMU_MSVC_DEPENDENCIES_PERL_X86_ZIP})
+	SET(EQEMU_PERL_DIR ${EQEMU_MSVC_DEPENDENCIES_PERL_X86_DIR})
+ENDIF()
+
+IF(EQEMU_FETCH_MSVC_DEPENDENCIES_VCPKG)
+	MESSAGE(STATUS "Resolving vcpkg dependencies...")
+	
+	IF(NOT EXISTS ${PROJECT_SOURCE_DIR}/vcpkg/${EQEMU_VCPKG_ZIP})
+		EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_SOURCE_DIR}/vcpkg)
+		
+		MESSAGE(STATUS "Downloading existing vcpkg dependencies from releases...")
+		FILE(DOWNLOAD ${EQEMU_VCPKG_URL} ${PROJECT_SOURCE_DIR}/vcpkg/${EQEMU_VCPKG_ZIP} 
+			SHOW_PROGRESS
+			STATUS DOWNLOAD_STATUS)
+			
+		LIST(GET DOWNLOAD_STATUS 0 STATUS_CODE)
+		IF(NOT STATUS_CODE EQUAL 0)
+			MESSAGE(FATAL_ERROR "Was unable to download dependencies from ${EQEMU_VCPKG_URL}")
+		ENDIF()
+		
+		MESSAGE(STATUS "Extracting files...")
+		EXECUTE_PROCESS(
+			COMMAND ${CMAKE_COMMAND} -E tar xzf ${PROJECT_SOURCE_DIR}/vcpkg/${EQEMU_VCPKG_ZIP}
+			WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/vcpkg
+		)
+	ENDIF()
+	
+	INCLUDE(${PROJECT_SOURCE_DIR}/vcpkg/${EQEMU_VCPKG_DIR}/scripts/buildsystems/vcpkg.cmake)
+ENDIF()
+
+IF(EQEMU_FETCH_MSVC_DEPENDENCIES_PERL)
+	#Try to find perl first, (so you can use your active install first)
+	FIND_PACKAGE(PerlLibs)
+	
+	IF(NOT PerlLibs_FOUND)
+		MESSAGE(STATUS "Resolving perl dependencies...")
+		
+		IF(NOT EXISTS ${PROJECT_SOURCE_DIR}/perl/${EQEMU_PERL_ZIP})
+			EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_SOURCE_DIR}/perl)
+			EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_SOURCE_DIR}/perl/${EQEMU_PERL_DIR})
+			
+			MESSAGE(STATUS "Downloading portable perl...")
+			FILE(DOWNLOAD ${EQEMU_PERL_URL} ${PROJECT_SOURCE_DIR}/perl/${EQEMU_PERL_ZIP} 
+				SHOW_PROGRESS
+				STATUS DOWNLOAD_STATUS)
+				
+			LIST(GET DOWNLOAD_STATUS 0 STATUS_CODE)
+			IF(NOT STATUS_CODE EQUAL 0)
+				MESSAGE(FATAL_ERROR "Was unable to download dependencies from ${EQEMU_PERL_URL}")
+			ENDIF()
+			
+			MESSAGE(STATUS "Extracting files...")
+			EXECUTE_PROCESS(
+				COMMAND ${CMAKE_COMMAND} -E tar xzf ${PROJECT_SOURCE_DIR}/perl/${EQEMU_PERL_ZIP}
+				WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/perl/${EQEMU_PERL_DIR}
+			)
+		ENDIF()
+		
+		SET(PERL_EXECUTABLE ${PROJECT_SOURCE_DIR}/perl/${EQEMU_PERL_DIR}/perl/bin/perl.exe CACHE FILEPATH "Path to perl program" FORCE)
+		SET(PERL_INCLUDE_PATH ${PROJECT_SOURCE_DIR}/perl/${EQEMU_PERL_DIR}/perl/lib/CORE CACHE PATH "Path to perl include files" FORCE)
+		SET(PERL_LIBRARY ${PROJECT_SOURCE_DIR}/perl/${EQEMU_PERL_DIR}/perl/lib/CORE/libperl524.a CACHE FILEPATH "Path to perl library" FORCE)
+	ENDIF()
+ENDIF()

cmake/FindLua51.cmake

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

cmake/FindLuaJit.cmake

@@ -88,3 +88,4 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(LuaJit
                                   VERSION_VAR LUAJIT_VERSION_STRING)
 
 mark_as_advanced(LUAJIT_INCLUDE_DIR LUAJIT_LIBRARIES LUAJIT_LIBRARY LUAJIT_MATH_LIBRARY)
+

cmake/FindMariaDB.cmake

@@ -0,0 +1,87 @@
+# - Find mariadbclient
+#
+# -*- cmake -*-
+#
+# Find the native MariaDB includes and library
+#
+#	MariaDB_INCLUDE_DIR	- where to find mysql.h, etc.
+#	MariaDB_LIBRARIES		- List of libraries when using MariaDB.
+#	MariaDB_FOUND			- True if MariaDB found.
+#	The following can be used as a hint as to where to search:
+#	MARIADB_ROOT
+
+IF (MariaDB_INCLUDE_DIR AND MariaDB_LIBRARIES)
+	# Already in cache, be silent
+	SET(MariaDB_FIND_QUIETLY TRUE)
+ENDIF (MariaDB_INCLUDE_DIR AND MariaDB_LIBRARIES)
+
+# Include dir
+IF(MARIADB_ROOT)
+	FIND_PATH(MariaDB_INCLUDE_DIR
+		NAMES mariadb_version.h
+		PATHS ${MARIADB_ROOT}/include
+		PATH_SUFFIXES mysql mariadb
+		NO_DEFAULT_PATH
+		NO_SYSTEM_ENVIRONMENT_PATH
+	)
+	FIND_PATH(MariaDB_INCLUDE_DIR
+		NAMES mariadb_version.h
+		PATH_SUFFIXES mysql mariadb
+	)
+ELSE(MARIADB_ROOT)
+	FIND_PATH(MariaDB_INCLUDE_DIR
+		NAMES mariadb_version.h
+		PATH_SUFFIXES mysql mariadb
+	)
+ENDIF(MARIADB_ROOT)
+
+# Library
+SET(MariaDB_NAMES libmariadb)
+IF(MARIADB_ROOT)
+	FIND_LIBRARY(MariaDB_LIBRARY
+		NAMES ${MariaDB_NAMES}
+		PATHS ${MARIADB_ROOT}/lib
+		PATH_SUFFIXES mysql mariadb
+		NO_DEFAULT_PATH
+		NO_SYSTEM_ENVIRONMENT_PATH
+	)
+	
+	FIND_LIBRARY(MariaDB_LIBRARY
+		NAMES ${MariaDB_NAMES}
+		PATH_SUFFIXES mysql mariadb
+	)
+ELSE(MARIADB_ROOT)
+	FIND_LIBRARY(MariaDB_LIBRARY
+		NAMES ${MariaDB_NAMES} mariadbclient_r mariadbclient
+		PATHS /usr/lib /usr/local/lib /usr/lib64 /usr/local/lib64
+		PATH_SUFFIXES mysql mariadb
+	)
+ENDIF(MARIADB_ROOT)
+
+IF (MariaDB_INCLUDE_DIR AND MariaDB_LIBRARY)
+	SET(MariaDB_FOUND TRUE)
+	SET(MariaDB_LIBRARIES ${MariaDB_LIBRARY})
+ELSE (MariaDB_INCLUDE_DIR AND MariaDB_LIBRARY)
+	SET(MariaDB_FOUND FALSE)
+	SET(MariaDB_LIBRARIES)
+ENDIF (MariaDB_INCLUDE_DIR AND MariaDB_LIBRARY)
+
+
+# handle the QUIETLY and REQUIRED arguments and set MariaDB_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(MariaDB DEFAULT_MSG MariaDB_LIBRARY MariaDB_INCLUDE_DIR)
+
+IF(MariaDB_FOUND)
+	SET( MariaDB_LIBRARY_RELEASE ${MariaDB_LIBRARY} )
+	SET( MariaDB_LIBRARY_DEBUG ${MariaDB_LIBRARY} )
+	SET( MariaDB_LIBRARIES ${MariaDB_LIBRARY_RELEASE} ${MariaDB_LIBRARY_DEBUG} )
+ELSE(MariaDB_FOUND)
+	SET( MariaDB_LIBRARIES )
+ENDIF(MariaDB_FOUND)
+
+MARK_AS_ADVANCED(
+	MariaDB_LIBRARY_DEBUG
+	MariaDB_LIBRARY_RELEASE
+	MariaDB_INCLUDE_DIR
+	)

cmake/FindMySQL.cmake

@@ -0,0 +1,87 @@
+# - Find mysqlclient
+#
+# -*- cmake -*-
+#
+# Find the native MySQL includes and library
+#
+#	MySQL_INCLUDE_DIR	- where to find mysql.h, etc.
+#	MySQL_LIBRARIES		- List of libraries when using MySQL.
+#	MySQL_FOUND			- True if MySQL found.
+#	The following can be used as a hint as to where to search:
+#	MYSQL_ROOT
+
+IF (MySQL_INCLUDE_DIR AND MySQL_LIBRARIES)
+	# Already in cache, be silent
+	SET(MySQL_FIND_QUIETLY TRUE)
+ENDIF (MySQL_INCLUDE_DIR AND MySQL_LIBRARIES)
+
+# Include dir
+IF(MYSQL_ROOT)
+	FIND_PATH(MySQL_INCLUDE_DIR
+		NAMES mysql.h
+		PATHS ${MYSQL_ROOT}/include
+		PATH_SUFFIXES mysql
+		NO_DEFAULT_PATH
+		NO_SYSTEM_ENVIRONMENT_PATH
+	)
+	FIND_PATH(MySQL_INCLUDE_DIR
+		NAMES mysql.h
+		PATH_SUFFIXES mysql
+	)
+ELSE(MYSQL_ROOT)
+	FIND_PATH(MySQL_INCLUDE_DIR
+		NAMES mysql.h
+		PATH_SUFFIXES mysql
+	)
+ENDIF(MYSQL_ROOT)
+
+# Library
+SET(MySQL_NAMES libmysql)
+IF(MYSQL_ROOT)
+	FIND_LIBRARY(MySQL_LIBRARY
+		NAMES ${MySQL_NAMES}
+		PATHS ${MYSQL_ROOT}/lib
+		PATH_SUFFIXES mysql
+		NO_DEFAULT_PATH
+		NO_SYSTEM_ENVIRONMENT_PATH
+	)
+	
+	FIND_LIBRARY(MySQL_LIBRARY
+		NAMES ${MySQL_NAMES}
+		PATH_SUFFIXES mysql
+	)
+ELSE(MYSQL_ROOT)
+	FIND_LIBRARY(MySQL_LIBRARY
+		NAMES ${MySQL_NAMES} mysqlclient_r mysqlclient
+		PATHS /usr/lib /usr/local/lib /usr/lib64 /usr/local/lib64
+		PATH_SUFFIXES mysql
+	)
+ENDIF(MYSQL_ROOT)
+
+IF (MySQL_INCLUDE_DIR AND MySQL_LIBRARY)
+	SET(MySQL_FOUND TRUE)
+	SET( MySQL_LIBRARIES ${MySQL_LIBRARY} )
+ELSE (MySQL_INCLUDE_DIR AND MySQL_LIBRARY)
+	SET(MySQL_FOUND FALSE)
+	SET( MySQL_LIBRARIES )
+ENDIF (MySQL_INCLUDE_DIR AND MySQL_LIBRARY)
+
+
+# handle the QUIETLY and REQUIRED arguments and set MySQL_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(MySQL DEFAULT_MSG MySQL_LIBRARY MySQL_INCLUDE_DIR)
+
+IF(MySQL_FOUND)
+	SET( MySQL_LIBRARY_RELEASE ${MySQL_LIBRARY} )
+	SET( MySQL_LIBRARY_DEBUG ${MySQL_LIBRARY} )
+	SET( MySQL_LIBRARIES ${MySQL_LIBRARY_RELEASE} ${MySQL_LIBRARY_DEBUG} )
+ELSE(MySQL_FOUND)
+	SET( MySQL_LIBRARIES )
+ENDIF(MySQL_FOUND)
+
+MARK_AS_ADVANCED(
+	MySQL_LIBRARY_DEBUG
+	MySQL_LIBRARY_RELEASE
+	MySQL_INCLUDE_DIR
+	)

cmake/FindSodium.cmake

@@ -0,0 +1,30 @@
+if (NOT MSVC)
+include(FindPkgConfig)
+pkg_check_modules(PC_SODIUM "libsodium")
+if (NOT PC_SODIUM_FOUND)
+    pkg_check_modules(PC_SODIUM "sodium")
+endif (NOT PC_SODIUM_FOUND)
+if (PC_SODIUM_FOUND)
+  set(SODIUM_INCLUDE_HINTS ${PC_SODIUM_INCLUDE_DIRS} ${PC_SODIUM_INCLUDE_DIRS}/*)
+  set(SODIUM_LIBRARY_HINTS ${PC_SODIUM_LIBRARY_DIRS} ${PC_SODIUM_LIBRARY_DIRS}/*)
+endif()
+endif (NOT MSVC)
+
+# some libraries install the headers is a subdirectory of the include dir
+# returned by pkg-config, so use a wildcard match to improve chances of finding
+# headers and libraries.
+find_path(
+    SODIUM_INCLUDE_DIRS
+    NAMES sodium.h
+    HINTS ${SODIUM_INCLUDE_HINTS}
+)
+
+find_library(
+    SODIUM_LIBRARIES
+    NAMES libsodium sodium
+    HINTS ${SODIUM_LIBRARY_HINTS}
+)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(SODIUM DEFAULT_MSG SODIUM_LIBRARIES SODIUM_INCLUDE_DIRS)
+mark_as_advanced(SODIUM_FOUND SODIUM_LIBRARIES SODIUM_INCLUDE_DIRS)

cmake/FindmbedTLS.cmake

@@ -0,0 +1,93 @@
+# - Try to find mbedTLS
+# Once done this will define
+#
+# Read-Only variables
+#  MBEDTLS_FOUND - system has mbedTLS
+#  MBEDTLS_INCLUDE_DIR - the mbedTLS include directory
+#  MBEDTLS_LIBRARY_DIR - the mbedTLS library directory
+#  MBEDTLS_LIBRARIES - Link these to use mbedTLS
+#  MBEDTLS_LIBRARY - path to mbedTLS library
+#  MBEDX509_LIBRARY - path to mbedTLS X.509 library
+#  MBEDCRYPTO_LIBRARY - path to mbedTLS Crypto library
+#
+# Hint
+#  MBEDTLS_ROOT_DIR can be pointed to a local mbedTLS installation.
+
+SET(_MBEDTLS_ROOT_HINTS
+    ${MBEDTLS_ROOT_DIR}
+    ENV MBEDTLS_ROOT_DIR
+)
+
+SET(_MBEDTLS_ROOT_HINTS_AND_PATHS
+    HINTS ${_MBEDTLS_ROOT_HINTS}
+    PATHS ${_MBEDTLS_ROOT_PATHS}
+)
+
+FIND_PATH(MBEDTLS_INCLUDE_DIR
+    NAMES mbedtls/version.h
+    ${_MBEDTLS_ROOT_HINTS_AND_PATHS}
+    PATH_SUFFIXES include
+)
+
+IF(MBEDTLS_INCLUDE_DIR AND MBEDTLS_LIBRARIES)
+    # Already in cache, be silent
+    SET(MBEDTLS_FIND_QUIETLY TRUE)
+ENDIF()
+
+FIND_LIBRARY(MBEDTLS_LIBRARY
+    NAMES mbedtls libmbedtls
+    ${_MBEDTLS_ROOT_HINTS_AND_PATHS}
+    PATH_SUFFIXES library
+)
+FIND_LIBRARY(MBEDX509_LIBRARY
+    NAMES mbedx509 libmbedx509
+    ${_MBEDTLS_ROOT_HINTS_AND_PATHS}
+    PATH_SUFFIXES library
+)
+FIND_LIBRARY(MBEDCRYPTO_LIBRARY
+    NAMES mbedcrypto libmbedcrypto
+    ${_MBEDTLS_ROOT_HINTS_AND_PATHS}
+    PATH_SUFFIXES library
+)
+
+IF(MBEDTLS_INCLUDE_DIR AND MBEDTLS_LIBRARY AND MBEDX509_LIBRARY AND MBEDCRYPTO_LIBRARY)
+     SET(MBEDTLS_FOUND TRUE)
+ENDIF()
+
+IF(MBEDTLS_FOUND)
+    # split mbedTLS into -L and -l linker options, so we can set them for pkg-config
+    GET_FILENAME_COMPONENT(MBEDTLS_LIBRARY_DIR ${MBEDTLS_LIBRARY} PATH)
+    GET_FILENAME_COMPONENT(MBEDTLS_LIBRARY_FILE ${MBEDTLS_LIBRARY} NAME_WE)
+    GET_FILENAME_COMPONENT(MBEDX509_LIBRARY_FILE ${MBEDX509_LIBRARY} NAME_WE)
+    GET_FILENAME_COMPONENT(MBEDCRYPTO_LIBRARY_FILE ${MBEDCRYPTO_LIBRARY} NAME_WE)
+    STRING(REGEX REPLACE "^lib" "" MBEDTLS_LIBRARY_FILE ${MBEDTLS_LIBRARY_FILE})
+    STRING(REGEX REPLACE "^lib" "" MBEDX509_LIBRARY_FILE ${MBEDX509_LIBRARY_FILE})
+    STRING(REGEX REPLACE "^lib" "" MBEDCRYPTO_LIBRARY_FILE ${MBEDCRYPTO_LIBRARY_FILE})
+    SET(MBEDTLS_LIBRARIES "-L${MBEDTLS_LIBRARY_DIR} -l${MBEDTLS_LIBRARY_FILE} -l${MBEDX509_LIBRARY_FILE} -l${MBEDCRYPTO_LIBRARY_FILE}")
+
+    IF(NOT MBEDTLS_FIND_QUIETLY)
+        MESSAGE(STATUS "Found mbedTLS:")
+        FILE(READ ${MBEDTLS_INCLUDE_DIR}/mbedtls/version.h MBEDTLSCONTENT)
+        STRING(REGEX MATCH "MBEDTLS_VERSION_STRING +\"[0-9|.]+\"" MBEDTLSMATCH ${MBEDTLSCONTENT})
+        IF (MBEDTLSMATCH)
+            STRING(REGEX REPLACE "MBEDTLS_VERSION_STRING +\"([0-9|.]+)\"" "\\1" MBEDTLS_VERSION ${MBEDTLSMATCH})
+            MESSAGE(STATUS "  version ${MBEDTLS_VERSION}")
+        ENDIF(MBEDTLSMATCH)
+        MESSAGE(STATUS "  TLS: ${MBEDTLS_LIBRARY}")
+        MESSAGE(STATUS "  X509: ${MBEDX509_LIBRARY}")
+        MESSAGE(STATUS "  Crypto: ${MBEDCRYPTO_LIBRARY}")
+    ENDIF(NOT MBEDTLS_FIND_QUIETLY)
+ELSE(MBEDTLS_FOUND)
+    IF(MBEDTLS_FIND_REQUIRED)
+        MESSAGE(FATAL_ERROR "Could not find mbedTLS")
+    ENDIF(MBEDTLS_FIND_REQUIRED)
+ENDIF(MBEDTLS_FOUND)
+
+MARK_AS_ADVANCED(
+    MBEDTLS_INCLUDE_DIR
+    MBEDTLS_LIBRARY_DIR
+    MBEDTLS_LIBRARIES
+    MBEDTLS_LIBRARY
+    MBEDX509_LIBRARY
+    MBEDCRYPTO_LIBRARY
+)

common/classes.cpp

@@ -16,7 +16,6 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 	*/
 #include <fmt/format.h>
-#include <fmt/ranges.h>
 #include "../common/global_define.h"
 #include "../common/classes.h"
 #include "data_verification.h"

common/cli/eqemu_command_handler.cpp

@@ -19,7 +19,6 @@
  */
 
 #include <fmt/format.h>
-#include <fmt/ranges.h>
 #include "eqemu_command_handler.h"
 #include "terminal_color.hpp"
 #include "../platform.h"

common/content/world_content_service.cpp

@@ -27,7 +27,7 @@ WorldContentService *WorldContentService::SetExpansionContext()
 	// pull expansion from rules
 	int expansion = RuleI(Expansion, CurrentExpansion);
 	if (expansion >= Expansion::Classic && expansion <= Expansion::MaxId) {
-		WorldContentService::Instance()->SetCurrentExpansion(expansion);
+		content_service.SetCurrentExpansion(expansion);
 	}
 
 	LogInfo(
@@ -41,12 +41,12 @@ WorldContentService *WorldContentService::SetExpansionContext()
 
 std::string WorldContentService::GetCurrentExpansionName()
 {
-	if (WorldContentService::Instance()->GetCurrentExpansion() == Expansion::EXPANSION_ALL) {
+	if (content_service.GetCurrentExpansion() == Expansion::EXPANSION_ALL) {
 		return "All Expansions";
 	}
 
 	if (current_expansion >= Expansion::Classic && current_expansion <= Expansion::MaxId) {
-		return Expansion::ExpansionName[WorldContentService::Instance()->GetCurrentExpansion()];
+		return Expansion::ExpansionName[content_service.GetCurrentExpansion()];
 	}
 
 	return "Unknown Expansion";
@@ -185,7 +185,7 @@ void WorldContentService::ReloadContentFlags()
 
 	SetContentFlags(set_content_flags);
 	LoadStaticGlobalZoneInstances();
-	ZoneStore::Instance()->LoadZones(*m_content_database);
+	zone_store.LoadZones(*m_content_database);
 }
 
 Database *WorldContentService::GetDatabase() const
@@ -291,7 +291,7 @@ WorldContentService *WorldContentService::LoadStaticGlobalZoneInstances()
 //   instance_list table entry for lavastorm has version = 1, is_global = 1, never_expires = 1
 WorldContentService::FindZoneResult WorldContentService::FindZone(uint32 zone_id, uint32 instance_id)
 {
-	for (const auto &z: ZoneStore::Instance()->GetZones()) {
+	for (const auto &z: zone_store.GetZones()) {
 		for (auto &i: m_zone_static_instances) {
 			if (
 				z.zoneidnumber == zone_id &&

common/content/world_content_service.h

@@ -181,12 +181,6 @@ public:
 	FindZoneResult FindZone(uint32 zone_id, uint32 instance_id);
 	bool IsInPublicStaticInstance(uint32 instance_id);
 
-	static WorldContentService* Instance()
-	{
-		static WorldContentService instance;
-		return &instance;
-	}
-
 private:
 	int current_expansion{};
 	std::vector<ContentFlagsRepository::ContentFlags> content_flags;
@@ -200,4 +194,6 @@ private:
 	std::vector<InstanceListRepository::InstanceList> m_zone_static_instances;
 };
 
+extern WorldContentService content_service;
+
 #endif //EQEMU_WORLD_CONTENT_SERVICE_H

common/crash.cpp

@@ -23,12 +23,10 @@ void SendCrashReport(const std::string &crash_report)
 {
 	// can configure multiple endpoints if need be
 	std::vector<std::string> endpoints = {
-		"https://spire.eqemu.dev/api/v1/analytics/server-crash-report",
+		"https://spire.akkadius.com/api/v1/analytics/server-crash-report",
 //		"http://localhost:3010/api/v1/analytics/server-crash-report", // development
 	};
 
-	EQEmuLogSys* log = EQEmuLogSys::Instance();
-
 	auto      config = EQEmuConfig::get();
 	for (auto &e: endpoints) {
 		uri u(e);
@@ -70,12 +68,12 @@ void SendCrashReport(const std::string &crash_report)
 		p["cpus"]              = cpus.size();
 		p["origination_info"]  = "";
 
-		if (!log->origination_info.zone_short_name.empty()) {
+		if (!LogSys.origination_info.zone_short_name.empty()) {
 			p["origination_info"] = fmt::format(
 				"{} ({}) instance_id [{}]",
-				log->origination_info.zone_short_name,
+				LogSys.origination_info.zone_short_name,
-				log->origination_info.zone_long_name,
+				LogSys.origination_info.zone_long_name,
-				log->origination_info.instance_id
+				LogSys.origination_info.instance_id
 			);
 		}
 
@@ -296,7 +294,7 @@ void print_trace()
 		SendCrashReport(crash_report);
 	}
 
-	EQEmuLogSys::Instance()->CloseFileLogs();
+	LogSys.CloseFileLogs();
 
 	exit(1);
 }

common/database.cpp

@@ -708,20 +708,6 @@ const std::string Database::GetNPCNameByID(uint32 npc_id)
 	return e.id ? e.name : std::string();
 }
 
-template<typename InputIterator, typename OutputIterator>
-inline auto CleanMobName(InputIterator first, InputIterator last, OutputIterator result)
-{
-	for (; first != last; ++first) {
-		if (*first == '_') {
-			*result = ' ';
-		}
-		else if (isalpha(*first) || *first == '`') {
-			*result = *first;
-		}
-	}
-	return result;
-}
-
 const std::string Database::GetCleanNPCNameByID(uint32 npc_id)
 {
 	const auto& e = NpcTypesRepository::FindOne(*this, npc_id);
@@ -1934,7 +1920,6 @@ bool Database::CopyCharacter(
 	std::vector<std::string> tables_to_zero_id = {
 		"keyring",
 		"data_buckets",
-		"character_evolving_items",
 		"character_instance_safereturns",
 		"character_expedition_lockouts",
 		"character_instance_lockouts",
@@ -1966,12 +1951,6 @@ bool Database::CopyCharacter(
 			)
 		);
 
-		if (!results.Success()) {
-			LogError("Transaction failed [{}] rolling back", results.ErrorMessage());
-			TransactionRollback();
-			return false;
-		}
-
 		std::vector<std::string> columns      = {};
 		int                      column_count = 0;
 
@@ -1990,12 +1969,6 @@ bool Database::CopyCharacter(
 			)
 		);
 
-		if (!results.Success()) {
-			LogError("Transaction failed [{}] rolling back", results.ErrorMessage());
-			TransactionRollback();
-			return false;
-		}
-
 		std::vector<std::vector<std::string>> new_rows;
 
 		for (auto row : results) {
@@ -2063,18 +2036,13 @@ bool Database::CopyCharacter(
 			LogInfo("Copying table [{}] rows [{}]", table_name, Strings::Commify(rows_copied));
 
 			if (!insert.ErrorMessage().empty()) {
-				LogError("Error copying table [{}] [{}]", table_name, insert.ErrorMessage());
 				TransactionRollback();
 				return false;
 			}
 		}
 	}
 
-	auto r = TransactionCommit();
+	TransactionCommit();
-	if (!r.Success()) {
-		LogError("Transaction failed [{}] rolling back", r.ErrorMessage());
-		return false;
-	}
 
 	LogInfo(
 		"Character [{}] copied to [{}] total rows [{}]",
@@ -2244,7 +2212,7 @@ void Database::PurgeCharacterParcels()
 		pel.event_data = ss.str();
 		pel.created_at = std::time(nullptr);
 
-		PlayerEventLogs::Instance()->AddToQueue(pel);
+		player_event_logs.AddToQueue(pel);
 
 		ss.str("");
 		ss.clear();

common/database/database_dump_service.cpp

@@ -50,7 +50,7 @@ bool DatabaseDumpService::IsMySQLInstalled()
 {
 	std::string version_output = GetMySQLVersion();
 
-	return version_output.find("mysql") != std::string::npos && (version_output.find("Ver") != std::string::npos || version_output.find("from") != std::string::npos);
+	return version_output.find("mysql") != std::string::npos && version_output.find("Ver") != std::string::npos;
 }
 
 /**
@@ -204,7 +204,7 @@ void DatabaseDumpService::DatabaseDump()
 	}
 
 	if (IsDumpOutputToConsole()) {
-		EQEmuLogSys::Instance()->SilenceConsoleLogging();
+		LogSys.SilenceConsoleLogging();
 	}
 
 	LogInfo("MySQL installed [{}]", GetMySQLVersion());
@@ -324,7 +324,7 @@ void DatabaseDumpService::DatabaseDump()
 	}
 
 	if (!IsDumpOutputToConsole()) {
-		EQEmuLogSys::Instance()->LoadLogSettingsDefaults();
+		LogSys.LoadLogSettingsDefaults();
 	}
 
 	if (!pipe_file.empty()) {

common/database/database_update.cpp

@@ -5,16 +5,16 @@
 #include "../strings.h"
 #include "../rulesys.h"
 #include "../http/httplib.h"
+
+#include "database_update_manifest.cpp"
+#include "database_update_manifest_bots.cpp"
 #include "database_dump_service.h"
-#include "database_update_manifest.h"
-#include "database_update_manifest_custom.h"
-#include "database_update_manifest_bots.h"
 
 constexpr int BREAK_LENGTH = 70;
 
 DatabaseVersion DatabaseUpdate::GetDatabaseVersions()
 {
-	auto results = m_database->QueryDatabase("SELECT `version`, `bots_version`, `custom_version` FROM `db_version` LIMIT 1");
+	auto results = m_database->QueryDatabase("SELECT `version`, `bots_version` FROM `db_version` LIMIT 1");
 	if (!results.Success() || !results.RowCount()) {
 		LogError("Failed to read from [db_version] table!");
 		return DatabaseVersion{};
@@ -25,7 +25,6 @@ DatabaseVersion DatabaseUpdate::GetDatabaseVersions()
 	return DatabaseVersion{
 		.server_database_version = Strings::ToInt(r[0]),
 		.bots_database_version = Strings::ToInt(r[1]),
-		.custom_database_version = Strings::ToInt(r[2]),
 	};
 }
 
@@ -34,7 +33,6 @@ DatabaseVersion DatabaseUpdate::GetBinaryDatabaseVersions()
 	return DatabaseVersion{
 		.server_database_version = CURRENT_BINARY_DATABASE_VERSION,
 		.bots_database_version = (RuleB(Bots, Enabled) ? CURRENT_BINARY_BOTS_DATABASE_VERSION : 0),
-		.custom_database_version = CUSTOM_BINARY_DATABASE_VERSION,
 	};
 }
 
@@ -45,7 +43,6 @@ constexpr int LOOK_BACK_AMOUNT = 10;
 // this check will take action
 void DatabaseUpdate::CheckDbUpdates()
 {
-	InjectCustomVersionColumn();
 	InjectBotsVersionColumn();
 	auto v = GetDatabaseVersions();
 	auto b = GetBinaryDatabaseVersions();
@@ -62,15 +59,6 @@ void DatabaseUpdate::CheckDbUpdates()
 		m_database->QueryDatabase(fmt::format("UPDATE `db_version` SET `version` = {}", b.server_database_version));
 	}
 
-	if (UpdateManifest(manifest_entries_custom, v.custom_database_version, b.custom_database_version)) {
-		LogInfo(
-			"Updates ran successfully, setting database version to [{}] from [{}]",
-			b.custom_database_version,
-			v.custom_database_version
-		);
-		m_database->QueryDatabase(fmt::format("UPDATE `db_version` SET `custom_version` = {}", b.custom_database_version));
-	}
-
 	if (b.bots_database_version > 0) {
 		if (UpdateManifest(bot_manifest_entries, v.bots_database_version, b.bots_database_version)) {
 			LogInfo(
@@ -153,7 +141,7 @@ bool DatabaseUpdate::UpdateManifest(
 	std::vector<int> missing_migrations = {};
 	if (version_low != version_high) {
 
-		EQEmuLogSys::Instance()->DisableMySQLErrorLogs();
+		LogSys.DisableMySQLErrorLogs();
 		bool force_interactive = false;
 		for (int version = version_low + 1; version <= version_high; ++version) {
 			for (auto &e: entries) {
@@ -183,7 +171,7 @@ bool DatabaseUpdate::UpdateManifest(
 				}
 			}
 		}
-		EQEmuLogSys::Instance()->EnableMySQLErrorLogs();
+		LogSys.EnableMySQLErrorLogs();
 		LogInfo("{}", Strings::Repeat("-", BREAK_LENGTH));
 
 		if (!missing_migrations.empty() && m_skip_backup) {
@@ -356,16 +344,6 @@ bool DatabaseUpdate::CheckVersionsUpToDate(DatabaseVersion v, DatabaseVersion b)
 		);
 	}
 
-	if (b.custom_database_version > 0) {
-		LogInfo(
-			"{:>8} | database [{}] binary [{}] {}",
-			"Custom",
-			v.custom_database_version,
-			b.custom_database_version,
-			(v.custom_database_version == b.custom_database_version) ? "up to date" : "checking updates"
-		);
-	}
-
 	LogInfo("{:>8} | [server.auto_database_updates] [<green>true]", "Config");
 
 	LogInfo("{}", Strings::Repeat("-", BREAK_LENGTH));
@@ -375,10 +353,7 @@ bool DatabaseUpdate::CheckVersionsUpToDate(DatabaseVersion v, DatabaseVersion b)
 	// bots database version is optional, if not enabled then it is always up-to-date
 	bool bots_up_to_date   = RuleB(Bots, Enabled) ? v.bots_database_version >= b.bots_database_version : true;
 
-	// custom database version is optional, if not enabled then it is always up-to-date
+	return server_up_to_date && bots_up_to_date;
-	bool custom_up_to_date = v.custom_database_version >= b.custom_database_version;
-
-	return server_up_to_date && bots_up_to_date && custom_up_to_date;
 }
 
 // checks to see if there are pending updates
@@ -398,12 +373,3 @@ void DatabaseUpdate::InjectBotsVersionColumn()
 		m_database->QueryDatabase("ALTER TABLE db_version ADD bots_version int(11) DEFAULT '0' AFTER version");
 	}
 }
-
-void DatabaseUpdate::InjectCustomVersionColumn()
-{
-	auto results = m_database->QueryDatabase("SHOW COLUMNS FROM `db_version` LIKE 'custom_version'");
-	if (!results.Success() || results.RowCount() == 0) {
-		LogInfo("Adding custom_version column to db_version table");
-		m_database->QueryDatabase("ALTER TABLE `db_version` ADD COLUMN `custom_version` INT(11) UNSIGNED NOT NULL DEFAULT 0");
-	}
-}

common/database/database_update.h

@@ -17,7 +17,6 @@ struct ManifestEntry {
 struct DatabaseVersion {
 	int server_database_version;
 	int bots_database_version;
-	int custom_database_version;
 };
 
 class DatabaseUpdate {
@@ -33,20 +32,12 @@ public:
 	DatabaseUpdate *SetContentDatabase(Database *db);
 	DatabaseUpdate *SetSkipBackup(bool skip);
 	bool HasPendingUpdates();
-
-	static DatabaseUpdate* Instance()
-	{
-		static DatabaseUpdate instance;
-		return &instance;
-	}
-
 private:
 	bool m_skip_backup = false;
 	Database *m_database;
 	Database *m_content_database;
 	static bool CheckVersionsUpToDate(DatabaseVersion v, DatabaseVersion b);
 	void InjectBotsVersionColumn();
-	void InjectCustomVersionColumn();
 
 };
 

common/database/database_update_manifest.cpp

@@ -1,4 +1,4 @@
-#pragma once
+#include "database_update.h"
 
 std::vector<ManifestEntry> manifest_entries = {
 	ManifestEntry{
@@ -7109,80 +7109,6 @@ ALTER TABLE `npc_types`
 ALTER TABLE `character_data`
 CHANGE COLUMN `firstlogon` `ingame` tinyint(1) UNSIGNED NOT NULL DEFAULT 0 AFTER `xtargets`,
 ADD COLUMN `first_login` int(11) UNSIGNED NOT NULL DEFAULT 0 AFTER `xtargets`;
-)",
-		.content_schema_update = false
-	},
-	ManifestEntry{
-		.version = 9324,
-		.description = "2025_06_11_player_event_logs_table.sql",
-		.check = "SHOW CREATE TABLE `player_event_logs`",
-		.condition = "missing",
-		.match = "COMPRESS",
-		.sql = R"(
-ALTER TABLE player_event_logs ROW_FORMAT=COMPRESSED;
-CREATE INDEX idx_event_type_char_id ON player_event_logs (event_type_id, character_id);
-)",
-		.content_schema_update = false
-	},
-	ManifestEntry{
-		.version = 9325,
-		.description = "2025_06_10_character_corpses_entity_variables.sql",
-		.check = "SHOW COLUMNS FROM `character_corpses` LIKE 'entity_variables'",
-		.condition = "empty",
-		.match = "",
-		.sql = R"(
-ALTER TABLE `character_corpses`
-ADD COLUMN `entity_variables` TEXT DEFAULT NULL AFTER `rezzable`;
-)",
-		.content_schema_update = false
-	},
-	ManifestEntry{
-		.version = 9326,
-		.description = "2025_07_27_add_indexes_npc_spawns_loot.sql",
-		.check = "SHOW INDEX FROM npc_types",
-		.condition = "missing",
-		.match = "idx_npc_types_loottable_id",
-		.sql = R"(
-ALTER TABLE npc_types
-    ADD INDEX idx_npc_types_loottable_id (loottable_id);
-
-ALTER TABLE spawnentry
-    ADD INDEX idx_spawnentry_spawngroup_id (spawngroupID),
-    ADD INDEX idx_spawnentry_npc_id (npcID);
-
-ALTER TABLE lootdrop_entries
-    ADD INDEX idx_lootdrop_entries_lootdrop_id (lootdrop_id),
-    ADD INDEX idx_lootdrop_entries_item_id (item_id);
-
-ALTER TABLE loottable_entries
-    ADD INDEX idx_loottable_entries_lootdrop_id (lootdrop_id),
-    ADD INDEX idx_loottable_entries_loottable_id (loottable_id);
-)",
-		.content_schema_update = true
-	},
-	ManifestEntry{
-		.version = 9327,
-		.description = "2025_08_13_character_stats_record_heal_amount.sql",
-		.check = "SHOW COLUMNS FROM `character_stats_record` LIKE 'heal_amount'",
-		.condition = "empty",
-		.match = "",
-		.sql = R"(
-ALTER TABLE `character_stats_record`
-ADD COLUMN `heal_amount` int(11) NULL DEFAULT 0 AFTER `spell_damage`;
-)"
-	},
-	ManifestEntry{
-		.version = 9328,
-		.description = "2025_08_22_character_parcel_updates.sql",
-		.check = "SHOW COLUMNS FROM `character_parcels` LIKE 'evolve_amount'",
-		.condition = "empty",
-		.match = "",
-		.sql = R"(
-ALTER TABLE `character_parcels`
-	ADD COLUMN `evolve_amount` INT UNSIGNED NOT NULL DEFAULT '0' AFTER `quantity`;
-
-ALTER TABLE `character_parcels_containers`
-	ADD COLUMN `evolve_amount` INT UNSIGNED NOT NULL DEFAULT '0' AFTER `quantity`;
 )",
 		.content_schema_update = false
 	},

common/database/database_update_manifest_bots.cpp

@@ -1,4 +1,4 @@
-#pragma once
+#include "database_update.h"
 
 std::vector<ManifestEntry> bot_manifest_entries = {
 	ManifestEntry{

common/database/database_update_manifest_custom.h

@@ -1,55 +0,0 @@
-#pragma once
-
-std::vector<ManifestEntry> manifest_entries_custom = {
-	ManifestEntry{
-		.version = 1,
-		.description = "2025_05_16_new_database_check_test",
-		.check = "SHOW TABLES LIKE 'new_table'",
-		.condition = "empty",
-		.match = "",
-		.sql = R"(
-CREATE TABLE `new_table`  (
-  `id` int NOT NULL AUTO_INCREMENT,
-  PRIMARY KEY (`id`)
-);
-)",
-		.content_schema_update = false,
-	},
-// Used for testing
-//	ManifestEntry{
-//		.version = 9229,
-//		.description = "new_database_check_test",
-//		.check = "SHOW TABLES LIKE 'new_table'",
-//		.condition = "empty",
-//		.match = "",
-//		.sql = R"(
-//CREATE TABLE `new_table`  (
-//  `id` int NOT NULL AUTO_INCREMENT,
-//  PRIMARY KEY (`id`)
-//);
-//CREATE TABLE `new_table1`  (
-//  `id` int NOT NULL AUTO_INCREMENT,
-//  PRIMARY KEY (`id`)
-//);
-//CREATE TABLE `new_table2`  (
-//  `id` int NOT NULL AUTO_INCREMENT,
-//  PRIMARY KEY (`id`)
-//);
-//CREATE TABLE `new_table3`  (
-//  `id` int NOT NULL AUTO_INCREMENT,
-//  PRIMARY KEY (`id`)
-//);
-//)",
-//	}
-
-};
-
-// see struct definitions for what each field does
-// struct ManifestEntry {
-// 	int         version{};     // database version of the migration
-// 	std::string description{}; // description of the migration ex: "add_new_table" or "add_index_to_table"
-// 	std::string check{};       // query that checks against the condition
-// 	std::string condition{};   // condition or "match_type" - Possible values [contains|match|missing|empty|not_empty]
-// 	std::string match{};       // match field that is not always used, but works in conjunction with "condition" values [missing|match|contains]
-// 	std::string sql{};         // the SQL DDL that gets ran when the condition is true
-// };

common/dbcore.cpp

@@ -160,7 +160,7 @@ MySQLRequestResult DBcore::QueryDatabase(const char *query, uint32 querylen, boo
 		(uint32) mysql_insert_id(mysql)
 	);
 
-	if (EQEmuLogSys::Instance()->log_settings[Logs::MySQLQuery].is_category_enabled == 1) {
+	if (LogSys.log_settings[Logs::MySQLQuery].is_category_enabled == 1) {
 		if ((strncasecmp(query, "select", 6) == 0)) {
 			LogMySQLQuery(
 				"{0} -- ({1} row{2} returned) ({3}s)",
@@ -189,9 +189,9 @@ void DBcore::TransactionBegin()
 	QueryDatabase("START TRANSACTION");
 }
 
-MySQLRequestResult DBcore::TransactionCommit()
+void DBcore::TransactionCommit()
 {
-	return QueryDatabase("COMMIT");
+	QueryDatabase("COMMIT");
 }
 
 void DBcore::TransactionRollback()
@@ -258,17 +258,9 @@ bool DBcore::Open(uint32 *errnum, char *errbuf)
 	if (pCompress) {
 		flags |= CLIENT_COMPRESS;
 	}
-
-	//todo: we need to revisit this ssl handling later
-	//the whole connect code is ancient and tls is starting to come as a default requirement for many db setups
 	if (pSSL) {
 		flags |= CLIENT_SSL;
 	}
-	else {
-		int off = 0;
-		mysql_options(mysql, MYSQL_OPT_SSL_ENFORCE, &off);
-		mysql_options(mysql, MYSQL_OPT_SSL_VERIFY_SERVER_CERT, &off);
-	}
 	if (mysql_real_connect(mysql, pHost, pUser, pPassword, pDatabase, pPort, 0, flags)) {
 		pStatus = Connected;
 

common/dbcore.h

@@ -32,7 +32,7 @@ public:
 	MySQLRequestResult QueryDatabase(const std::string& query, bool retryOnFailureOnce = true);
 	MySQLRequestResult QueryDatabaseMulti(const std::string &query);
 	void TransactionBegin();
-	MySQLRequestResult TransactionCommit();
+	void TransactionCommit();
 	void TransactionRollback();
 	std::string Escape(const std::string& s);
 	uint32 DoEscapeString(char *tobuf, const char *frombuf, uint32 fromlen);

common/discord/discord.h

@@ -4,6 +4,7 @@
 
 #include <string>
 #include "../types.h"
+#include "../http/httplib.h"
 #include "../repositories/player_event_logs_repository.h"
 #include "../events/player_events.h"
 

common/discord/discord_manager.cpp

@@ -26,7 +26,7 @@ void DiscordManager::ProcessMessageQueue()
 			continue;
 		}
 
-		auto        webhook  = EQEmuLogSys::Instance()->GetDiscordWebhooks()[q.first];
+		auto        webhook  = LogSys.GetDiscordWebhooks()[q.first];
 		std::string message;
 
 		for (auto &m: q.second) {
@@ -68,7 +68,7 @@ void DiscordManager::ProcessMessageQueue()
 
 void DiscordManager::QueuePlayerEventMessage(const PlayerEvent::PlayerEventContainer& e)
 {
-	auto w = PlayerEventLogs::Instance()->GetDiscordWebhookUrlFromEventType(e.player_event_log.event_type_id);
+	auto w = player_event_logs.GetDiscordWebhookUrlFromEventType(e.player_event_log.event_type_id);
 	if (!w.empty()) {
 		Discord::SendPlayerEventMessage(e, w);
 	}

common/discord/discord_manager.h

@@ -13,12 +13,6 @@ public:
 	void QueueWebhookMessage(uint32 webhook_id, const std::string& message);
 	void ProcessMessageQueue();
 	void QueuePlayerEventMessage(const PlayerEvent::PlayerEventContainer& e);
-
-	static DiscordManager* Instance()
-	{
-		static DiscordManager instance;
-		return &instance;
-	}
 private:
 	std::mutex webhook_queue_lock{};
 	std::map<uint32, std::vector<std::string>> webhook_message_queue{};

common/dynamic_zone_lockout.cpp

@@ -3,7 +3,6 @@
 #include "rulesys.h"
 #include "util/uuid.h"
 #include <fmt/format.h>
-#include <fmt/ranges.h>
 #include <cereal/types/chrono.hpp>
 
 DzLockout::DzLockout(std::string uuid, std::string expedition, std::string event, uint64_t expire_time, uint32_t duration)

common/emu_constants.cpp

@@ -451,23 +451,3 @@ bool LDoNTheme::IsValid(uint32 theme_id)
 {
 	return ldon_theme_names.find(theme_id) != ldon_theme_names.end();
 }
-
-std::string PetCommand::GetName(uint8 pet_command)
-{
-	return IsValid(pet_command) ? pet_commands[pet_command] : "UNKNOWN PET COMMAND";
-}
-
-bool PetCommand::IsValid(uint8 pet_command)
-{
-	return pet_commands.find(pet_command) != pet_commands.end();
-}
-
-std::string PetType::GetName(uint8 pet_type)
-{
-	return IsValid(pet_type) ? pet_types[pet_type] : "UNKNOWN PET TYPE";
-}
-
-bool PetType::IsValid(uint8 pet_type)
-{
-	return pet_types.find(pet_type) != pet_types.end();
-}

common/emu_constants.h

@@ -792,131 +792,4 @@ namespace BookType {
 	constexpr uint8 ItemInfo = 2;
 }
 
-namespace PetButton {
-	constexpr uint8 Sit         = 0;
-	constexpr uint8 Stop        = 1;
-	constexpr uint8 Regroup     = 2;
-	constexpr uint8 Follow      = 3;
-	constexpr uint8 Guard       = 4;
-	constexpr uint8 Taunt       = 5;
-	constexpr uint8 Hold        = 6;
-	constexpr uint8 GreaterHold = 7;
-	constexpr uint8 Focus       = 8;
-	constexpr uint8 SpellHold   = 9;
-}
-
-namespace PetButtonState {
-	constexpr uint8 Off = 0;
-	constexpr uint8 On  = 1;
-}
-
-namespace PetCommand {
-	constexpr uint8 HealthReport   = 0;  // /pet health or Pet Window
-	constexpr uint8 Leader         = 1;  // /pet leader or Pet Window
-	constexpr uint8 Attack         = 2;  // /pet attack or Pet Window
-	constexpr uint8 QAttack        = 3;  // /pet qattack or Pet Window
-	constexpr uint8 FollowMe       = 4;  // /pet follow or Pet Window
-	constexpr uint8 GuardHere      = 5;  // /pet guard or Pet Window
-	constexpr uint8 Sit            = 6;  // /pet sit or Pet Window
-	constexpr uint8 SitDown        = 7;  // /pet sit on
-	constexpr uint8 StandUp        = 8;  // /pet sit off
-	constexpr uint8 Stop           = 9;  // /pet stop or Pet Window - Not implemented
-	constexpr uint8 StopOn         = 10; // /pet stop on - Not implemented
-	constexpr uint8 StopOff        = 11; // /pet stop off - Not implemented
-	constexpr uint8 Taunt          = 12; // /pet taunt or Pet Window
-	constexpr uint8 TauntOn        = 13; // /pet taunt on
-	constexpr uint8 TauntOff       = 14; // /pet taunt off
-	constexpr uint8 Hold           = 15; // /pet hold or Pet Window, won't add to hate list unless attacking
-	constexpr uint8 HoldOn         = 16; // /pet hold on
-	constexpr uint8 HoldOff        = 17; // /pet hold off
-	constexpr uint8 GreaterHold    = 18; // /pet ghold, will never add to hate list unless told to
-	constexpr uint8 GreaterHoldOn  = 19; // /pet ghold on
-	constexpr uint8 GreaterHoldOff = 20; // /pet ghold off
-	constexpr uint8 SpellHold      = 21; // /pet no cast or /pet spellhold or Pet Window
-	constexpr uint8 SpellHoldOn    = 22; // /pet spellhold on
-	constexpr uint8 SpellHoldOff   = 23; // /pet spellhold off
-	constexpr uint8 Focus          = 24; // /pet focus or Pet Window
-	constexpr uint8 FocusOn        = 25; // /pet focus on
-	constexpr uint8 FocusOff       = 26; // /pet focus off
-	constexpr uint8 Feign          = 27; // /pet feign
-	constexpr uint8 BackOff        = 28; // /pet back off
-	constexpr uint8 GetLost        = 29; // /pet get lost
-	constexpr uint8 GuardMe        = 30; // Same as /pet follow, but different message in older clients
-	constexpr uint8 Regroup        = 31; // /pet regroup, acts like classic hold
-	constexpr uint8 RegroupOn      = 32; // /pet regroup on
-	constexpr uint8 RegroupOff     = 33; // /pet regroup off
-	constexpr uint8 Max            = 34;
-
-	static std::map<uint8, std::string> pet_commands = {
-		{ PetCommand::HealthReport,   "Health Report" },
-		{ PetCommand::Leader,         "Leader" },
-		{ PetCommand::Attack,         "Attack" },
-		{ PetCommand::QAttack,        "QAttack" },
-		{ PetCommand::FollowMe,       "Follow Me" },
-		{ PetCommand::GuardHere,      "Guard Here" },
-		{ PetCommand::Sit,            "Sit" },
-		{ PetCommand::SitDown,        "Sit Down" },
-		{ PetCommand::StandUp,        "Stand Up" },
-		{ PetCommand::Stop,           "Stop" },
-		{ PetCommand::StopOn,         "Stop On" },
-		{ PetCommand::StopOff,        "Stop Off" },
-		{ PetCommand::Taunt,          "Taunt" },
-		{ PetCommand::TauntOn,        "Taunt On" },
-		{ PetCommand::TauntOff,       "Taunt Off" },
-		{ PetCommand::Hold,           "Hold" },
-		{ PetCommand::HoldOn,         "Hold On" },
-		{ PetCommand::HoldOff,        "Hold Off" },
-		{ PetCommand::GreaterHold,    "Greater Hold" },
-		{ PetCommand::GreaterHoldOn,  "Greater Hold On" },
-		{ PetCommand::GreaterHoldOff, "Greater Hold Off" },
-		{ PetCommand::SpellHold,      "Spell Hold" },
-		{ PetCommand::SpellHoldOn,    "Spell Hold On" },
-		{ PetCommand::SpellHoldOff,   "Spell Hold Off" },
-		{ PetCommand::Focus,          "Focus" },
-		{ PetCommand::FocusOn,        "Focus On" },
-		{ PetCommand::FocusOff,       "Focus Off" },
-		{ PetCommand::Feign,          "Feign" },
-		{ PetCommand::BackOff,        "Back Off" },
-		{ PetCommand::GetLost,        "Get Lost" },
-		{ PetCommand::GuardMe,        "Guard Me" },
-		{ PetCommand::Regroup,        "Regroup" },
-		{ PetCommand::RegroupOn,      "Regroup On" },
-		{ PetCommand::RegroupOff,     "Regroup Off" },
-		{ PetCommand::Max,            "Max" }
-	};
-
-	std::string GetName(uint8 pet_command);
-	bool IsValid(uint8 pet_command);
-}
-
-namespace PetOrder {
-	constexpr uint8 Follow = 0;
-	constexpr uint8 Sit    = 1;
-	constexpr uint8 Guard  = 2;
-	constexpr uint8 Feign  = 3;
-}
-
-namespace PetType {
-	constexpr uint8 Familiar   = 0;
-	constexpr uint8 Animation  = 1;
-	constexpr uint8 Normal     = 2;
-	constexpr uint8 Charmed    = 3;
-	constexpr uint8 Follow     = 4;
-	constexpr uint8 TargetLock = 5;
-	constexpr uint8 None       = 255;
-
-	static std::map<uint8, std::string> pet_types = {
-		{ PetType::Familiar, "Familiar" },
-		{ PetType::Animation, "Animation" },
-		{ PetType::Normal, "Normal" },
-		{ PetType::Charmed, "Charmed" },
-		{ PetType::Follow, "Follow" },
-		{ PetType::TargetLock, "Target Lock" },
-		{ PetType::None, "None" }
-	};
-
-	std::string GetName(uint8 pet_type);
-	bool IsValid(uint8 pet_type);
-}
-
 #endif /*COMMON_EMU_CONSTANTS_H*/

common/eq_constants.h

@@ -988,8 +988,7 @@ enum StartZoneIndex {
     Felwithe,
     Akanon,
     Cabilis,
-    SharVahl,
+    SharVahl
-    RatheMtn
 };
 
 enum FVNoDropFlagRule

common/eq_packet_structs.h

@@ -23,9 +23,9 @@
 #include <string.h>
 #include <string>
 #include <time.h>
-#include <cereal/archives/binary.hpp>
+#include "../cereal/include/cereal/archives/binary.hpp"
-#include <cereal/types/string.hpp>
+#include "../cereal/include/cereal/types/string.hpp"
-#include <cereal/types/vector.hpp>
+#include "../cereal/include/cereal/types/vector.hpp"
 #include "../common/version.h"
 #include "emu_constants.h"
 #include "textures.h"

common/eq_stream.cpp

@@ -545,13 +545,13 @@ void EQStream::SendPacket(uint16 opcode, EQApplicationPacket *p)
 	uint32 chunksize, used;
 	uint32 length;
 
-	if (EQEmuLogSys::Instance()->log_settings[Logs::Server_Client_Packet].is_category_enabled == 1){
+	if (LogSys.log_settings[Logs::Server_Client_Packet].is_category_enabled == 1){
 		if (p->GetOpcode() != OP_SpecialMesg){
 			Log(Logs::General, Logs::Server_Client_Packet, "[%s - 0x%04x] [Size: %u]", OpcodeManager::EmuToName(p->GetOpcode()), p->GetOpcode(), p->Size());
 		}
 	}
 
-	if (EQEmuLogSys::Instance()->log_settings[Logs::Server_Client_Packet_With_Dump].is_category_enabled == 1){
+	if (LogSys.log_settings[Logs::Server_Client_Packet_With_Dump].is_category_enabled == 1){
 		if (p->GetOpcode() != OP_SpecialMesg){
 			Log(Logs::General, Logs::Server_Client_Packet_With_Dump, "[%s - 0x%04x] [Size: %u] %s", OpcodeManager::EmuToName(p->GetOpcode()), p->GetOpcode(), p->Size(), DumpPacketToString(p).c_str());
 		}

common/eq_stream_intf.h

@@ -6,7 +6,7 @@
 #include <string>
 #include "emu_versions.h"
 #include "eq_packet.h"
-#include "net/reliable_stream_connection.h"
+#include "net/daybreak_connection.h"
 
 typedef enum {
 	ESTABLISHED,
@@ -33,18 +33,18 @@ struct EQStreamManagerInterfaceOptions
 		//Login I had trouble getting to recognize compression at all
 		//but that might be because it was still a bit buggy when i was testing that.
 		if (compressed) {
-			reliable_stream_options.encode_passes[0] = EQ::Net::EncodeCompression;
+			daybreak_options.encode_passes[0] = EQ::Net::EncodeCompression;
 		}
 		else if (encoded) {
-			reliable_stream_options.encode_passes[0] = EQ::Net::EncodeXOR;
+			daybreak_options.encode_passes[0] = EQ::Net::EncodeXOR;
 		}
 
-		reliable_stream_options.port = port;
+		daybreak_options.port = port;
 	}
 
 	int opcode_size;
 	bool track_opcode_stats;
-	EQ::Net::ReliableStreamConnectionManagerOptions reliable_stream_options;
+	EQ::Net::DaybreakConnectionManagerOptions daybreak_options;
 };
 
 class EQStreamManagerInterface
@@ -80,7 +80,7 @@ public:
 
 	struct Stats
 	{
-		EQ::Net::ReliableStreamConnectionStats ReliableStreamStats;
+		EQ::Net::DaybreakConnectionStats DaybreakStats;
 		int RecvCount[_maxEmuOpcode];
 		int SentCount[_maxEmuOpcode];
 	};

common/eqemu_config.cpp

@@ -177,21 +177,6 @@ void EQEmuConfig::parse_config()
 	SharedMemDir = _root["server"]["directories"].get("shared_memory", "shared/").asString();
 	LogDir       = _root["server"]["directories"].get("logs", "logs/").asString();
 
-	auto load_paths = [&](const std::string& key, std::vector<std::string>& target) {
-		const auto& paths = _root["server"]["directories"][key];
-		if (paths.isArray()) {
-			for (const auto& dir : paths) {
-				if (dir.isString()) {
-					target.push_back(dir.asString());
-				}
-			}
-		}
-	};
-
-	load_paths("quest_paths", m_quest_directories);
-	load_paths("plugin_paths", m_plugin_directories);
-	load_paths("lua_module_paths", m_lua_module_directories);
-
 	/**
 	 * Logs
 	 */
@@ -436,11 +421,11 @@ void EQEmuConfig::CheckUcsConfigConversion()
 		LogInfo("Migrating old [eqemu_config] UCS configuration to new configuration");
 
 		std::string config_file_path = std::filesystem::path{
-			PathManager::Instance()->GetServerPath() + "/eqemu_config.json"
+			path.GetServerPath() + "/eqemu_config.json"
 		}.string();
 
 		std::string config_file_bak_path = std::filesystem::path{
-			PathManager::Instance()->GetServerPath() + "/eqemu_config.ucs-migrate-json.bak"
+			path.GetServerPath() + "/eqemu_config.ucs-migrate-json.bak"
 		}.string();
 
 		// copy eqemu_config.json to eqemu_config.json.bak

common/eqemu_config.h

@@ -23,7 +23,6 @@
 #include "path_manager.h"
 #include <fstream>
 #include <fmt/format.h>
-#include <fmt/ranges.h>
 
 struct LoginConfig {
 	std::string LoginHost;
@@ -121,22 +120,6 @@ class EQEmuConfig
 		const std::string &GetUCSHost() const;
 		uint16 GetUCSPort() const;
 
-		std::vector<std::string> GetQuestDirectories() const
-		{
-			return m_quest_directories;
-		}
-
-		std::vector<std::string> GetPluginsDirectories() const
-		{
-			return m_plugin_directories;
-		}
-
-		std::vector<std::string> GetLuaModuleDirectories() const
-		{
-			return m_lua_module_directories;
-		}
-
-
 //	uint16 DynamicCount;
 
 //	map<string,uint16> StaticZones;
@@ -150,11 +133,6 @@ class EQEmuConfig
 		Json::Value _root;
 		static std::string ConfigFile;
 
-		std::vector<std::string> m_quest_directories = {};
-		std::vector<std::string> m_plugin_directories = {};
-		std::vector<std::string> m_lua_module_directories = {};
-
-	protected:
 		void parse_config();
 
 		EQEmuConfig()
@@ -192,7 +170,7 @@ class EQEmuConfig
 
 			std::string file = fmt::format(
 				"{}/{}",
-				(file_path.empty() ? PathManager::Instance()->GetServerPath() : file_path),
+				(file_path.empty() ? path.GetServerPath() : file_path),
 				EQEmuConfig::ConfigFile
 			);
 

common/eqemu_logsys.cpp

@@ -537,9 +537,9 @@ void EQEmuLogSys::StartFileLogs(const std::string &log_name)
 {
 	EQEmuLogSys::CloseFileLogs();
 
-	if (!File::Exists(PathManager::Instance()->GetLogPath())) {
+	if (!File::Exists(path.GetLogPath())) {
-		LogInfo("Logs directory not found, creating [{}]", PathManager::Instance()->GetLogPath());
+		LogInfo("Logs directory not found, creating [{}]", path.GetLogPath());
-		File::Makedir(PathManager::Instance()->GetLogPath());
+		File::Makedir(path.GetLogPath());
 	}
 
 	/**
@@ -656,7 +656,7 @@ EQEmuLogSys *EQEmuLogSys::LoadLogDatabaseSettings(bool silent_load)
 		// If we go through this whole loop and nothing is set to any debug level, there
 		// is no point to create a file or keep anything open
 		if (log_settings[c.log_category_id].log_to_file > 0) {
-			m_file_logs_enabled = true;
+			LogSys.m_file_logs_enabled = true;
 		}
 
 		db_categories.emplace_back(c.log_category_id);
@@ -682,33 +682,14 @@ EQEmuLogSys *EQEmuLogSys::LoadLogDatabaseSettings(bool silent_load)
 		if (is_missing_in_database && !is_deprecated_category) {
 			LogInfo("Automatically adding new log category [{}] ({})", Logs::LogCategoryName[i], i);
 
-			auto e = LogsysCategoriesRepository::NewEntity();
+			auto new_category = LogsysCategoriesRepository::NewEntity();
-			e.log_category_id          = i;
+			new_category.log_category_id          = i;
-			e.log_category_description = Strings::Escape(Logs::LogCategoryName[i]);
+			new_category.log_category_description = Strings::Escape(Logs::LogCategoryName[i]);
-			e.log_to_console           = log_settings[i].log_to_console;
+			new_category.log_to_console           = log_settings[i].log_to_console;
-			e.log_to_gmsay             = log_settings[i].log_to_gmsay;
+			new_category.log_to_gmsay             = log_settings[i].log_to_gmsay;
-			e.log_to_file              = log_settings[i].log_to_file;
+			new_category.log_to_file              = log_settings[i].log_to_file;
-			e.log_to_discord           = log_settings[i].log_to_discord;
+			new_category.log_to_discord           = log_settings[i].log_to_discord;
-			db_categories_to_add.emplace_back(e);
+			db_categories_to_add.emplace_back(new_category);
-		}
-
-		// look to see if the category name is different in the database
-		auto it = std::find_if(
-			categories.begin(),
-			categories.end(),
-			[i](const auto &c) { return c.log_category_id == i; }
-		);
-		if (it != categories.end()) {
-			if (it->log_category_description != Logs::LogCategoryName[i]) {
-				LogInfo(
-					"Updating log category [{}] ({}) to new name [{}]",
-					it->log_category_description,
-					i,
-					Logs::LogCategoryName[i]
-				);
-				it->log_category_description = Logs::LogCategoryName[i];
-				LogsysCategoriesRepository::ReplaceOne(*m_database, *it);
-			}
 		}
 	}
 

common/eqemu_logsys.h

@@ -34,7 +34,6 @@
 #endif
 
 #include <fmt/format.h>
-#include <fmt/ranges.h>
 #include "types.h"
 
 namespace Logs {
@@ -195,8 +194,8 @@ namespace Logs {
 		"Web Interface (Deprecated)",
 		"World Server (Deprecated)",
 		"Zone Server (Deprecated)",
-		"MySQL Error",
+		"QueryErr",
-		"MySQL Query",
+		"Query",
 		"Mercenaries",
 		"Quest Debug",
 		"Legacy Packet Logging (Deprecated)",
@@ -212,15 +211,15 @@ namespace Logs {
 		"Traps",
 		"NPC Roam Box",
 		"NPC Scaling",
-		"Mob Appearance",
+		"MobAppearance",
 		"Info",
 		"Warning",
 		"Critical (Deprecated)",
 		"Emergency (Deprecated)",
 		"Alert (Deprecated)",
 		"Notice (Deprecated)",
-		"AI Scan Close",
+		"AI Scan",
-		"AI Yell For Help",
+		"AI Yell",
 		"AI CastBeneficial",
 		"AOE Cast",
 		"Entity Management",
@@ -238,7 +237,7 @@ namespace Logs {
 		"DialogueWindow",
 		"HTTP",
 		"Saylink",
-		"Checksum Verification",
+		"ChecksumVer",
 		"CombatRecord",
 		"Hate",
 		"Discord",
@@ -267,6 +266,8 @@ namespace Logs {
 	};
 }
 
+#include "eqemu_logsys_log_aliases.h"
+
 class Database;
 
 constexpr uint16 MAX_DISCORD_WEBHOOK_ID = 300;
@@ -284,12 +285,6 @@ public:
 	EQEmuLogSys *LoadLogSettingsDefaults();
 	EQEmuLogSys *LoadLogDatabaseSettings(bool silent_load = false);
 
-	static EQEmuLogSys *Instance()
-	{
-		static EQEmuLogSys instance;
-		return &instance;
-	}
-
 	/**
 	 * @param directory_name
 	 */
@@ -355,7 +350,7 @@ public:
 	/**
 	 * Internally used memory reference for all log settings per category
 	 * These are loaded via DB and have defaults loaded in LoadLogSettingsDefaults
-	 * Database loaded via EQEmuLogSys::Instance()->SetDatabase(&database)->LoadLogDatabaseSettings();
+	 * Database loaded via LogSys.SetDatabase(&database)->LoadLogDatabaseSettings();
 	*/
 	LogSettings log_settings[Logs::LogCategory::MaxCategoryID]{};
 
@@ -439,7 +434,7 @@ private:
 	void InjectTablesIfNotExist();
 };
 
-#include "eqemu_logsys_log_aliases.h"
+extern EQEmuLogSys LogSys;
 
 /**
 template<typename... Args>
@@ -461,7 +456,7 @@ void OutF(
 
 #define OutF(ls, debug_level, log_category, file, func, line, formatStr, ...) \
 do { \
-    ls->Out(debug_level, log_category, file, func, line, fmt::format(formatStr, ##__VA_ARGS__).c_str()); \
+    ls.Out(debug_level, log_category, file, func, line, fmt::format(formatStr, ##__VA_ARGS__).c_str()); \
 } while(0)
 
 #endif

common/events/player_event_discord_formatter.cpp

@@ -3,7 +3,6 @@
 #include "../json/json_archive_single_line.h"
 #include <vector>
 #include <fmt/format.h>
-#include <fmt/ranges.h>
 #include <cereal/archives/json.hpp>
 #include <cereal/types/vector.hpp>
 
@@ -717,7 +716,7 @@ std::string PlayerEventDiscordFormatter::FormatNPCHandinEvent(
 			);
 
 			for (int i = 0; i < h.augment_ids.size(); i++) {
-				if (!h.augment_names[i].empty()) {
+				if (!Strings::EqualFold(h.augment_names[i], "None")) {
 					const uint8 slot_id = (i + 1);
 					handin_items_info += fmt::format(
 						"Augment {}: {} ({})\n",
@@ -742,7 +741,7 @@ std::string PlayerEventDiscordFormatter::FormatNPCHandinEvent(
 			);
 
 			for (int i = 0; i < r.augment_ids.size(); i++) {
-				if (!r.augment_names[i].empty()) {
+				if (!Strings::EqualFold(r.augment_names[i], "None")) {
 					const uint8 slot_id = (i + 1);
 					return_items_info += fmt::format(
 						"Augment {}: {} ({})\n",

common/events/player_event_logs.cpp

@@ -15,9 +15,9 @@ const uint32 PROCESS_RETENTION_TRUNCATION_TIMER_INTERVAL = 60 * 60 * 1000; // 1
 // 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);
-	m_database_ping_timer.SetTimer(10 * 1000); // 10 seconds
 
 	ValidateDatabaseConnection();
 
@@ -195,12 +195,10 @@ void PlayerEventLogs::ProcessBatchQueue()
 	};
 
 	// Helper to assign ETL table ID
-
+	auto                                                                                                          AssignEtlId      = [&](
-	auto AssignEtlId = [&](
+		PlayerEventLogsRepository::PlayerEventLogs &r,
-		PlayerEventLogsRepository::PlayerEventLogs& r,
+		PlayerEvent::EventType type
-		PlayerEvent::EventType                      type
+	) {
-	)
-	{
 		if (m_etl_settings.contains(type)) {
 			r.etl_table_id = m_etl_settings.at(type).next_id++;
 		}
@@ -408,6 +406,7 @@ void PlayerEventLogs::ProcessBatchQueue()
 			auto it = event_processors.find(static_cast<PlayerEvent::EventType>(r.event_type_id));
 			if (it != event_processors.end()) {
 				it->second(r);  // Call the appropriate lambda
+				r.event_data = "{}"; // Clear event data
 			}
 			else {
 				LogPlayerEventsDetail("Non-Implemented ETL routing [{}]", r.event_type_id);
@@ -509,7 +508,7 @@ bool PlayerEventLogs::IsEventDiscordEnabled(int32_t event_type_id)
 	}
 
 	// ensure there is a matching webhook to begin with
-	if (!EQEmuLogSys::Instance()->GetDiscordWebhooks()[m_settings[event_type_id].discord_webhook_id].webhook_url.empty()) {
+	if (!LogSys.GetDiscordWebhooks()[m_settings[event_type_id].discord_webhook_id].webhook_url.empty()) {
 		return true;
 	}
 
@@ -529,27 +528,13 @@ std::string PlayerEventLogs::GetDiscordWebhookUrlFromEventType(int32_t event_typ
 	}
 
 	// ensure there is a matching webhook to begin with
-	if (!EQEmuLogSys::Instance()->GetDiscordWebhooks()[m_settings[event_type_id].discord_webhook_id].webhook_url.empty()) {
+	if (!LogSys.GetDiscordWebhooks()[m_settings[event_type_id].discord_webhook_id].webhook_url.empty()) {
-		return EQEmuLogSys::Instance()->GetDiscordWebhooks()[m_settings[event_type_id].discord_webhook_id].webhook_url;
+		return LogSys.GetDiscordWebhooks()[m_settings[event_type_id].discord_webhook_id].webhook_url;
 	}
 
 	return "";
 }
 
-void PlayerEventLogs::LoadPlayerEventSettingsFromQS(
-	const std::vector<PlayerEventLogSettingsRepository::PlayerEventLogSettings> &settings
-)
-{
-	for (const auto &e : settings) {
-		if (e.id >= PlayerEvent::MAX || e.id < 0) {
-			continue;
-		}
-		m_settings[e.id] = e;
-	}
-
-	LogInfo("Applied [{}] player event log settings from QS", settings.size());
-}
-
 // GM_COMMAND           | [x] Implemented Formatter
 // ZONING               | [x] Implemented Formatter
 // AA_GAIN              | [x] Implemented Formatter
@@ -931,10 +916,6 @@ std::string PlayerEventLogs::GetDiscordPayloadFromEvent(const PlayerEvent::Playe
 // general process function, used in world or QS depending on rule Logging:PlayerEventsQSProcess
 void PlayerEventLogs::Process()
 {
-	if (m_database_ping_timer.Check()) {
-		m_database->ping();
-	}
-
 	if (m_process_batch_events_timer.Check() ||
 		m_record_batch_queue.size() >= RuleI(Logging, BatchPlayerEventProcessChunkSize)) {
 		ProcessBatchQueue();

common/events/player_event_logs.h

@@ -73,11 +73,9 @@ public:
 		return BuildPlayerEventPacket(c);
 	}
 
-	[[nodiscard]] const PlayerEventLogSettingsRepository::PlayerEventLogSettings * GetSettings() const;
+	[[nodiscard]] const PlayerEventLogSettingsRepository::PlayerEventLogSettings *GetSettings() const;
-	bool                                                                           IsEventDiscordEnabled(int32_t event_type_id);
+	bool IsEventDiscordEnabled(int32_t event_type_id);
-	std::string                                                                    GetDiscordWebhookUrlFromEventType(int32_t event_type_id);
+	std::string GetDiscordWebhookUrlFromEventType(int32_t event_type_id);
-
-	void LoadPlayerEventSettingsFromQS(const std::vector<PlayerEventLogSettingsRepository::PlayerEventLogSettings>& settings);
 
 	static std::string GetDiscordPayloadFromEvent(const PlayerEvent::PlayerEventContainer &e);
 
@@ -96,12 +94,6 @@ public:
 		std::vector<PlayerEventAaPurchaseRepository::PlayerEventAaPurchase>             aa_purchase;
 	};
 
-	static PlayerEventLogs* Instance()
-	{
-		static PlayerEventLogs instance;
-		return &instance;
-	}
-
 private:
 	struct EtlSettings {
 		bool        enabled;
@@ -121,7 +113,6 @@ private:
 	std::map<PlayerEvent::EventType, EtlSettings>  m_etl_settings{};
 
 	// timers
-	Timer m_database_ping_timer; // database ping timer
 	Timer m_process_batch_events_timer; // events processing timer
 	Timer m_process_retention_truncation_timer; // timer for truncating events based on retention settings
 
@@ -135,4 +126,6 @@ public:
 	std::map<PlayerEvent::EventType, EtlSettings> &GetEtlSettings() { return m_etl_settings;}
 };
 
+extern PlayerEventLogs player_event_logs;
+
 #endif //EQEMU_PLAYER_EVENT_LOGS_H

common/evolving_items.cpp

@@ -21,8 +21,8 @@ void EvolvingItemsManager::LoadEvolvingItems() const
 		results.begin(),
 		results.end(),
 		std::inserter(
-			EvolvingItemsManager::Instance()->GetEvolvingItemsCache(),
+			evolving_items_manager.GetEvolvingItemsCache(),
-			EvolvingItemsManager::Instance()->GetEvolvingItemsCache().end()
+			evolving_items_manager.GetEvolvingItemsCache().end()
 		),
 		[](const ItemsEvolvingDetailsRepository::ItemsEvolvingDetails &x) {
 			return std::make_pair(x.item_id, x);
@@ -42,13 +42,13 @@ void EvolvingItemsManager::SetContentDatabase(Database *db)
 
 double EvolvingItemsManager::CalculateProgression(const uint64 current_amount, const uint32 item_id)
 {
-	if (!EvolvingItemsManager::Instance()->GetEvolvingItemsCache().contains(item_id)) {
+	if (!evolving_items_manager.GetEvolvingItemsCache().contains(item_id)) {
 		return 0;
 	}
 
-	return EvolvingItemsManager::Instance()->GetEvolvingItemsCache().at(item_id).required_amount > 0
+	return evolving_items_manager.GetEvolvingItemsCache().at(item_id).required_amount > 0
 		? static_cast<double>(current_amount)
-		  / static_cast<double>(EvolvingItemsManager::Instance()->GetEvolvingItemsCache().at(item_id).required_amount) * 100
+		  / static_cast<double>(evolving_items_manager.GetEvolvingItemsCache().at(item_id).required_amount) * 100
 		: 0;
 }
 
@@ -73,11 +73,7 @@ void EvolvingItemsManager::DoLootChecks(const uint32 char_id, const uint16 slot_
 		e.character_id  = char_id;
 		e.item_id       = inst.GetID();
 		e.equipped      = inst.GetEvolveEquipped();
-		e.final_item_id = EvolvingItemsManager::Instance()->GetFinalItemID(inst);
+		e.final_item_id = evolving_items_manager.GetFinalItemID(inst);
-		if (inst.GetEvolveCurrentAmount() > 0) {
-			e.current_amount = inst.GetEvolveCurrentAmount();
-			inst.CalculateEvolveProgression();
-		}
 
 		auto r = CharacterEvolvingItemsRepository::InsertOne(*m_db, e);
 		e.id   = r.id;
@@ -100,20 +96,20 @@ uint32 EvolvingItemsManager::GetFinalItemID(const EQ::ItemInstance &inst) const
 	}
 
 	const auto start_iterator = std::ranges::find_if(
-		EvolvingItemsManager::Instance()->GetEvolvingItemsCache().cbegin(),
+		evolving_items_manager.GetEvolvingItemsCache().cbegin(),
-		EvolvingItemsManager::Instance()->GetEvolvingItemsCache().cend(),
+		evolving_items_manager.GetEvolvingItemsCache().cend(),
 		[&](const std::pair<uint32, ItemsEvolvingDetailsRepository::ItemsEvolvingDetails> &a) {
 			return a.second.item_evo_id == inst.GetEvolveLoreID();
 		}
 	);
 
-	if (start_iterator == std::end(EvolvingItemsManager::Instance()->GetEvolvingItemsCache())) {
+	if (start_iterator == std::end(evolving_items_manager.GetEvolvingItemsCache())) {
 		return 0;
 	}
 
 	const auto final_id = std::ranges::max_element(
 		start_iterator,
-		EvolvingItemsManager::Instance()->GetEvolvingItemsCache().cend(),
+		evolving_items_manager.GetEvolvingItemsCache().cend(),
 		[&](
 		const std::pair<uint32, ItemsEvolvingDetailsRepository::ItemsEvolvingDetails> &a,
 		const std::pair<uint32, ItemsEvolvingDetailsRepository::ItemsEvolvingDetails> &b
@@ -135,15 +131,15 @@ uint32 EvolvingItemsManager::GetNextEvolveItemID(const EQ::ItemInstance &inst) c
 	int8 const current_level = inst.GetEvolveLvl();
 
 	const auto iterator = std::ranges::find_if(
-		EvolvingItemsManager::Instance()->GetEvolvingItemsCache().cbegin(),
+		evolving_items_manager.GetEvolvingItemsCache().cbegin(),
-		EvolvingItemsManager::Instance()->GetEvolvingItemsCache().cend(),
+		evolving_items_manager.GetEvolvingItemsCache().cend(),
 		[&](const std::pair<uint32, ItemsEvolvingDetailsRepository::ItemsEvolvingDetails> &a) {
 			return a.second.item_evo_id == inst.GetEvolveLoreID() &&
 			       a.second.item_evolve_level == current_level + 1;
 		}
 	);
 
-	if (iterator == std::end(EvolvingItemsManager::Instance()->GetEvolvingItemsCache())) {
+	if (iterator == std::end(evolving_items_manager.GetEvolvingItemsCache())) {
 		return 0;
 	}
 
@@ -259,8 +255,8 @@ EvolveTransfer EvolvingItemsManager::DetermineTransferResults(
 		return ets;
 	}
 
-	auto evolving_details_inst_from = EvolvingItemsManager::Instance()->GetEvolveItemDetails(inst_from.GetID());
+	auto evolving_details_inst_from = evolving_items_manager.GetEvolveItemDetails(inst_from.GetID());
-	auto evolving_details_inst_to   = EvolvingItemsManager::Instance()->GetEvolveItemDetails(inst_to.GetID());
+	auto evolving_details_inst_to   = evolving_items_manager.GetEvolveItemDetails(inst_to.GetID());
 
 	if (!evolving_details_inst_from.id || !evolving_details_inst_to.id) {
 		return ets;
@@ -276,10 +272,10 @@ EvolveTransfer EvolvingItemsManager::DetermineTransferResults(
 			compatibility = 30;
 		}
 
-		xp           = EvolvingItemsManager::Instance()->GetTotalEarnedXP(inst_from) * compatibility / 100;
+		xp           = evolving_items_manager.GetTotalEarnedXP(inst_from) * compatibility / 100;
-		auto results = EvolvingItemsManager::Instance()->GetNextItemByXP(inst_to, xp);
+		auto results = evolving_items_manager.GetNextItemByXP(inst_to, xp);
 
-		ets.item_from_id             = EvolvingItemsManager::Instance()->GetFirstItemInLoreGroup(inst_from.GetEvolveLoreID());
+		ets.item_from_id             = evolving_items_manager.GetFirstItemInLoreGroup(inst_from.GetEvolveLoreID());
 		ets.item_from_current_amount = results.from_current_amount;
 		ets.item_to_id               = results.new_item_id;
 		ets.item_to_current_amount   = results.new_current_amount;

common/evolving_items.h

@@ -56,15 +56,12 @@ public:
 	std::map<uint32, ItemsEvolvingDetailsRepository::ItemsEvolvingDetails>& GetEvolvingItemsCache() { return m_evolving_items_cache; }
 	std::vector<ItemsEvolvingDetailsRepository::ItemsEvolvingDetails> GetEvolveIDItems(uint32 evolve_id);
 
-	static EvolvingItemsManager* Instance()
-	{
-		static EvolvingItemsManager instance;
-		return &instance;
-	}
 private:
 	std::map<uint32, ItemsEvolvingDetailsRepository::ItemsEvolvingDetails> m_evolving_items_cache;
 	Database *                                                             m_db;
 	Database *                                                             m_content_db;
 };
 
+extern EvolvingItemsManager evolving_items_manager;
+
 #endif //EVOLVING_H

common/faction.cpp

@@ -95,12 +95,12 @@ bool IsOfEqualRace(int r1, int r2)
 	}
 	// TODO: add more values
 	switch (r1) {
-		case Race::DarkElf:
+		case DARK_ELF:
 			if (r2 == Race::NeriakCitizen) {
 				return true;
 			}
 			break;
-		case Race::Barbarian:
+		case BARBARIAN:
 			if (r2 == Race::HalasCitizen) {
 				return true;
 			}
@@ -116,49 +116,49 @@ bool IsOfIndiffRace(int r1, int r2)
 	}
 	// TODO: add more values
 	switch (r1) {
-		case Race::DarkElf:
+		case DARK_ELF:
-		case Race::Ogre:
+		case OGRE:
-		case Race::Troll:
+		case TROLL:
-			if (r2 == Race::Ogre || r2 == Race::Troll || r2 == Race::DarkElf) {
+			if (r2 == OGRE || r2 == TROLL || r2 == DARK_ELF) {
 				return true;
 			}
 			break;
-		case Race::Human:
+		case HUMAN:
-		case Race::Barbarian:
+		case BARBARIAN:
-		case Race::HalfElf:
+		case HALF_ELF:
-		case Race::Gnome:
+		case GNOME:
-		case Race::Halfling:
+		case HALFLING:
-		case Race::WoodElf:
+		case WOOD_ELF:
-			if (r2 == Race::Human ||
+			if (r2 == HUMAN ||
-			    r2 == Race::Barbarian ||
+			    r2 == BARBARIAN ||
-			    r2 == Race::Erudite ||
+			    r2 == ERUDITE ||
-			    r2 == Race::HalfElf ||
+			    r2 == HALF_ELF ||
-			    r2 == Race::Gnome ||
+			    r2 == GNOME ||
-			    r2 == Race::Halfling ||
+			    r2 == HALFLING ||
-			    r2 == Race::Dwarf ||
+			    r2 == DWARF ||
-			    r2 == Race::HighElf ||
+			    r2 == HIGH_ELF ||
-			    r2 == Race::WoodElf) {
+			    r2 == WOOD_ELF) {
 				return true;
 			}
 			break;
-		case Race::Erudite:
+		case ERUDITE:
-			if (r2 == Race::Human || r2 == Race::HalfElf) {
+			if (r2 == HUMAN || r2 == HALF_ELF) {
 				return true;
 			}
 			break;
-		case Race::Dwarf:
+		case DWARF:
-			if (r2 == Race::Halfling || r2 == Race::Gnome) {
+			if (r2 == HALFLING || r2 == GNOME) {
 				return true;
 			}
 			break;
-		case Race::HighElf:
+		case HIGH_ELF:
-			if (r2 == Race::WoodElf) {
+			if (r2 == WOOD_ELF) {
 				return true;
 			}
 			break;
-		case Race::VahShir:
+		case VAHSHIR:
 			return true;
-		case Race::Iksar:
+		case IKSAR:
 			return false;
 	}
 	return false;

common/file.cpp

@@ -36,7 +36,6 @@
 #endif
 
 #include <fmt/format.h>
-#include <fmt/ranges.h>
 #include <filesystem>
 #include <iostream>
 #include <sys/stat.h>

common/ip_util.cpp

@@ -20,7 +20,6 @@
 
 #include <cstring>
 #include <fmt/format.h>
-#include <fmt/ranges.h>
 #include <csignal>
 #include <vector>
 #include "ip_util.h"

common/ipc_mutex.cpp

@@ -55,7 +55,7 @@ namespace EQ {
 			EQ_EXCEPT("IPC Mutex", "Could not create mutex.");
 		}
 #else
-		std::string final_name = fmt::format("{}/{}.lock", PathManager::Instance()->GetSharedMemoryPath(), name);
+		std::string final_name = fmt::format("{}/{}.lock", path.GetSharedMemoryPath(), name);
 
 #ifdef __DARWIN
 #if __DARWIN_C_LEVEL < 200809L

common/item_data.h

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

common/item_fieldlist.h

@@ -0,0 +1,206 @@
+/*
+
+
+These fields must be in the order of how they are serialized!
+
+
+
+*/
+
+F(itemclass)
+F(name)
+F(lore)
+F(idfile)
+F(id)
+F(weight)
+F(norent)
+F(nodrop)
+F(size)
+F(slots)
+F(price)
+F(icon)
+F(UNK012)
+F(UNK013)
+F(benefitflag)
+F(tradeskills)
+F(cr)
+F(dr)
+F(pr)
+F(mr)
+F(fr)
+F(astr)
+F(asta)
+F(aagi)
+F(adex)
+F(acha)
+F(aint)
+F(awis)
+F(hp)
+F(mana)
+F(ac)
+F(deity)
+F(skillmodvalue)
+F(UNK033)
+F(skillmodmax)
+F(skillmodtype)
+F(banedmgrace)
+F(banedmgamt)
+F(banedmgbody)
+F(magic)
+F(casttime_)
+F(reqlevel)
+F(bardtype)
+F(bardvalue)
+F(light)
+F(delay)
+F(reclevel)
+F(recskill)
+F(elemdmgtype)
+F(elemdmgamt)
+F(range)
+F(damage)
+F(color)
+F(classes)
+F(races)
+F(UNK054)
+F(maxcharges)
+F(itemtype)
+F(material)
+F(herosforgemodel)
+F(sellrate)
+F(UNK059)
+F(casttime)
+F(elitematerial)
+F(procrate)
+F(combateffects)
+F(shielding)
+F(stunresist)
+F(strikethrough)
+F(extradmgskill)
+F(extradmgamt)
+F(spellshield)
+F(avoidance)
+F(accuracy)
+F(charmfileid)
+F(factionmod1)
+F(factionmod2)
+F(factionmod3)
+F(factionmod4)
+F(factionamt1)
+F(factionamt2)
+F(factionamt3)
+F(factionamt4)
+F(charmfile)
+F(augtype)
+F(augslot1type)
+F(augslot1visible)
+F(augslot2type)
+F(augslot2visible)
+F(augslot3type)
+F(augslot3visible)
+F(augslot4type)
+F(augslot4visible)
+F(augslot5type)
+F(augslot5visible)
+F(augslot6type)
+F(augslot6visible)
+F(ldontheme)
+F(ldonprice)
+F(ldonsold)
+F(bagtype)
+F(bagslots)
+F(bagsize)
+F(bagwr)
+F(book)
+F(booktype)
+F(filename)
+F(banedmgraceamt)
+F(augrestrict)
+F(loregroup)
+F(pendingloreflag)
+F(artifactflag)
+F(summonedflag)
+F(favor)
+F(fvnodrop)
+F(endur)
+F(dotshielding)
+F(attack)
+F(regen)
+F(manaregen)
+F(enduranceregen)
+F(haste)
+F(damageshield)
+F(recastdelay)
+F(recasttype)
+F(guildfavor)
+F(augdistiller)
+F(UNK123)
+F(UNK124)
+F(attuneable)
+F(nopet)
+F(UNK127)
+F(pointtype)
+F(potionbelt)
+F(potionbeltslots)
+F(stacksize)
+F(notransfer)
+F(stackable)
+F(UNK134)
+F(clickeffect)
+F(clicktype)
+F(clicklevel)
+F(clicklevel2)
+F(proceffect)
+F(proctype)
+F(proclevel)
+F(proclevel2)
+F(worneffect)
+F(worntype)
+F(wornlevel)
+F(wornlevel2)
+F(focuseffect)
+F(focustype)
+F(focuslevel)
+F(focuslevel2)
+F(scrolleffect)
+F(scrolltype)
+F(scrolllevel)
+F(scrolllevel2)
+F(bardeffect)
+F(bardeffecttype)
+F(bardlevel2)
+F(bardlevel)
+F(questitemflag)
+F(svcorruption)
+F(purity)
+F(evoitem)
+F(evoid)
+F(evolvinglevel)
+F(evomax)
+F(backstabdmg)
+F(dsmitigation)
+F(heroic_str)
+F(heroic_int)
+F(heroic_wis)
+F(heroic_agi)
+F(heroic_dex)
+F(heroic_sta)
+F(heroic_cha)
+F(heroic_mr)
+F(heroic_fr)
+F(heroic_cr)
+F(heroic_dr)
+F(heroic_pr)
+F(heroic_svcorrup)
+F(healamt)
+F(spelldmg)
+F(ldonsellbackrate)
+F(scriptfileid)
+F(expendablearrow)
+F(clairvoyance)
+F(clickname)
+F(procname)
+F(wornname)
+F(focusname)
+F(scrollname)
+F(subtype)

common/item_instance.cpp

@@ -574,7 +574,7 @@ EQ::ItemInstance* EQ::ItemInstance::GetOrnamentationAugment() const
 uint32 EQ::ItemInstance::GetOrnamentHeroModel(int32 material_slot) const
 {
 	// Not a Hero Forge item.
-	if (m_ornament_hero_model == 0) {
+	if (m_ornament_hero_model == 0 || material_slot < 0) {
 		return 0;
 	}
 
@@ -1799,7 +1799,7 @@ std::vector<std::string> EQ::ItemInstance::GetAugmentNames() const
 
 	for (uint8 slot_id = invaug::SOCKET_BEGIN; slot_id <= invaug::SOCKET_END; slot_id++) {
 		const auto augment = GetAugment(slot_id);
-		augment_names.push_back(augment ? augment->GetItem()->Name : "");
+		augment_names.push_back(augment ? augment->GetItem()->Name : "None");
 	}
 
 	return augment_names;

common/item_instance.h

@@ -335,7 +335,7 @@ namespace EQ
 		void             SetEvolveAddToCurrentAmount(const uint64 in) const { m_evolving_details.current_amount += in; }
 		void             SetEvolveFinalItemID(const uint32 in) const { m_evolving_details.final_item_id = in; }
 		bool             TransferOwnership(Database& db, const uint32 to_char_id) const;
-		void             CalculateEvolveProgression() const { m_evolving_details.progression = EvolvingItemsManager::Instance()->CalculateProgression(GetEvolveCurrentAmount(), GetID()); }
+		void             CalculateEvolveProgression() const { m_evolving_details.progression = evolving_items_manager.CalculateProgression(GetEvolveCurrentAmount(), GetID()); }
 
 	protected:
 		//////////////////////////

common/net/console_server.cpp

@@ -1,7 +1,6 @@
 #include "console_server.h"
 #include "../strings.h"
 #include <fmt/format.h>
-#include <fmt/ranges.h>
 
 EQ::Net::ConsoleServer::ConsoleServer(const std::string &addr, int port)
 {

common/net/console_server_connection.cpp

@@ -5,7 +5,6 @@
 #include "../servertalk.h"
 #include "../rulesys.h"
 #include <fmt/format.h>
-#include <fmt/ranges.h>
 
 EQ::Net::ConsoleServerConnection::ConsoleServerConnection(ConsoleServer *parent, std::shared_ptr<TCPConnection> connection)
 {

common/net/daybreak_connection.cpp

@@ -1,10 +1,9 @@
-#include "reliable_stream_connection.h"
+#include "daybreak_connection.h"
 #include "../event/event_loop.h"
 #include "../data_verification.h"
 #include "crc32.h"
 #include <zlib.h>
 #include <fmt/format.h>
-#include <fmt/ranges.h>
 
 // observed client receive window is 300 packets, 140KB
 constexpr size_t MAX_CLIENT_RECV_PACKETS_PER_WINDOW = 300;
@@ -13,7 +12,7 @@ constexpr size_t MAX_CLIENT_RECV_BYTES_PER_WINDOW   = 140 * 1024;
 // buffer pools
 SendBufferPool send_buffer_pool;
 
-EQ::Net::ReliableStreamConnectionManager::ReliableStreamConnectionManager()
+EQ::Net::DaybreakConnectionManager::DaybreakConnectionManager()
 {
 	m_attached = nullptr;
 	memset(&m_timer, 0, sizeof(uv_timer_t));
@@ -22,7 +21,7 @@ EQ::Net::ReliableStreamConnectionManager::ReliableStreamConnectionManager()
 	Attach(EQ::EventLoop::Get().Handle());
 }
 
-EQ::Net::ReliableStreamConnectionManager::ReliableStreamConnectionManager(const ReliableStreamConnectionManagerOptions &opts)
+EQ::Net::DaybreakConnectionManager::DaybreakConnectionManager(const DaybreakConnectionManagerOptions &opts)
 {
 	m_attached = nullptr;
 	m_options = opts;
@@ -32,12 +31,12 @@ EQ::Net::ReliableStreamConnectionManager::ReliableStreamConnectionManager(const
 	Attach(EQ::EventLoop::Get().Handle());
 }
 
-EQ::Net::ReliableStreamConnectionManager::~ReliableStreamConnectionManager()
+EQ::Net::DaybreakConnectionManager::~DaybreakConnectionManager()
 {
 	Detach();
 }
 
-void EQ::Net::ReliableStreamConnectionManager::Attach(uv_loop_t *loop)
+void EQ::Net::DaybreakConnectionManager::Attach(uv_loop_t *loop)
 {
 	if (!m_attached) {
 		uv_timer_init(loop, &m_timer);
@@ -46,7 +45,7 @@ void EQ::Net::ReliableStreamConnectionManager::Attach(uv_loop_t *loop)
 		auto update_rate = (uint64_t)(1000.0 / m_options.tic_rate_hertz);
 
 		uv_timer_start(&m_timer, [](uv_timer_t *handle) {
-			ReliableStreamConnectionManager *c = (ReliableStreamConnectionManager*)handle->data;
+			DaybreakConnectionManager *c = (DaybreakConnectionManager*)handle->data;
 			c->UpdateDataBudget();
 			c->Process();
 			c->ProcessResend();
@@ -72,7 +71,7 @@ void EQ::Net::ReliableStreamConnectionManager::Attach(uv_loop_t *loop)
 				buf->len  = 65536;
 			},
 			[](uv_udp_t* handle, ssize_t nread, const uv_buf_t* buf, const struct sockaddr* addr, unsigned flags) {
-			ReliableStreamConnectionManager *c = (ReliableStreamConnectionManager*)handle->data;
+			DaybreakConnectionManager *c = (DaybreakConnectionManager*)handle->data;
 			if (nread < 0 || addr == nullptr) {
 				return;
 			}
@@ -91,7 +90,7 @@ void EQ::Net::ReliableStreamConnectionManager::Attach(uv_loop_t *loop)
 	}
 }
 
-void EQ::Net::ReliableStreamConnectionManager::Detach()
+void EQ::Net::DaybreakConnectionManager::Detach()
 {
 	if (m_attached) {
 		uv_udp_recv_stop(&m_socket);
@@ -100,11 +99,11 @@ void EQ::Net::ReliableStreamConnectionManager::Detach()
 	}
 }
 
-void EQ::Net::ReliableStreamConnectionManager::Connect(const std::string &addr, int port)
+void EQ::Net::DaybreakConnectionManager::Connect(const std::string &addr, int port)
 {
 	//todo dns resolution
 
-	auto connection = std::shared_ptr<ReliableStreamConnection>(new ReliableStreamConnection(this, addr, port));
+	auto connection = std::shared_ptr<DaybreakConnection>(new DaybreakConnection(this, addr, port));
 	connection->m_self = connection;
 
 	if (m_on_new_connection) {
@@ -114,7 +113,7 @@ void EQ::Net::ReliableStreamConnectionManager::Connect(const std::string &addr,
 	m_connections.emplace(std::make_pair(std::make_pair(addr, port), connection));
 }
 
-void EQ::Net::ReliableStreamConnectionManager::Process()
+void EQ::Net::DaybreakConnectionManager::Process()
 {
 	auto now = Clock::now();
 	auto iter = m_connections.begin();
@@ -178,7 +177,7 @@ void EQ::Net::ReliableStreamConnectionManager::Process()
 	}
 }
 
-void EQ::Net::ReliableStreamConnectionManager::UpdateDataBudget()
+void EQ::Net::DaybreakConnectionManager::UpdateDataBudget()
 {
 	auto outgoing_data_rate = m_options.outgoing_data_rate;
 	if (outgoing_data_rate <= 0.0) {
@@ -197,7 +196,7 @@ void EQ::Net::ReliableStreamConnectionManager::UpdateDataBudget()
 	}
 }
 
-void EQ::Net::ReliableStreamConnectionManager::ProcessResend()
+void EQ::Net::DaybreakConnectionManager::ProcessResend()
 {
 	auto iter = m_connections.begin();
 	while (iter != m_connections.end()) {
@@ -218,15 +217,15 @@ void EQ::Net::ReliableStreamConnectionManager::ProcessResend()
 	}
 }
 
-void EQ::Net::ReliableStreamConnectionManager::ProcessPacket(const std::string &endpoint, int port, const char *data, size_t size)
+void EQ::Net::DaybreakConnectionManager::ProcessPacket(const std::string &endpoint, int port, const char *data, size_t size)
 {
 	if (m_options.simulated_in_packet_loss && m_options.simulated_in_packet_loss >= m_rand.Int(0, 100)) {
 		return;
 	}
 
-	if (size < ReliableStreamHeader::size()) {
+	if (size < DaybreakHeader::size()) {
 		if (m_on_error_message) {
-			m_on_error_message(fmt::format("Packet of size {0} which is less than {1}", size, ReliableStreamHeader::size()));
+			m_on_error_message(fmt::format("Packet of size {0} which is less than {1}", size, DaybreakHeader::size()));
 		}
 		return;
 	}
@@ -240,9 +239,9 @@ void EQ::Net::ReliableStreamConnectionManager::ProcessPacket(const std::string &
 		else {
 			if (data[0] == 0 && data[1] == OP_SessionRequest) {
 				StaticPacket p((void*)data, size);
-				auto request = p.GetSerialize<ReliableStreamConnect>(0);
+				auto request = p.GetSerialize<DaybreakConnect>(0);
 
-				connection = std::shared_ptr<ReliableStreamConnection>(new ReliableStreamConnection(this, request, endpoint, port));
+				connection = std::shared_ptr<DaybreakConnection>(new DaybreakConnection(this, request, endpoint, port));
 				connection->m_self = connection;
 
 				if (m_on_new_connection) {
@@ -263,7 +262,7 @@ void EQ::Net::ReliableStreamConnectionManager::ProcessPacket(const std::string &
 	}
 }
 
-std::shared_ptr<EQ::Net::ReliableStreamConnection> EQ::Net::ReliableStreamConnectionManager::FindConnectionByEndpoint(std::string addr, int port)
+std::shared_ptr<EQ::Net::DaybreakConnection> EQ::Net::DaybreakConnectionManager::FindConnectionByEndpoint(std::string addr, int port)
 {
 	auto p = std::make_pair(addr, port);
 	auto iter = m_connections.find(p);
@@ -274,9 +273,9 @@ std::shared_ptr<EQ::Net::ReliableStreamConnection> EQ::Net::ReliableStreamConnec
 	return nullptr;
 }
 
-void EQ::Net::ReliableStreamConnectionManager::SendDisconnect(const std::string &addr, int port)
+void EQ::Net::DaybreakConnectionManager::SendDisconnect(const std::string &addr, int port)
 {
-	ReliableStreamDisconnect header;
+	DaybreakDisconnect header;
 	header.zero = 0;
 	header.opcode = OP_OutOfSession;
 	header.connect_code = 0;
@@ -301,7 +300,7 @@ void EQ::Net::ReliableStreamConnectionManager::SendDisconnect(const std::string
 }
 
 //new connection made as server
-EQ::Net::ReliableStreamConnection::ReliableStreamConnection(ReliableStreamConnectionManager *owner, const ReliableStreamConnect &connect, const std::string &endpoint, int port)
+EQ::Net::DaybreakConnection::DaybreakConnection(DaybreakConnectionManager *owner, const DaybreakConnect &connect, const std::string &endpoint, int port)
 {
 	m_owner = owner;
 	m_last_send = Clock::now();
@@ -328,7 +327,7 @@ EQ::Net::ReliableStreamConnection::ReliableStreamConnection(ReliableStreamConnec
 }
 
 //new connection made as client
-EQ::Net::ReliableStreamConnection::ReliableStreamConnection(ReliableStreamConnectionManager *owner, const std::string &endpoint, int port)
+EQ::Net::DaybreakConnection::DaybreakConnection(DaybreakConnectionManager *owner, const std::string &endpoint, int port)
 {
 	m_owner = owner;
 	m_last_send = Clock::now();
@@ -350,11 +349,11 @@ EQ::Net::ReliableStreamConnection::ReliableStreamConnection(ReliableStreamConnec
 	m_outgoing_budget = owner->m_options.outgoing_data_rate;
 }
 
-EQ::Net::ReliableStreamConnection::~ReliableStreamConnection()
+EQ::Net::DaybreakConnection::~DaybreakConnection()
 {
 }
 
-void EQ::Net::ReliableStreamConnection::Close()
+void EQ::Net::DaybreakConnection::Close()
 {
 	if (m_status != StatusDisconnected && m_status != StatusDisconnecting) {
 		FlushBuffer();
@@ -368,17 +367,17 @@ void EQ::Net::ReliableStreamConnection::Close()
 	ChangeStatus(StatusDisconnecting);
 }
 
-void EQ::Net::ReliableStreamConnection::QueuePacket(Packet &p)
+void EQ::Net::DaybreakConnection::QueuePacket(Packet &p)
 {
 	QueuePacket(p, 0, true);
 }
 
-void EQ::Net::ReliableStreamConnection::QueuePacket(Packet &p, int stream)
+void EQ::Net::DaybreakConnection::QueuePacket(Packet &p, int stream)
 {
 	QueuePacket(p, stream, true);
 }
 
-void EQ::Net::ReliableStreamConnection::QueuePacket(Packet &p, int stream, bool reliable)
+void EQ::Net::DaybreakConnection::QueuePacket(Packet &p, int stream, bool reliable)
 {
 	if (*(char*)p.Data() == 0) {
 		DynamicPacket packet;
@@ -391,21 +390,21 @@ void EQ::Net::ReliableStreamConnection::QueuePacket(Packet &p, int stream, bool
 	InternalQueuePacket(p, stream, reliable);
 }
 
-EQ::Net::ReliableStreamConnectionStats EQ::Net::ReliableStreamConnection::GetStats()
+EQ::Net::DaybreakConnectionStats EQ::Net::DaybreakConnection::GetStats()
 {
-	EQ::Net::ReliableStreamConnectionStats ret = m_stats;
+	EQ::Net::DaybreakConnectionStats ret = m_stats;
 	ret.datarate_remaining = m_outgoing_budget;
 	ret.avg_ping = m_rolling_ping;
 
 	return ret;
 }
 
-void EQ::Net::ReliableStreamConnection::ResetStats()
+void EQ::Net::DaybreakConnection::ResetStats()
 {
 	m_stats.Reset();
 }
 
-void EQ::Net::ReliableStreamConnection::Process()
+void EQ::Net::DaybreakConnection::Process()
 {
 	try {
 		auto now = Clock::now();
@@ -423,7 +422,7 @@ void EQ::Net::ReliableStreamConnection::Process()
 	}
 }
 
-void EQ::Net::ReliableStreamConnection::ProcessPacket(Packet &p)
+void EQ::Net::DaybreakConnection::ProcessPacket(Packet &p)
 {
 	m_last_recv = Clock::now();
 	m_stats.recv_packets++;
@@ -459,13 +458,13 @@ void EQ::Net::ReliableStreamConnection::ProcessPacket(Packet &p)
 				switch (m_encode_passes[i]) {
 					case EncodeCompression:
 						if(temp.GetInt8(0) == 0)
-							Decompress(temp, ReliableStreamHeader::size(), temp.Length() - ReliableStreamHeader::size());
+							Decompress(temp, DaybreakHeader::size(), temp.Length() - DaybreakHeader::size());
 						else
 							Decompress(temp, 1, temp.Length() - 1);
 						break;
 					case EncodeXOR:
 						if (temp.GetInt8(0) == 0)
-							Decode(temp, ReliableStreamHeader::size(), temp.Length() - ReliableStreamHeader::size());
+							Decode(temp, DaybreakHeader::size(), temp.Length() - DaybreakHeader::size());
 						else
 							Decode(temp, 1, temp.Length() - 1);
 						break;
@@ -484,7 +483,7 @@ void EQ::Net::ReliableStreamConnection::ProcessPacket(Packet &p)
 				switch (m_encode_passes[i]) {
 					case EncodeXOR:
 						if (temp.GetInt8(0) == 0)
-							Decode(temp, ReliableStreamHeader::size(), temp.Length() - ReliableStreamHeader::size());
+							Decode(temp, DaybreakHeader::size(), temp.Length() - DaybreakHeader::size());
 						else
 							Decode(temp, 1, temp.Length() - 1);
 						break;
@@ -503,7 +502,7 @@ void EQ::Net::ReliableStreamConnection::ProcessPacket(Packet &p)
 	}
 }
 
-void EQ::Net::ReliableStreamConnection::ProcessQueue()
+void EQ::Net::DaybreakConnection::ProcessQueue()
 {
 	for (int i = 0; i < 4; ++i) {
 		auto stream = &m_streams[i];
@@ -522,7 +521,7 @@ void EQ::Net::ReliableStreamConnection::ProcessQueue()
 	}
 }
 
-void EQ::Net::ReliableStreamConnection::RemoveFromQueue(int stream, uint16_t seq)
+void EQ::Net::DaybreakConnection::RemoveFromQueue(int stream, uint16_t seq)
 {
 	auto s = &m_streams[stream];
 	auto iter = s->packet_queue.find(seq);
@@ -533,7 +532,7 @@ void EQ::Net::ReliableStreamConnection::RemoveFromQueue(int stream, uint16_t seq
 	}
 }
 
-void EQ::Net::ReliableStreamConnection::AddToQueue(int stream, uint16_t seq, const Packet &p)
+void EQ::Net::DaybreakConnection::AddToQueue(int stream, uint16_t seq, const Packet &p)
 {
 	auto s = &m_streams[stream];
 	auto iter = s->packet_queue.find(seq);
@@ -545,7 +544,7 @@ void EQ::Net::ReliableStreamConnection::AddToQueue(int stream, uint16_t seq, con
 	}
 }
 
-void EQ::Net::ReliableStreamConnection::ProcessDecodedPacket(const Packet &p)
+void EQ::Net::DaybreakConnection::ProcessDecodedPacket(const Packet &p)
 {
 	if (p.GetInt8(0) == 0) {
 		if (p.Length() < 2) {
@@ -629,13 +628,13 @@ void EQ::Net::ReliableStreamConnection::ProcessDecodedPacket(const Packet &p)
 			case OP_SessionRequest:
 			{
 				if (m_status == StatusConnected) {
-					auto request = p.GetSerialize<ReliableStreamConnect>(0);
+					auto request = p.GetSerialize<DaybreakConnect>(0);
 
 					if (NetworkToHost(request.connect_code) != m_connect_code) {
 						return;
 					}
 
-					ReliableStreamConnectReply reply;
+					DaybreakConnectReply reply;
 					reply.zero = 0;
 					reply.opcode = OP_SessionResponse;
 					reply.connect_code = HostToNetwork(m_connect_code);
@@ -657,13 +656,13 @@ void EQ::Net::ReliableStreamConnection::ProcessDecodedPacket(const Packet &p)
 			case OP_SessionResponse:
 			{
 				if (m_status == StatusConnecting) {
-					auto reply = p.GetSerialize<ReliableStreamConnectReply>(0);
+					auto reply = p.GetSerialize<DaybreakConnectReply>(0);
 
 					if (m_connect_code == reply.connect_code) {
 						m_encode_key = reply.encode_key;
 						m_crc_bytes = reply.crc_bytes;
-						m_encode_passes[0] = (ReliableStreamEncodeType)reply.encode_pass1;
+						m_encode_passes[0] = (DaybreakEncodeType)reply.encode_pass1;
-						m_encode_passes[1] = (ReliableStreamEncodeType)reply.encode_pass2;
+						m_encode_passes[1] = (DaybreakEncodeType)reply.encode_pass2;
 						m_max_packet_size = reply.max_packet_size;
 						ChangeStatus(StatusConnected);
 
@@ -687,7 +686,7 @@ void EQ::Net::ReliableStreamConnection::ProcessDecodedPacket(const Packet &p)
 					return;
 				}
 
-				auto header = p.GetSerialize<ReliableStreamReliableHeader>(0);
+				auto header = p.GetSerialize<DaybreakReliableHeader>(0);
 				auto sequence = NetworkToHost(header.sequence);
 				auto stream_id = header.opcode - OP_Packet;
 				auto stream = &m_streams[stream_id];
@@ -704,7 +703,7 @@ void EQ::Net::ReliableStreamConnection::ProcessDecodedPacket(const Packet &p)
 					RemoveFromQueue(stream_id, sequence);
 					SendAck(stream_id, stream->sequence_in);
 					stream->sequence_in++;
-					StaticPacket next((char*)p.Data() + ReliableStreamReliableHeader::size(), p.Length() - ReliableStreamReliableHeader::size());
+					StaticPacket next((char*)p.Data() + DaybreakReliableHeader::size(), p.Length() - DaybreakReliableHeader::size());
 					ProcessDecodedPacket(next);
 				}
 
@@ -716,7 +715,7 @@ void EQ::Net::ReliableStreamConnection::ProcessDecodedPacket(const Packet &p)
 			case OP_Fragment3:
 			case OP_Fragment4:
 			{
-				auto header = p.GetSerialize<ReliableStreamReliableHeader>(0);
+				auto header = p.GetSerialize<DaybreakReliableHeader>(0);
 				auto sequence = NetworkToHost(header.sequence);
 				auto stream_id = header.opcode - OP_Fragment;
 				auto stream = &m_streams[stream_id];
@@ -736,22 +735,22 @@ void EQ::Net::ReliableStreamConnection::ProcessDecodedPacket(const Packet &p)
 					stream->sequence_in++;
 
 					if (stream->fragment_total_bytes == 0) {
-						auto fragheader = p.GetSerialize<ReliableStreamReliableFragmentHeader>(0);
+						auto fragheader = p.GetSerialize<DaybreakReliableFragmentHeader>(0);
 						stream->fragment_total_bytes = NetworkToHost(fragheader.total_size);
 						stream->fragment_current_bytes = 0;
 						stream->fragment_packet.Reserve(stream->fragment_total_bytes);
 						stream->fragment_packet.PutData(
 							stream->fragment_current_bytes,
-							(char*)p.Data() + ReliableStreamReliableFragmentHeader::size(), p.Length() - ReliableStreamReliableFragmentHeader::size());
+							(char*)p.Data() + DaybreakReliableFragmentHeader::size(), p.Length() - DaybreakReliableFragmentHeader::size());
 
-						stream->fragment_current_bytes += (uint32_t)(p.Length() - ReliableStreamReliableFragmentHeader::size());
+						stream->fragment_current_bytes += (uint32_t)(p.Length() - DaybreakReliableFragmentHeader::size());
 					}
 					else {
 						stream->fragment_packet.PutData(
 							stream->fragment_current_bytes,
-							(char*)p.Data() + ReliableStreamReliableHeader::size(), p.Length() - ReliableStreamReliableHeader::size());
+							(char*)p.Data() + DaybreakReliableHeader::size(), p.Length() - DaybreakReliableHeader::size());
 
-						stream->fragment_current_bytes += (uint32_t)(p.Length() - ReliableStreamReliableHeader::size());
+						stream->fragment_current_bytes += (uint32_t)(p.Length() - DaybreakReliableHeader::size());
 
 						if (stream->fragment_current_bytes >= stream->fragment_total_bytes) {
 							ProcessDecodedPacket(stream->fragment_packet);
@@ -770,7 +769,7 @@ void EQ::Net::ReliableStreamConnection::ProcessDecodedPacket(const Packet &p)
 			case OP_Ack3:
 			case OP_Ack4:
 			{
-				auto header = p.GetSerialize<ReliableStreamReliableHeader>(0);
+				auto header = p.GetSerialize<DaybreakReliableHeader>(0);
 				auto sequence = NetworkToHost(header.sequence);
 				auto stream_id = header.opcode - OP_Ack;
 				Ack(stream_id, sequence);
@@ -782,7 +781,7 @@ void EQ::Net::ReliableStreamConnection::ProcessDecodedPacket(const Packet &p)
 			case OP_OutOfOrderAck3:
 			case OP_OutOfOrderAck4:
 			{
-				auto header = p.GetSerialize<ReliableStreamReliableHeader>(0);
+				auto header = p.GetSerialize<DaybreakReliableHeader>(0);
 				auto sequence = NetworkToHost(header.sequence);
 				auto stream_id = header.opcode - OP_OutOfOrderAck;
 				OutOfOrderAck(stream_id, sequence);
@@ -816,13 +815,13 @@ void EQ::Net::ReliableStreamConnection::ProcessDecodedPacket(const Packet &p)
 			}
 			case OP_SessionStatRequest:
 			{
-				auto request = p.GetSerialize<ReliableStreamSessionStatRequest>(0);
+				auto request = p.GetSerialize<DaybreakSessionStatRequest>(0);
 				m_stats.sync_remote_sent_packets = EQ::Net::NetworkToHost(request.packets_sent);
 				m_stats.sync_remote_recv_packets = EQ::Net::NetworkToHost(request.packets_recv);
 				m_stats.sync_sent_packets = m_stats.sent_packets;
 				m_stats.sync_recv_packets = m_stats.recv_packets;
 
-				ReliableStreamSessionStatResponse response;
+				DaybreakSessionStatResponse response;
 				response.zero = 0;
 				response.opcode = OP_SessionStatResponse;
 				response.timestamp = request.timestamp;
@@ -837,7 +836,7 @@ void EQ::Net::ReliableStreamConnection::ProcessDecodedPacket(const Packet &p)
 				break;
 			}
 			case OP_SessionStatResponse: {
-				auto response = p.GetSerialize<ReliableStreamSessionStatResponse>(0);
+				auto response = p.GetSerialize<DaybreakSessionStatResponse>(0);
 				m_stats.sync_remote_sent_packets = EQ::Net::NetworkToHost(response.server_sent);
 				m_stats.sync_remote_recv_packets = EQ::Net::NetworkToHost(response.server_recv);
 				m_stats.sync_sent_packets = m_stats.sent_packets;
@@ -859,7 +858,7 @@ void EQ::Net::ReliableStreamConnection::ProcessDecodedPacket(const Packet &p)
 	}
 }
 
-bool EQ::Net::ReliableStreamConnection::ValidateCRC(Packet &p)
+bool EQ::Net::DaybreakConnection::ValidateCRC(Packet &p)
 {
 	if (m_crc_bytes == 0U) {
 		return true;
@@ -893,7 +892,7 @@ bool EQ::Net::ReliableStreamConnection::ValidateCRC(Packet &p)
 	return false;
 }
 
-void EQ::Net::ReliableStreamConnection::AppendCRC(Packet &p)
+void EQ::Net::DaybreakConnection::AppendCRC(Packet &p)
 {
 	if (m_crc_bytes == 0U) {
 		return;
@@ -912,7 +911,7 @@ void EQ::Net::ReliableStreamConnection::AppendCRC(Packet &p)
 	}
 }
 
-void EQ::Net::ReliableStreamConnection::ChangeStatus(DbProtocolStatus new_status)
+void EQ::Net::DaybreakConnection::ChangeStatus(DbProtocolStatus new_status)
 {
 	if (m_owner->m_on_connection_state_change) {
 		if (auto self = m_self.lock()) {
@@ -923,7 +922,7 @@ void EQ::Net::ReliableStreamConnection::ChangeStatus(DbProtocolStatus new_status
 	m_status = new_status;
 }
 
-bool EQ::Net::ReliableStreamConnection::PacketCanBeEncoded(Packet &p) const
+bool EQ::Net::DaybreakConnection::PacketCanBeEncoded(Packet &p) const
 {
 	if (p.Length() < 2) {
 		return false;
@@ -942,7 +941,7 @@ bool EQ::Net::ReliableStreamConnection::PacketCanBeEncoded(Packet &p) const
 	return true;
 }
 
-void EQ::Net::ReliableStreamConnection::Decode(Packet &p, size_t offset, size_t length)
+void EQ::Net::DaybreakConnection::Decode(Packet &p, size_t offset, size_t length)
 {
 	int key = m_encode_key;
 	char *buffer = (char*)p.Data() + offset;
@@ -962,7 +961,7 @@ void EQ::Net::ReliableStreamConnection::Decode(Packet &p, size_t offset, size_t
 	}
 }
 
-void EQ::Net::ReliableStreamConnection::Encode(Packet &p, size_t offset, size_t length)
+void EQ::Net::DaybreakConnection::Encode(Packet &p, size_t offset, size_t length)
 {
 	int key = m_encode_key;
 	char *buffer = (char*)p.Data() + offset;
@@ -1051,7 +1050,7 @@ uint32_t Deflate(const uint8_t* in, uint32_t in_len, uint8_t* out, uint32_t out_
 	}
 }
 
-void EQ::Net::ReliableStreamConnection::Decompress(Packet &p, size_t offset, size_t length)
+void EQ::Net::DaybreakConnection::Decompress(Packet &p, size_t offset, size_t length)
 {
 	if (length < 2) {
 		return;
@@ -1076,7 +1075,7 @@ void EQ::Net::ReliableStreamConnection::Decompress(Packet &p, size_t offset, siz
 	p.PutData(offset, new_buffer, new_length);
 }
 
-void EQ::Net::ReliableStreamConnection::Compress(Packet &p, size_t offset, size_t length)
+void EQ::Net::DaybreakConnection::Compress(Packet &p, size_t offset, size_t length)
 {
 	static thread_local uint8_t new_buffer[2048] = { 0 };
 	uint8_t *buffer = (uint8_t*)p.Data() + offset;
@@ -1098,14 +1097,14 @@ void EQ::Net::ReliableStreamConnection::Compress(Packet &p, size_t offset, size_
 	p.PutData(offset, new_buffer, new_length);
 }
 
-void EQ::Net::ReliableStreamConnection::ProcessResend()
+void EQ::Net::DaybreakConnection::ProcessResend()
 {
 	for (int i = 0; i < 4; ++i) {
 		ProcessResend(i);
 	}
 }
 
-void EQ::Net::ReliableStreamConnection::ProcessResend(int stream)
+void EQ::Net::DaybreakConnection::ProcessResend(int stream)
 {
 	if (m_status == DbProtocolStatus::StatusDisconnected) {
 		return;
@@ -1128,37 +1127,16 @@ void EQ::Net::ReliableStreamConnection::ProcessResend(int stream)
 		auto time_since_first_sent = std::chrono::duration_cast<std::chrono::milliseconds>(now - first_packet.first_sent).count();
 
 		if (time_since_first_sent >= m_owner->m_options.resend_timeout) {
-			auto now_ms = std::chrono::duration_cast<std::chrono::milliseconds>(now.time_since_epoch()).count();
-			auto first_sent_ms = std::chrono::duration_cast<std::chrono::milliseconds>(first_packet.first_sent.time_since_epoch()).count();
-			LogNetClient(
-				"Closing connection for m_endpoint [{}] m_port [{}] time_since_first_sent [{}] >= m_owner->m_options.resend_timeout [{}] now [{}] first_packet.first_sent [{}]",
-				m_endpoint,
-				m_port,
-				time_since_first_sent,
-				m_owner->m_options.resend_timeout,
-				now_ms,
-				first_sent_ms
-			);
 			Close();
 			return;
 		}
 
-		if (m_last_ack - now > std::chrono::milliseconds(1000)) {
-			LogNetClient(
-				"Resetting m_acked_since_last_resend flag for m_endpoint [{}] m_port [{}]",
-				m_endpoint,
-				m_port
-			);
-			m_acked_since_last_resend = true;
-		}
-
 		// make sure that the first_packet in the list first_sent time is within the resend_delay and now
 		// if it is not, then we need to resend all packets in the list
 		if (time_since_first_sent <= first_packet.resend_delay && !m_acked_since_last_resend) {
-			LogNetClientDetail(
+			LogNetClient(
-				"Not resending packets for m_endpoint [{}] m_port [{}] packets [{}] time_first_sent [{}] resend_delay [{}] m_acked_since_last_resend [{}]",
+				"Not resending packets for stream [{}] packets [{}] time_first_sent [{}] resend_delay [{}] m_acked_since_last_resend [{}]",
-				m_endpoint,
+				stream,
-				m_port,
 				s->sent_packets.size(),
 				time_since_first_sent,
 				first_packet.resend_delay,
@@ -1168,16 +1146,15 @@ void EQ::Net::ReliableStreamConnection::ProcessResend(int stream)
 		}
 	}
 
-	if (EQEmuLogSys::Instance()->IsLogEnabled(Logs::General, Logs::NetClient)) {
+	if (LogSys.IsLogEnabled(Logs::Detail, Logs::Netcode)) {
 		size_t    total_size = 0;
 		for (auto &e: s->sent_packets) {
 			total_size += e.second.packet.Length();
 		}
 
-		LogNetClientDetail(
+		LogNetClient(
-			"Resending packets for m_endpoint [{}] m_port [{}] packet count [{}] total packet size [{}] m_acked_since_last_resend [{}]",
+			"Resending packets for stream [{}] packet count [{}] total packet size [{}] m_acked_since_last_resend [{}]",
-			m_endpoint,
+			stream,
-			m_port,
 			s->sent_packets.size(),
 			total_size,
 			m_acked_since_last_resend
@@ -1188,12 +1165,9 @@ void EQ::Net::ReliableStreamConnection::ProcessResend(int stream)
 		if (m_resend_packets_sent >= MAX_CLIENT_RECV_PACKETS_PER_WINDOW ||
 			m_resend_bytes_sent >= MAX_CLIENT_RECV_BYTES_PER_WINDOW) {
 			LogNetClient(
-				"Stopping resend because we hit thresholds for m_endpoint [{}] m_port [{}]  m_resend_packets_sent [{}] max [{}] in_queue [{}] m_resend_bytes_sent [{}] max [{}]",
+				"Stopping resend because we hit thresholds m_resend_packets_sent [{}] max [{}] m_resend_bytes_sent [{}] max [{}]",
-				m_endpoint,
-				m_port,
 				m_resend_packets_sent,
 				MAX_CLIENT_RECV_PACKETS_PER_WINDOW,
-				s->sent_packets.size(),
 				m_resend_bytes_sent,
 				MAX_CLIENT_RECV_BYTES_PER_WINDOW
 			);
@@ -1202,7 +1176,7 @@ void EQ::Net::ReliableStreamConnection::ProcessResend(int stream)
 
 		auto &sp = e.second;
 		auto &p  = sp.packet;
-		if (p.Length() >= ReliableStreamHeader::size()) {
+		if (p.Length() >= DaybreakHeader::size()) {
 			if (p.GetInt8(0) == 0 && p.GetInt8(1) >= OP_Fragment && p.GetInt8(1) <= OP_Fragment4) {
 				m_stats.resent_fragments++;
 			}
@@ -1230,11 +1204,11 @@ void EQ::Net::ReliableStreamConnection::ProcessResend(int stream)
 	}
 
 	m_acked_since_last_resend = false;
-	m_last_ack = now;
 }
 
-void EQ::Net::ReliableStreamConnection::Ack(int stream, uint16_t seq)
+void EQ::Net::DaybreakConnection::Ack(int stream, uint16_t seq)
 {
+
 	auto now = Clock::now();
 	auto s = &m_streams[stream];
 	auto iter = s->sent_packets.begin();
@@ -1250,17 +1224,15 @@ void EQ::Net::ReliableStreamConnection::Ack(int stream, uint16_t seq)
 			m_rolling_ping = (m_rolling_ping * 2 + round_time) / 3;
 
 			iter = s->sent_packets.erase(iter);
+			m_acked_since_last_resend = true;
 		}
 		else {
 			++iter;
 		}
 	}
-
-	m_acked_since_last_resend = true;
-	m_last_ack = now;
 }
 
-void EQ::Net::ReliableStreamConnection::OutOfOrderAck(int stream, uint16_t seq)
+void EQ::Net::DaybreakConnection::OutOfOrderAck(int stream, uint16_t seq)
 {
 	auto now = Clock::now();
 	auto s = &m_streams[stream];
@@ -1275,20 +1247,17 @@ void EQ::Net::ReliableStreamConnection::OutOfOrderAck(int stream, uint16_t seq)
 
 		s->sent_packets.erase(iter);
 	}
-
-	m_acked_since_last_resend = true;
-	m_last_ack = now;
 }
 
-void EQ::Net::ReliableStreamConnection::UpdateDataBudget(double budget_add)
+void EQ::Net::DaybreakConnection::UpdateDataBudget(double budget_add)
 {
 	auto outgoing_data_rate = m_owner->m_options.outgoing_data_rate;
 	m_outgoing_budget = EQ::ClampUpper(m_outgoing_budget + budget_add, outgoing_data_rate);
 }
 
-void EQ::Net::ReliableStreamConnection::SendAck(int stream_id, uint16_t seq)
+void EQ::Net::DaybreakConnection::SendAck(int stream_id, uint16_t seq)
 {
-	ReliableStreamReliableHeader ack;
+	DaybreakReliableHeader ack;
 	ack.zero = 0;
 	ack.opcode = OP_Ack + stream_id;
 	ack.sequence = HostToNetwork(seq);
@@ -1299,9 +1268,9 @@ void EQ::Net::ReliableStreamConnection::SendAck(int stream_id, uint16_t seq)
 	InternalBufferedSend(p);
 }
 
-void EQ::Net::ReliableStreamConnection::SendOutOfOrderAck(int stream_id, uint16_t seq)
+void EQ::Net::DaybreakConnection::SendOutOfOrderAck(int stream_id, uint16_t seq)
 {
-	ReliableStreamReliableHeader ack;
+	DaybreakReliableHeader ack;
 	ack.zero = 0;
 	ack.opcode = OP_OutOfOrderAck + stream_id;
 	ack.sequence = HostToNetwork(seq);
@@ -1312,9 +1281,9 @@ void EQ::Net::ReliableStreamConnection::SendOutOfOrderAck(int stream_id, uint16_
 	InternalBufferedSend(p);
 }
 
-void EQ::Net::ReliableStreamConnection::SendDisconnect()
+void EQ::Net::DaybreakConnection::SendDisconnect()
 {
-	ReliableStreamDisconnect disconnect;
+	DaybreakDisconnect disconnect;
 	disconnect.zero = 0;
 	disconnect.opcode = OP_SessionDisconnect;
 	disconnect.connect_code = HostToNetwork(m_connect_code);
@@ -1323,7 +1292,7 @@ void EQ::Net::ReliableStreamConnection::SendDisconnect()
 	InternalSend(out);
 }
 
-void EQ::Net::ReliableStreamConnection::InternalBufferedSend(Packet &p)
+void EQ::Net::DaybreakConnection::InternalBufferedSend(Packet &p)
 {
 	if (p.Length() > 0xFFU) {
 		FlushBuffer();
@@ -1332,7 +1301,7 @@ void EQ::Net::ReliableStreamConnection::InternalBufferedSend(Packet &p)
 	}
 
 	//we could add this packet to a combined
-	size_t raw_size = ReliableStreamHeader::size() + (size_t)m_crc_bytes + m_buffered_packets_length + m_buffered_packets.size() + 1 + p.Length();
+	size_t raw_size = DaybreakHeader::size() + (size_t)m_crc_bytes + m_buffered_packets_length + m_buffered_packets.size() + 1 + p.Length();
 	if (raw_size > m_max_packet_size) {
 		FlushBuffer();
 	}
@@ -1347,9 +1316,9 @@ void EQ::Net::ReliableStreamConnection::InternalBufferedSend(Packet &p)
 	}
 }
 
-void EQ::Net::ReliableStreamConnection::SendConnect()
+void EQ::Net::DaybreakConnection::SendConnect()
 {
-	ReliableStreamConnect connect;
+	DaybreakConnect connect;
 	connect.zero = 0;
 	connect.opcode = OP_SessionRequest;
 	connect.protocol_version = HostToNetwork(3U);
@@ -1362,9 +1331,9 @@ void EQ::Net::ReliableStreamConnection::SendConnect()
 	InternalSend(p);
 }
 
-void EQ::Net::ReliableStreamConnection::SendKeepAlive()
+void EQ::Net::DaybreakConnection::SendKeepAlive()
 {
-	ReliableStreamHeader keep_alive;
+	DaybreakHeader keep_alive;
 	keep_alive.zero = 0;
 	keep_alive.opcode = OP_KeepAlive;
 
@@ -1374,7 +1343,7 @@ void EQ::Net::ReliableStreamConnection::SendKeepAlive()
 	InternalSend(p);
 }
 
-void EQ::Net::ReliableStreamConnection::InternalSend(Packet &p) {
+void EQ::Net::DaybreakConnection::InternalSend(Packet &p) {
 	if (m_owner->m_options.outgoing_data_rate > 0.0) {
 		auto new_budget = m_outgoing_budget - (p.Length() / 1024.0);
 		if (new_budget <= 0.0) {
@@ -1410,14 +1379,14 @@ void EQ::Net::ReliableStreamConnection::InternalSend(Packet &p) {
 			switch (m_encode_passe) {
 				case EncodeCompression:
 					if (out.GetInt8(0) == 0) {
-						Compress(out, ReliableStreamHeader::size(), out.Length() - ReliableStreamHeader::size());
+						Compress(out, DaybreakHeader::size(), out.Length() - DaybreakHeader::size());
 					} else {
 						Compress(out, 1, out.Length() - 1);
 					}
 					break;
 				case EncodeXOR:
 					if (out.GetInt8(0) == 0) {
-						Encode(out, ReliableStreamHeader::size(), out.Length() - ReliableStreamHeader::size());
+						Encode(out, DaybreakHeader::size(), out.Length() - DaybreakHeader::size());
 					} else {
 						Encode(out, 1, out.Length() - 1);
 					}
@@ -1467,7 +1436,7 @@ void EQ::Net::ReliableStreamConnection::InternalSend(Packet &p) {
 	}
 }
 
-void EQ::Net::ReliableStreamConnection::InternalQueuePacket(Packet &p, int stream_id, bool reliable)
+void EQ::Net::DaybreakConnection::InternalQueuePacket(Packet &p, int stream_id, bool reliable)
 {
 	if (!reliable) {
 		auto max_raw_size = 0xFFU - m_crc_bytes;
@@ -1481,23 +1450,23 @@ void EQ::Net::ReliableStreamConnection::InternalQueuePacket(Packet &p, int strea
 	}
 
 	auto stream = &m_streams[stream_id];
-	auto max_raw_size = m_max_packet_size - m_crc_bytes - ReliableStreamReliableHeader::size() - 1; // -1 for compress flag
+	auto max_raw_size = m_max_packet_size - m_crc_bytes - DaybreakReliableHeader::size() - 1; // -1 for compress flag
 	size_t length = p.Length();
 	if (length > max_raw_size) {
-		ReliableStreamReliableFragmentHeader first_header;
+		DaybreakReliableFragmentHeader first_header;
 		first_header.reliable.zero = 0;
 		first_header.reliable.opcode = OP_Fragment + stream_id;
 		first_header.reliable.sequence = HostToNetwork(stream->sequence_out);
 		first_header.total_size = (uint32_t)HostToNetwork((uint32_t)length);
 
 		size_t used = 0;
-		size_t sublen = m_max_packet_size - m_crc_bytes - ReliableStreamReliableFragmentHeader::size() - 1; // -1 for compress flag
+		size_t sublen = m_max_packet_size - m_crc_bytes - DaybreakReliableFragmentHeader::size() - 1; // -1 for compress flag
 		DynamicPacket first_packet;
 		first_packet.PutSerialize(0, first_header);
-		first_packet.PutData(ReliableStreamReliableFragmentHeader::size(), (char*)p.Data() + used, sublen);
+		first_packet.PutData(DaybreakReliableFragmentHeader::size(), (char*)p.Data() + used, sublen);
 		used += sublen;
 
-		ReliableStreamSentPacket sent;
+		DaybreakSentPacket sent;
 		sent.packet.PutPacket(0, first_packet);
 		sent.last_sent = Clock::now();
 		sent.first_sent = Clock::now();
@@ -1514,22 +1483,22 @@ void EQ::Net::ReliableStreamConnection::InternalQueuePacket(Packet &p, int strea
 		while (used < length) {
 			auto left = length - used;
 			DynamicPacket packet;
-			ReliableStreamReliableHeader header;
+			DaybreakReliableHeader header;
 			header.zero = 0;
 			header.opcode = OP_Fragment + stream_id;
 			header.sequence = HostToNetwork(stream->sequence_out);
 			packet.PutSerialize(0, header);
 
 			if (left > max_raw_size) {
-				packet.PutData(ReliableStreamReliableHeader::size(), (char*)p.Data() + used, max_raw_size);
+				packet.PutData(DaybreakReliableHeader::size(), (char*)p.Data() + used, max_raw_size);
 				used += max_raw_size;
 			}
 			else {
-				packet.PutData(ReliableStreamReliableHeader::size(), (char*)p.Data() + used, left);
+				packet.PutData(DaybreakReliableHeader::size(), (char*)p.Data() + used, left);
 				used += left;
 			}
 
-			ReliableStreamSentPacket sent;
+			DaybreakSentPacket sent;
 			sent.packet.PutPacket(0, packet);
 			sent.last_sent = Clock::now();
 			sent.first_sent = Clock::now();
@@ -1546,14 +1515,14 @@ void EQ::Net::ReliableStreamConnection::InternalQueuePacket(Packet &p, int strea
 	}
 	else {
 		DynamicPacket packet;
-		ReliableStreamReliableHeader header;
+		DaybreakReliableHeader header;
 		header.zero = 0;
 		header.opcode = OP_Packet + stream_id;
 		header.sequence = HostToNetwork(stream->sequence_out);
 		packet.PutSerialize(0, header);
-		packet.PutPacket(ReliableStreamReliableHeader::size(), p);
+		packet.PutPacket(DaybreakReliableHeader::size(), p);
 
-		ReliableStreamSentPacket sent;
+		DaybreakSentPacket sent;
 		sent.packet.PutPacket(0, packet);
 		sent.last_sent = Clock::now();
 		sent.first_sent = Clock::now();
@@ -1569,7 +1538,7 @@ void EQ::Net::ReliableStreamConnection::InternalQueuePacket(Packet &p, int strea
 	}
 }
 
-void EQ::Net::ReliableStreamConnection::FlushBuffer()
+void EQ::Net::DaybreakConnection::FlushBuffer()
 {
 	if (m_buffered_packets.empty()) {
 		return;
@@ -1596,7 +1565,7 @@ void EQ::Net::ReliableStreamConnection::FlushBuffer()
 	m_buffered_packets_length = 0;
 }
 
-EQ::Net::SequenceOrder EQ::Net::ReliableStreamConnection::CompareSequence(uint16_t expected, uint16_t actual) const
+EQ::Net::SequenceOrder EQ::Net::DaybreakConnection::CompareSequence(uint16_t expected, uint16_t actual) const
 {
 	int diff = (int)actual - (int)expected;
 

common/net/daybreak_connection.h

@@ -2,8 +2,8 @@
 
 #include "../random.h"
 #include "packet.h"
-#include "reliable_stream_structs.h"
+#include "daybreak_structs.h"
-#include "reliable_stream_pooling.h"
+#include "daybreak_pooling.h"
 #include <uv.h>
 #include <chrono>
 #include <functional>
@@ -16,7 +16,7 @@ namespace EQ
 {
 	namespace Net
 	{
-		enum ReliableStreamProtocolOpcode
+		enum DaybreakProtocolOpcode
 		{
 			OP_Padding = 0x00,
 			OP_SessionRequest = 0x01,
@@ -55,7 +55,7 @@ namespace EQ
 			StatusDisconnected
 		};
 
-		enum ReliableStreamEncodeType
+		enum DaybreakEncodeType
 		{
 			EncodeNone = 0,
 			EncodeCompression = 1,
@@ -72,9 +72,9 @@ namespace EQ
 		typedef std::chrono::steady_clock::time_point Timestamp;
 		typedef std::chrono::steady_clock Clock;
 
-		struct ReliableStreamConnectionStats
+		struct DaybreakConnectionStats
 		{
-			ReliableStreamConnectionStats() {
+			DaybreakConnectionStats() {
 				recv_bytes = 0;
 				sent_bytes = 0;
 				recv_packets = 0;
@@ -134,14 +134,14 @@ namespace EQ
 			uint64_t bytes_before_encode;
 		};
 
-		class ReliableStreamConnectionManager;
+		class DaybreakConnectionManager;
-		class ReliableStreamConnection;
+		class DaybreakConnection;
-		class ReliableStreamConnection
+		class DaybreakConnection
 		{
 		public:
-			ReliableStreamConnection(ReliableStreamConnectionManager *owner, const ReliableStreamConnect &connect, const std::string &endpoint, int port);
+			DaybreakConnection(DaybreakConnectionManager *owner, const DaybreakConnect &connect, const std::string &endpoint, int port);
-			ReliableStreamConnection(ReliableStreamConnectionManager *owner, const std::string &endpoint, int port);
+			DaybreakConnection(DaybreakConnectionManager *owner, const std::string &endpoint, int port);
-			~ReliableStreamConnection();
+			~DaybreakConnection();
 
 			const std::string& RemoteEndpoint() const { return m_endpoint; }
 			int RemotePort() const { return m_port; }
@@ -151,23 +151,23 @@ namespace EQ
 			void QueuePacket(Packet &p, int stream);
 			void QueuePacket(Packet &p, int stream, bool reliable);
 
-			ReliableStreamConnectionStats GetStats();
+			DaybreakConnectionStats GetStats();
 			void ResetStats();
 			size_t GetRollingPing() const { return m_rolling_ping; }
 			DbProtocolStatus GetStatus() const { return m_status; }
 
-			const ReliableStreamEncodeType* GetEncodePasses() const { return m_encode_passes; }
+			const DaybreakEncodeType* GetEncodePasses() const { return m_encode_passes; }
-			const ReliableStreamConnectionManager* GetManager() const { return m_owner; }
+			const DaybreakConnectionManager* GetManager() const { return m_owner; }
-			ReliableStreamConnectionManager* GetManager() { return m_owner; }
+			DaybreakConnectionManager* GetManager() { return m_owner; }
 		private:
-			ReliableStreamConnectionManager *m_owner;
+			DaybreakConnectionManager *m_owner;
 			std::string m_endpoint;
 			int m_port;
 			uint32_t m_connect_code;
 			uint32_t m_encode_key;
 			uint32_t m_max_packet_size;
 			uint32_t m_crc_bytes;
-			ReliableStreamEncodeType m_encode_passes[2];
+			DaybreakEncodeType m_encode_passes[2];
 
 			Timestamp m_last_send;
 			Timestamp m_last_recv;
@@ -176,7 +176,7 @@ namespace EQ
 			std::list<DynamicPacket> m_buffered_packets;
 			size_t m_buffered_packets_length;
 			std::unique_ptr<char[]> m_combined;
-			ReliableStreamConnectionStats m_stats;
+			DaybreakConnectionStats m_stats;
 			Timestamp m_last_session_stats;
 			size_t m_rolling_ping;
 			Timestamp m_close_time;
@@ -186,9 +186,8 @@ namespace EQ
 			size_t m_resend_packets_sent = 0;
 			size_t m_resend_bytes_sent = 0;
 			bool m_acked_since_last_resend = false;
-			Timestamp m_last_ack;
 
-			struct ReliableStreamSentPacket
+			struct DaybreakSentPacket
 			{
 				DynamicPacket packet;
 				Timestamp last_sent;
@@ -197,9 +196,9 @@ namespace EQ
 				size_t resend_delay;
 			};
 
-			struct ReliableStream
+			struct DaybreakStream
 			{
-				ReliableStream() {
+				DaybreakStream() {
 					sequence_in = 0;
 					sequence_out = 0;
 					fragment_current_bytes = 0;
@@ -214,11 +213,11 @@ namespace EQ
 				uint32_t fragment_current_bytes;
 				uint32_t fragment_total_bytes;
 
-				std::map<uint16_t, ReliableStreamSentPacket> sent_packets;
+				std::map<uint16_t, DaybreakSentPacket> sent_packets;
 			};
 
-			ReliableStream m_streams[4];
+			DaybreakStream m_streams[4];
-			std::weak_ptr<ReliableStreamConnection> m_self;
+			std::weak_ptr<DaybreakConnection> m_self;
 
 			void Process();
 			void ProcessPacket(Packet &p);
@@ -251,12 +250,12 @@ namespace EQ
 			void FlushBuffer();
 			SequenceOrder CompareSequence(uint16_t expected, uint16_t actual) const;
 
-			friend class ReliableStreamConnectionManager;
+			friend class DaybreakConnectionManager;
 		};
 
-		struct ReliableStreamConnectionManagerOptions
+		struct DaybreakConnectionManagerOptions
 		{
-			ReliableStreamConnectionManagerOptions() {
+			DaybreakConnectionManagerOptions() {
 				max_connection_count = 0;
 				keepalive_delay_ms = 9000;
 				resend_delay_ms = 30;
@@ -268,8 +267,8 @@ namespace EQ
 				connect_stale_ms = 5000;
 				crc_length = 2;
 				max_packet_size = 512;
-				encode_passes[0] = ReliableStreamEncodeType::EncodeNone;
+				encode_passes[0] = DaybreakEncodeType::EncodeNone;
-				encode_passes[1] = ReliableStreamEncodeType::EncodeNone;
+				encode_passes[1] = DaybreakEncodeType::EncodeNone;
 				port = 0;
 				hold_size = 512;
 				hold_length_ms = 50;
@@ -299,28 +298,28 @@ namespace EQ
 			double tic_rate_hertz;
 			size_t resend_timeout;
 			size_t connection_close_time;
-			ReliableStreamEncodeType encode_passes[2];
+			DaybreakEncodeType encode_passes[2];
 			int port;
 			double outgoing_data_rate;
 		};
 
-		class ReliableStreamConnectionManager
+		class DaybreakConnectionManager
 		{
 		public:
-			ReliableStreamConnectionManager();
+			DaybreakConnectionManager();
-			ReliableStreamConnectionManager(const ReliableStreamConnectionManagerOptions &opts);
+			DaybreakConnectionManager(const DaybreakConnectionManagerOptions &opts);
-			~ReliableStreamConnectionManager();
+			~DaybreakConnectionManager();
 
 			void Connect(const std::string &addr, int port);
 			void Process();
 			void UpdateDataBudget();
 			void ProcessResend();
-			void OnNewConnection(std::function<void(std::shared_ptr<ReliableStreamConnection>)> func) { m_on_new_connection = func; }
+			void OnNewConnection(std::function<void(std::shared_ptr<DaybreakConnection>)> func) { m_on_new_connection = func; }
-			void OnConnectionStateChange(std::function<void(std::shared_ptr<ReliableStreamConnection>, DbProtocolStatus, DbProtocolStatus)> func) { m_on_connection_state_change = func; }
+			void OnConnectionStateChange(std::function<void(std::shared_ptr<DaybreakConnection>, DbProtocolStatus, DbProtocolStatus)> func) { m_on_connection_state_change = func; }
-			void OnPacketRecv(std::function<void(std::shared_ptr<ReliableStreamConnection>, const Packet &)> func) { m_on_packet_recv = func; }
+			void OnPacketRecv(std::function<void(std::shared_ptr<DaybreakConnection>, const Packet &)> func) { m_on_packet_recv = func; }
 			void OnErrorMessage(std::function<void(const std::string&)> func) { m_on_error_message = func; }
 
-			ReliableStreamConnectionManagerOptions& GetOptions() { return m_options; }
+			DaybreakConnectionManagerOptions& GetOptions() { return m_options; }
 		private:
 			void Attach(uv_loop_t *loop);
 			void Detach();
@@ -329,18 +328,18 @@ namespace EQ
 			uv_timer_t m_timer;
 			uv_udp_t m_socket;
 			uv_loop_t *m_attached;
-			ReliableStreamConnectionManagerOptions m_options;
+			DaybreakConnectionManagerOptions m_options;
-			std::function<void(std::shared_ptr<ReliableStreamConnection>)> m_on_new_connection;
+			std::function<void(std::shared_ptr<DaybreakConnection>)> m_on_new_connection;
-			std::function<void(std::shared_ptr<ReliableStreamConnection>, DbProtocolStatus, DbProtocolStatus)> m_on_connection_state_change;
+			std::function<void(std::shared_ptr<DaybreakConnection>, DbProtocolStatus, DbProtocolStatus)> m_on_connection_state_change;
-			std::function<void(std::shared_ptr<ReliableStreamConnection>, const Packet&)> m_on_packet_recv;
+			std::function<void(std::shared_ptr<DaybreakConnection>, const Packet&)> m_on_packet_recv;
 			std::function<void(const std::string&)> m_on_error_message;
-			std::map<std::pair<std::string, int>, std::shared_ptr<ReliableStreamConnection>> m_connections;
+			std::map<std::pair<std::string, int>, std::shared_ptr<DaybreakConnection>> m_connections;
 
 			void ProcessPacket(const std::string &endpoint, int port, const char *data, size_t size);
-			std::shared_ptr<ReliableStreamConnection> FindConnectionByEndpoint(std::string addr, int port);
+			std::shared_ptr<DaybreakConnection> FindConnectionByEndpoint(std::string addr, int port);
 			void SendDisconnect(const std::string &addr, int port);
 
-			friend class ReliableStreamConnection;
+			friend class DaybreakConnection;
 		};
 	}
 }

common/net/daybreak_structs.h

@@ -8,7 +8,7 @@ namespace EQ
 {
 	namespace Net
 	{
-		struct ReliableStreamHeader
+		struct DaybreakHeader
 		{
 			static size_t size() { return 2; }
 			uint8_t zero;
@@ -22,7 +22,7 @@ namespace EQ
 			}
 		};
 
-		struct ReliableStreamConnect
+		struct DaybreakConnect
 		{
 			static size_t size() { return 14; }
 			uint8_t zero;
@@ -42,7 +42,7 @@ namespace EQ
 			}
 		};
 
-		struct ReliableStreamConnectReply
+		struct DaybreakConnectReply
 		{
 			static size_t size() { return 17; }
 			uint8_t zero;
@@ -68,7 +68,7 @@ namespace EQ
 			}
 		};
 
-		struct ReliableStreamDisconnect
+		struct DaybreakDisconnect
 		{
 			static size_t size() { return 8; }
 			uint8_t zero;
@@ -84,7 +84,7 @@ namespace EQ
 			}
 		};
 
-		struct ReliableStreamReliableHeader
+		struct DaybreakReliableHeader
 		{
 			static size_t size() { return 4; }
 			uint8_t zero;
@@ -100,10 +100,10 @@ namespace EQ
 			}
 		};
 
-		struct ReliableStreamReliableFragmentHeader
+		struct DaybreakReliableFragmentHeader
 		{
-			static size_t size() { return 4 + ReliableStreamReliableHeader::size(); }
+			static size_t size() { return 4 + DaybreakReliableHeader::size(); }
-			ReliableStreamReliableHeader reliable;
+			DaybreakReliableHeader reliable;
 			uint32_t total_size;
 
 			template <class Archive>
@@ -114,7 +114,7 @@ namespace EQ
 			}
 		};
 
-		struct ReliableStreamSessionStatRequest
+		struct DaybreakSessionStatRequest
 		{
 			static size_t size() { return 40; }
 			uint8_t zero;
@@ -144,7 +144,7 @@ namespace EQ
 			}
 		};
 
-		struct ReliableStreamSessionStatResponse
+		struct DaybreakSessionStatResponse
 		{
 			static size_t size() { return 40; }
 			uint8_t zero;

common/net/eqstream.cpp

@@ -1,11 +1,11 @@
 #include "eqstream.h"
 #include "../eqemu_logsys.h"
 
-EQ::Net::EQStreamManager::EQStreamManager(const EQStreamManagerInterfaceOptions &options) : EQStreamManagerInterface(options), m_reliable_stream(options.reliable_stream_options)
+EQ::Net::EQStreamManager::EQStreamManager(const EQStreamManagerInterfaceOptions &options) : EQStreamManagerInterface(options), m_daybreak(options.daybreak_options)
 {
-	m_reliable_stream.OnNewConnection(std::bind(&EQStreamManager::ReliableStreamNewConnection, this, std::placeholders::_1));
+	m_daybreak.OnNewConnection(std::bind(&EQStreamManager::DaybreakNewConnection, this, std::placeholders::_1));
-	m_reliable_stream.OnConnectionStateChange(std::bind(&EQStreamManager::ReliableStreamConnectionStateChange, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3));
+	m_daybreak.OnConnectionStateChange(std::bind(&EQStreamManager::DaybreakConnectionStateChange, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3));
-	m_reliable_stream.OnPacketRecv(std::bind(&EQStreamManager::ReliableStreamPacketRecv, this, std::placeholders::_1, std::placeholders::_2));
+	m_daybreak.OnPacketRecv(std::bind(&EQStreamManager::DaybreakPacketRecv, this, std::placeholders::_1, std::placeholders::_2));
 }
 
 EQ::Net::EQStreamManager::~EQStreamManager()
@@ -15,11 +15,11 @@ EQ::Net::EQStreamManager::~EQStreamManager()
 void EQ::Net::EQStreamManager::SetOptions(const EQStreamManagerInterfaceOptions &options)
 {
 	m_options = options;
-	auto &opts = m_reliable_stream.GetOptions();
+	auto &opts = m_daybreak.GetOptions();
-	opts = options.reliable_stream_options;
+	opts = options.daybreak_options;
 }
 
-void EQ::Net::EQStreamManager::ReliableStreamNewConnection(std::shared_ptr<ReliableStreamConnection> connection)
+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));
@@ -28,7 +28,7 @@ void EQ::Net::EQStreamManager::ReliableStreamNewConnection(std::shared_ptr<Relia
 	}
 }
 
-void EQ::Net::EQStreamManager::ReliableStreamConnectionStateChange(std::shared_ptr<ReliableStreamConnection> connection, DbProtocolStatus from, DbProtocolStatus to)
+void EQ::Net::EQStreamManager::DaybreakConnectionStateChange(std::shared_ptr<DaybreakConnection> connection, DbProtocolStatus from, DbProtocolStatus to)
 {
 	auto iter = m_streams.find(connection);
 	if (iter != m_streams.end()) {
@@ -42,7 +42,7 @@ void EQ::Net::EQStreamManager::ReliableStreamConnectionStateChange(std::shared_p
 	}
 }
 
-void EQ::Net::EQStreamManager::ReliableStreamPacketRecv(std::shared_ptr<ReliableStreamConnection> connection, const Packet &p)
+void EQ::Net::EQStreamManager::DaybreakPacketRecv(std::shared_ptr<DaybreakConnection> connection, const Packet &p)
 {
 	auto iter = m_streams.find(connection);
 	if (iter != m_streams.end()) {
@@ -53,7 +53,7 @@ void EQ::Net::EQStreamManager::ReliableStreamPacketRecv(std::shared_ptr<Reliable
 	}
 }
 
-EQ::Net::EQStream::EQStream(EQStreamManagerInterface *owner, std::shared_ptr<ReliableStreamConnection> connection)
+EQ::Net::EQStream::EQStream(EQStreamManagerInterface *owner, std::shared_ptr<DaybreakConnection> connection)
 {
 	m_owner = owner;
 	m_connection = connection;
@@ -71,7 +71,7 @@ void EQ::Net::EQStream::QueuePacket(const EQApplicationPacket *p, bool ack_req)
 		OpcodeManager::EmuToName(p->GetOpcode()),
 		(*m_opcode_manager)->EmuToEQ(p->GetOpcode()),
 		p->Size(),
-		(EQEmuLogSys::Instance()->IsLogEnabled(Logs::Detail, Logs::PacketServerClient) ? DumpPacketToString(p) : "")
+		(LogSys.IsLogEnabled(Logs::Detail, Logs::PacketServerClient) ? DumpPacketToString(p) : "")
 	);
 
 	if (m_opcode_manager && *m_opcode_manager) {
@@ -235,7 +235,7 @@ EQStreamState EQ::Net::EQStream::GetState() {
 EQ::Net::EQStream::Stats EQ::Net::EQStream::GetStats() const
 {
 	Stats ret;
-	ret.ReliableStreamStats = m_connection->GetStats();
+	ret.DaybreakStats = m_connection->GetStats();
 
 	for (int i = 0; i < _maxEmuOpcode; ++i) {
 		ret.RecvCount[i] = 0;

common/net/eqstream.h

@@ -3,7 +3,7 @@
 #include "../eq_packet.h"
 #include "../eq_stream_intf.h"
 #include "../opcodemgr.h"
-#include "reliable_stream_connection.h"
+#include "daybreak_connection.h"
 #include <vector>
 #include <deque>
 #include <unordered_map>
@@ -23,21 +23,21 @@ namespace EQ
 			void OnNewConnection(std::function<void(std::shared_ptr<EQStream>)> func) { m_on_new_connection = func; }
 			void OnConnectionStateChange(std::function<void(std::shared_ptr<EQStream>, DbProtocolStatus, DbProtocolStatus)> func) { m_on_connection_state_change = func; }
 		private:
-			ReliableStreamConnectionManager m_reliable_stream;
+			DaybreakConnectionManager m_daybreak;
 			std::function<void(std::shared_ptr<EQStream>)> m_on_new_connection;
 			std::function<void(std::shared_ptr<EQStream>, DbProtocolStatus, DbProtocolStatus)> m_on_connection_state_change;
-			std::map<std::shared_ptr<ReliableStreamConnection>, std::shared_ptr<EQStream>> m_streams;
+			std::map<std::shared_ptr<DaybreakConnection>, std::shared_ptr<EQStream>> m_streams;
 
-			void ReliableStreamNewConnection(std::shared_ptr<ReliableStreamConnection> connection);
+			void DaybreakNewConnection(std::shared_ptr<DaybreakConnection> connection);
-			void ReliableStreamConnectionStateChange(std::shared_ptr<ReliableStreamConnection> connection, DbProtocolStatus from, DbProtocolStatus to);
+			void DaybreakConnectionStateChange(std::shared_ptr<DaybreakConnection> connection, DbProtocolStatus from, DbProtocolStatus to);
-			void ReliableStreamPacketRecv(std::shared_ptr<ReliableStreamConnection> connection, const Packet &p);
+			void DaybreakPacketRecv(std::shared_ptr<DaybreakConnection> connection, const Packet &p);
 			friend class EQStream;
 		};
 
 		class EQStream : public EQStreamInterface
 		{
 		public:
-			EQStream(EQStreamManagerInterface *parent, std::shared_ptr<ReliableStreamConnection> connection);
+			EQStream(EQStreamManagerInterface *parent, std::shared_ptr<DaybreakConnection> connection);
 			~EQStream();
 
 			virtual void QueuePacket(const EQApplicationPacket *p, bool ack_req = true);
@@ -67,7 +67,7 @@ namespace EQ
 			virtual EQStreamManagerInterface* GetManager() const;
 		private:
 			EQStreamManagerInterface *m_owner;
-			std::shared_ptr<ReliableStreamConnection> m_connection;
+			std::shared_ptr<DaybreakConnection> m_connection;
 			OpcodeManager **m_opcode_manager;
 			std::deque<std::unique_ptr<EQ::Net::Packet>> m_packet_queue;
 			std::unordered_map<int, int> m_packet_recv_count;

common/net/packet.cpp

@@ -2,7 +2,6 @@
 #include "endian.h"
 #include <cctype>
 #include <fmt/format.h>
-#include <fmt/ranges.h>
 
 void EQ::Net::Packet::PutInt8(size_t offset, int8_t value)
 {

common/net/servertalk_server_connection.cpp

@@ -319,7 +319,7 @@ void EQ::Net::ServertalkServerConnection::ProcessMessage(EQ::Net::Packet &p)
 			size_t message_len = length;
 			EQ::Net::StaticPacket packet(&data[0], message_len);
 
-			const auto is_detail_enabled = EQEmuLogSys::Instance()->IsLogEnabled(Logs::Detail, Logs::PacketServerToServer);
+			const auto is_detail_enabled = LogSys.IsLogEnabled(Logs::Detail, Logs::PacketServerToServer);
 			if (opcode != ServerOP_KeepAlive || is_detail_enabled) {
 				LogPacketServerToServer(
 					"[{:#06x}] Size [{}] {}",

common/net/websocket_server.cpp

@@ -2,7 +2,6 @@
 #include "../event/event_loop.h"
 #include "../event/timer.h"
 #include <fmt/format.h>
-#include <fmt/ranges.h>
 #include <map>
 #include <unordered_set>
 #include <array>

common/net/websocket_server_connection.cpp

@@ -4,7 +4,6 @@
 #include "../util/uuid.h"
 #include <sstream>
 #include <fmt/format.h>
-#include <fmt/ranges.h>
 
 struct EQ::Net::WebsocketServerConnection::Impl {
 	WebsocketServer *parent;

common/patches/rof.cpp

@@ -78,7 +78,7 @@ namespace RoF
 	{
 		//create our opcode manager if we havent already
 		if (opcodes == nullptr) {
-			std::string opfile = fmt::format("{}/patch_{}.conf", PathManager::Instance()->GetPatchPath(), name);
+			std::string opfile = fmt::format("{}/patch_{}.conf", path.GetPatchPath(), name);
 
 			//load up the opcode manager.
 			//TODO: figure out how to support shared memory with multiple patches...
@@ -117,7 +117,7 @@ namespace RoF
 		//we need to go to every stream and replace it's manager.
 
 		if (opcodes != nullptr) {
-			std::string opfile = fmt::format("{}/patch_{}.conf", PathManager::Instance()->GetPatchPath(), name);
+			std::string opfile = fmt::format("{}/patch_{}.conf", path.GetPatchPath(), name);
 			if (!opcodes->ReloadOpcodes(opfile.c_str())) {
 				LogNetcode("[OPCODES] Error reloading opcodes file [{}] for patch [{}]", opfile.c_str(), name);
 				return;

common/patches/rof2.cpp

@@ -81,7 +81,7 @@ namespace RoF2
 		//create our opcode manager if we havent already
 		if (opcodes == nullptr) {
 
-			std::string opfile = fmt::format("{}/patch_{}.conf", PathManager::Instance()->GetPatchPath(), name);
+			std::string opfile = fmt::format("{}/patch_{}.conf", path.GetPatchPath(), name);
 
 			//load up the opcode manager.
 			//TODO: figure out how to support shared memory with multiple patches...
@@ -123,7 +123,7 @@ namespace RoF2
 		//we need to go to every stream and replace it's manager.
 
 		if (opcodes != nullptr) {
-			std::string opfile = fmt::format("{}/patch_{}.conf", PathManager::Instance()->GetPatchPath(), name);
+			std::string opfile = fmt::format("{}/patch_{}.conf", path.GetPatchPath(), name);
 			if (!opcodes->ReloadOpcodes(opfile.c_str())) {
 				LogNetcode("[OPCODES] Error reloading opcodes file [{}] for patch [{}]", opfile.c_str(), name);
 				return;
@@ -6481,7 +6481,7 @@ namespace RoF2
 		hdr.scaled_value   = (inst->IsScaling() ? (inst->GetExp() / 100) : 0);
 		hdr.instance_id    = (inst->GetMerchantSlot() ? inst->GetMerchantSlot() : inst->GetSerialNumber());
 		hdr.parcel_item_id = packet_type == ItemPacketParcel ? inst->GetID() : 0;
-		if (item->EvolvingItem && packet_type != ItemPacketParcel && packet_type != ItemPacketMerchant) {
+		if (item->EvolvingItem) {
 			hdr.instance_id    = inst->GetEvolveUniqueID() & 0xFFFFFFFF; //lower dword
 			hdr.parcel_item_id = inst->GetEvolveUniqueID() >> 32;        //upper dword
 		}
@@ -6500,7 +6500,6 @@ namespace RoF2
 
 		if (item->EvolvingItem > 0) {
 			RoF2::structs::EvolvingItem_Struct evotop;
-			inst->CalculateEvolveProgression();
 
 			evotop.final_item_id    = inst->GetEvolveFinalItemID();
 			evotop.evolve_level     = item->EvolvingLevel;

common/patches/sod.cpp

@@ -72,7 +72,7 @@ namespace SoD
 	{
 		//create our opcode manager if we havent already
 		if (opcodes == nullptr) {
-			std::string opfile = fmt::format("{}/patch_{}.conf", PathManager::Instance()->GetPatchPath(), name);
+			std::string opfile = fmt::format("{}/patch_{}.conf", path.GetPatchPath(), name);
 			//load up the opcode manager.
 			//TODO: figure out how to support shared memory with multiple patches...
 			opcodes = new RegularOpcodeManager();
@@ -113,7 +113,7 @@ namespace SoD
 		//we need to go to every stream and replace it's manager.
 
 		if (opcodes != nullptr) {
-			std::string opfile = fmt::format("{}/patch_{}.conf", PathManager::Instance()->GetPatchPath(), name);
+			std::string opfile = fmt::format("{}/patch_{}.conf", path.GetPatchPath(), name);
 			if (!opcodes->ReloadOpcodes(opfile.c_str())) {
 				LogNetcode("[OPCODES] Error reloading opcodes file [{}] for patch [{}]", opfile.c_str(), name);
 				return;
@@ -3966,12 +3966,12 @@ namespace SoD
 			SoDSlot = serverSlot - 2;
 		}
 
-		else if (serverSlot <= EQ::invbag::GENERAL_BAGS_END && serverSlot >= EQ::invbag::GENERAL_BAGS_BEGIN) {
+		else if (serverSlot <= EQ::invbag::GENERAL_BAGS_8_END && serverSlot >= EQ::invbag::GENERAL_BAGS_BEGIN) {
-			SoDSlot = serverSlot - (EQ::invbag::GENERAL_BAGS_BEGIN - invbag::GENERAL_BAGS_BEGIN) - ((EQ::invbag::SLOT_COUNT - invbag::SLOT_COUNT) * ((serverSlot - EQ::invbag::GENERAL_BAGS_BEGIN) / EQ::invbag::SLOT_COUNT));;
+			SoDSlot = serverSlot + 11;
 		}
 
 		else if (serverSlot <= EQ::invbag::CURSOR_BAG_END && serverSlot >= EQ::invbag::CURSOR_BAG_BEGIN) {
-			SoDSlot = serverSlot - (EQ::invbag::CURSOR_BAG_BEGIN - invbag::CURSOR_BAG_BEGIN);
+			SoDSlot = serverSlot - 9;
 		}
 
 		else if (serverSlot <= EQ::invslot::TRIBUTE_END && serverSlot >= EQ::invslot::TRIBUTE_BEGIN) {
@@ -3991,7 +3991,7 @@ namespace SoD
 		}
 
 		else if (serverSlot <= EQ::invbag::BANK_BAGS_END && serverSlot >= EQ::invbag::BANK_BAGS_BEGIN) {
-			SoDSlot = serverSlot - (EQ::invbag::BANK_BAGS_BEGIN - invbag::BANK_BAGS_BEGIN) - ((EQ::invbag::SLOT_COUNT - invbag::SLOT_COUNT) * ((serverSlot - EQ::invbag::BANK_BAGS_BEGIN) / EQ::invbag::SLOT_COUNT));;
+			SoDSlot = serverSlot + 1;
 		}
 
 		else if (serverSlot <= EQ::invslot::SHARED_BANK_END && serverSlot >= EQ::invslot::SHARED_BANK_BEGIN) {
@@ -3999,7 +3999,7 @@ namespace SoD
 		}
 
 		else if (serverSlot <= EQ::invbag::SHARED_BANK_BAGS_END && serverSlot >= EQ::invbag::SHARED_BANK_BAGS_BEGIN) {
-			SoDSlot = serverSlot - (EQ::invbag::SHARED_BANK_BAGS_BEGIN - invbag::SHARED_BANK_BAGS_BEGIN) - ((EQ::invbag::SLOT_COUNT - invbag::SLOT_COUNT) * ((serverSlot - EQ::invbag::SHARED_BANK_BAGS_BEGIN) / EQ::invbag::SLOT_COUNT));
+			SoDSlot = serverSlot + 1;
 		}
 
 		else if (serverSlot <= EQ::invslot::TRADE_END && serverSlot >= EQ::invslot::TRADE_BEGIN) {
@@ -4007,7 +4007,7 @@ namespace SoD
 		}
 
 		else if (serverSlot <= EQ::invbag::TRADE_BAGS_END && serverSlot >= EQ::invbag::TRADE_BAGS_BEGIN) {
-			SoDSlot = serverSlot - (EQ::invbag::TRADE_BAGS_BEGIN - invbag::TRADE_BAGS_BEGIN) - ((EQ::invbag::SLOT_COUNT - invbag::SLOT_COUNT) * ((serverSlot - EQ::invbag::TRADE_BAGS_BEGIN) / EQ::invbag::SLOT_COUNT));
+			SoDSlot = serverSlot;
 		}
 
 		else if (serverSlot <= EQ::invslot::WORLD_END && serverSlot >= EQ::invslot::WORLD_BEGIN) {
@@ -4049,11 +4049,11 @@ namespace SoD
 		}
 
 		else if (sod_slot <= invbag::GENERAL_BAGS_END && sod_slot >= invbag::GENERAL_BAGS_BEGIN) {
-			server_slot = sod_slot + (EQ::invbag::GENERAL_BAGS_BEGIN - invbag::GENERAL_BAGS_BEGIN) + ((EQ::invbag::SLOT_COUNT - invbag::SLOT_COUNT) * ((sod_slot - invbag::GENERAL_BAGS_BEGIN) / invbag::SLOT_COUNT));
+			server_slot = sod_slot - 11;
 		}
 
 		else if (sod_slot <= invbag::CURSOR_BAG_END && sod_slot >= invbag::CURSOR_BAG_BEGIN) {
-			server_slot = sod_slot + (EQ::invbag::CURSOR_BAG_BEGIN - invbag::CURSOR_BAG_BEGIN);
+			server_slot = sod_slot + 9;
 		}
 
 		else if (sod_slot <= invslot::TRIBUTE_END && sod_slot >= invslot::TRIBUTE_BEGIN) {
@@ -4073,7 +4073,7 @@ namespace SoD
 		}
 
 		else if (sod_slot <= invbag::BANK_BAGS_END && sod_slot >= invbag::BANK_BAGS_BEGIN) {
-			server_slot = sod_slot + (EQ::invbag::BANK_BAGS_BEGIN - invbag::BANK_BAGS_BEGIN) + ((EQ::invbag::SLOT_COUNT - invbag::SLOT_COUNT) * ((sod_slot - invbag::BANK_BAGS_BEGIN) / invbag::SLOT_COUNT));
+			server_slot = sod_slot - 1;
 		}
 
 		else if (sod_slot <= invslot::SHARED_BANK_END && sod_slot >= invslot::SHARED_BANK_BEGIN) {
@@ -4081,7 +4081,7 @@ namespace SoD
 		}
 
 		else if (sod_slot <= invbag::SHARED_BANK_BAGS_END && sod_slot >= invbag::SHARED_BANK_BAGS_BEGIN) {
-			server_slot = sod_slot + (EQ::invbag::SHARED_BANK_BAGS_BEGIN - invbag::SHARED_BANK_BAGS_BEGIN) + ((EQ::invbag::SLOT_COUNT - invbag::SLOT_COUNT) * ((sod_slot - invbag::SHARED_BANK_BAGS_BEGIN) / invbag::SLOT_COUNT));
+			server_slot = sod_slot - 1;
 		}
 
 		else if (sod_slot <= invslot::TRADE_END && sod_slot >= invslot::TRADE_BEGIN) {
@@ -4089,7 +4089,7 @@ namespace SoD
 		}
 
 		else if (sod_slot <= invbag::TRADE_BAGS_END && sod_slot >= invbag::TRADE_BAGS_BEGIN) {
-			server_slot = sod_slot + (EQ::invbag::TRADE_BAGS_BEGIN - invbag::TRADE_BAGS_BEGIN) + ((EQ::invbag::SLOT_COUNT - invbag::SLOT_COUNT) * ((sod_slot - invbag::TRADE_BAGS_BEGIN) / invbag::SLOT_COUNT));
+			server_slot = sod_slot;
 		}
 
 		else if (sod_slot <= invslot::WORLD_END && sod_slot >= invslot::WORLD_BEGIN) {

common/patches/sof.cpp

@@ -71,7 +71,7 @@ namespace SoF
 	{
 		//create our opcode manager if we havent already
 		if (opcodes == nullptr) {
-			std::string opfile = fmt::format("{}/patch_{}.conf", PathManager::Instance()->GetPatchPath(), name);
+			std::string opfile = fmt::format("{}/patch_{}.conf", path.GetPatchPath(), name);
 			//load up the opcode manager.
 			//TODO: figure out how to support shared memory with multiple patches...
 			opcodes = new RegularOpcodeManager();
@@ -110,7 +110,7 @@ namespace SoF
 		//we need to go to every stream and replace it's manager.
 
 		if (opcodes != nullptr) {
-			std::string opfile = fmt::format("{}/patch_{}.conf", PathManager::Instance()->GetPatchPath(), name);
+			std::string opfile = fmt::format("{}/patch_{}.conf", path.GetPatchPath(), name);
 			if (!opcodes->ReloadOpcodes(opfile.c_str())) {
 				LogNetcode("[OPCODES] Error reloading opcodes file [{}] for patch [{}]", opfile.c_str(), name);
 				return;
@@ -3355,12 +3355,12 @@ namespace SoF
 			sof_slot = server_slot - 2;
 		}
 
-		else if (server_slot <= EQ::invbag::GENERAL_BAGS_END && server_slot >= EQ::invbag::GENERAL_BAGS_BEGIN) {
+		else if (server_slot <= EQ::invbag::GENERAL_BAGS_8_END && server_slot >= EQ::invbag::GENERAL_BAGS_BEGIN) {
-			sof_slot = server_slot - (EQ::invbag::GENERAL_BAGS_BEGIN - invbag::GENERAL_BAGS_BEGIN) - ((EQ::invbag::SLOT_COUNT - invbag::SLOT_COUNT) * ((server_slot - EQ::invbag::GENERAL_BAGS_BEGIN) / EQ::invbag::SLOT_COUNT));;
+			sof_slot = server_slot + 11;
 		}
 
 		else if (server_slot <= EQ::invbag::CURSOR_BAG_END && server_slot >= EQ::invbag::CURSOR_BAG_BEGIN) {
-			sof_slot = server_slot - (EQ::invbag::CURSOR_BAG_BEGIN - invbag::CURSOR_BAG_BEGIN);
+			sof_slot = server_slot - 9;
 		}
 
 		else if (server_slot <= EQ::invslot::TRIBUTE_END && server_slot >= EQ::invslot::TRIBUTE_BEGIN) {
@@ -3380,7 +3380,7 @@ namespace SoF
 		}
 
 		else if (server_slot <= EQ::invbag::BANK_BAGS_END && server_slot >= EQ::invbag::BANK_BAGS_BEGIN) {
-			sof_slot = server_slot - (EQ::invbag::BANK_BAGS_BEGIN - invbag::BANK_BAGS_BEGIN) - ((EQ::invbag::SLOT_COUNT - invbag::SLOT_COUNT) * ((server_slot - EQ::invbag::BANK_BAGS_BEGIN) / EQ::invbag::SLOT_COUNT));
+			sof_slot = server_slot + 1;
 		}
 
 		else if (server_slot <= EQ::invslot::SHARED_BANK_END && server_slot >= EQ::invslot::SHARED_BANK_BEGIN) {
@@ -3388,7 +3388,7 @@ namespace SoF
 		}
 
 		else if (server_slot <= EQ::invbag::SHARED_BANK_BAGS_END && server_slot >= EQ::invbag::SHARED_BANK_BAGS_BEGIN) {
-			sof_slot = server_slot - (EQ::invbag::SHARED_BANK_BAGS_BEGIN - invbag::SHARED_BANK_BAGS_BEGIN) - ((EQ::invbag::SLOT_COUNT - invbag::SLOT_COUNT) * ((server_slot - EQ::invbag::SHARED_BANK_BAGS_BEGIN) / EQ::invbag::SLOT_COUNT));
+			sof_slot = server_slot + 1;
 		}
 
 		else if (server_slot <= EQ::invslot::TRADE_END && server_slot >= EQ::invslot::TRADE_BEGIN) {
@@ -3396,7 +3396,7 @@ namespace SoF
 		}
 
 		else if (server_slot <= EQ::invbag::TRADE_BAGS_END && server_slot >= EQ::invbag::TRADE_BAGS_BEGIN) {
-			sof_slot = server_slot - (EQ::invbag::TRADE_BAGS_BEGIN - invbag::TRADE_BAGS_BEGIN) - ((EQ::invbag::SLOT_COUNT - invbag::SLOT_COUNT) * ((server_slot - EQ::invbag::TRADE_BAGS_BEGIN) / EQ::invbag::SLOT_COUNT));
+			sof_slot = server_slot;
 		}
 
 		else if (server_slot <= EQ::invslot::WORLD_END && server_slot >= EQ::invslot::WORLD_BEGIN) {
@@ -3442,11 +3442,11 @@ namespace SoF
 		}
 
 		else if (sof_slot <= invbag::GENERAL_BAGS_END && sof_slot >= invbag::GENERAL_BAGS_BEGIN) {
-			server_slot = sof_slot + (EQ::invbag::GENERAL_BAGS_BEGIN - invbag::GENERAL_BAGS_BEGIN) + ((EQ::invbag::SLOT_COUNT - invbag::SLOT_COUNT) * ((sof_slot - invbag::GENERAL_BAGS_BEGIN) / invbag::SLOT_COUNT));;
+			server_slot = sof_slot - 11;
 		}
 
 		else if (sof_slot <= invbag::CURSOR_BAG_END && sof_slot >= invbag::CURSOR_BAG_BEGIN) {
-			server_slot = sof_slot + (EQ::invbag::CURSOR_BAG_BEGIN - invbag::CURSOR_BAG_BEGIN);
+			server_slot = sof_slot + 9;
 		}
 
 		else if (sof_slot <= invslot::TRIBUTE_END && sof_slot >= invslot::TRIBUTE_BEGIN) {
@@ -3466,7 +3466,7 @@ namespace SoF
 		}
 
 		else if (sof_slot <= invbag::BANK_BAGS_END && sof_slot >= invbag::BANK_BAGS_BEGIN) {
-			server_slot = sof_slot + (EQ::invbag::BANK_BAGS_BEGIN - invbag::BANK_BAGS_BEGIN) + ((EQ::invbag::SLOT_COUNT - invbag::SLOT_COUNT) * ((sof_slot - invbag::BANK_BAGS_BEGIN) / invbag::SLOT_COUNT));;
+			server_slot = sof_slot - 1;
 		}
 
 		else if (sof_slot <= invslot::SHARED_BANK_END && sof_slot >= invslot::SHARED_BANK_BEGIN) {
@@ -3474,7 +3474,7 @@ namespace SoF
 		}
 
 		else if (sof_slot <= invbag::SHARED_BANK_BAGS_END && sof_slot >= invbag::SHARED_BANK_BAGS_BEGIN) {
-			server_slot = sof_slot + (EQ::invbag::SHARED_BANK_BAGS_BEGIN - invbag::SHARED_BANK_BAGS_BEGIN) + ((EQ::invbag::SLOT_COUNT - invbag::SLOT_COUNT) * ((sof_slot - invbag::SHARED_BANK_BAGS_BEGIN) / invbag::SLOT_COUNT));;
+			server_slot = sof_slot - 1;
 		}
 
 		else if (sof_slot <= invslot::TRADE_END && sof_slot >= invslot::TRADE_BEGIN) {
@@ -3482,7 +3482,7 @@ namespace SoF
 		}
 
 		else if (sof_slot <= invbag::TRADE_BAGS_END && sof_slot >= invbag::TRADE_BAGS_BEGIN) {
-			server_slot = sof_slot + (EQ::invbag::TRADE_BAGS_BEGIN - invbag::TRADE_BAGS_BEGIN) + ((EQ::invbag::SLOT_COUNT - invbag::SLOT_COUNT) * ((sof_slot - invbag::TRADE_BAGS_BEGIN) / invbag::SLOT_COUNT));;
+			server_slot = sof_slot;
 		}
 
 		else if (sof_slot <= invslot::WORLD_END && sof_slot >= invslot::WORLD_BEGIN) {

common/patches/titanium.cpp

@@ -73,7 +73,7 @@ namespace Titanium
 		auto Config = EQEmuConfig::get();
 		//create our opcode manager if we havent already
 		if (opcodes == nullptr) {
-			std::string opfile = fmt::format("{}/patch_{}.conf", PathManager::Instance()->GetPatchPath(), name);
+			std::string opfile = fmt::format("{}/patch_{}.conf", path.GetPatchPath(), name);
 			//load up the opcode manager.
 			//TODO: figure out how to support shared memory with multiple patches...
 			opcodes = new RegularOpcodeManager();
@@ -114,7 +114,7 @@ namespace Titanium
 		//we need to go to every stream and replace it's manager.
 
 		if (opcodes != nullptr) {
-			std::string opfile = fmt::format("{}/patch_{}.conf", PathManager::Instance()->GetPatchPath(), name);
+			std::string opfile = fmt::format("{}/patch_{}.conf", path.GetPatchPath(), name);
 			if (!opcodes->ReloadOpcodes(opfile.c_str())) {
 				LogNetcode("[OPCODES] Error reloading opcodes file [{}] for patch [{}]", opfile.c_str(), name);
 				return;
@@ -1059,7 +1059,7 @@ namespace Titanium
 		OUT(spawnid);
 		OUT_str(charname);
 
-		if (emu->race > 474)
+		if (emu->race > 473)
 			eq->race = 1;
 		else
 			OUT(race);
@@ -1840,7 +1840,7 @@ namespace Titanium
 			emu_cse = (CharacterSelectEntry_Struct *)emu_ptr;
 
 			eq->Race[char_index] = emu_cse->Race;
-			if (eq->Race[char_index] > 474)
+			if (eq->Race[char_index] > 473)
 				eq->Race[char_index] = 1;
 
 			for (int index = 0; index < EQ::textures::materialCount; ++index) {
@@ -2421,7 +2421,7 @@ namespace Titanium
 			strcpy(eq->title, emu->title);
 			//		eq->unknown0274 = emu->unknown0274;
 			eq->helm = emu->helm;
-			if (emu->race > 474)
+			if (emu->race > 473)
 				eq->race = 1;
 			else
 				eq->race = emu->race;
@@ -3596,12 +3596,12 @@ namespace Titanium
 		else if (server_slot == (EQ::invslot::POSSESSIONS_COUNT + EQ::invslot::slotAmmo)) {
 			titanium_slot = server_slot - 4;
 		}
-		else if (server_slot <= EQ::invbag::GENERAL_BAGS_END &&
+		else if (server_slot <= EQ::invbag::GENERAL_BAGS_8_END &&
 				 server_slot >= EQ::invbag::GENERAL_BAGS_BEGIN) {
-			titanium_slot = server_slot - (EQ::invbag::GENERAL_BAGS_BEGIN - invbag::GENERAL_BAGS_BEGIN) - ((EQ::invbag::SLOT_COUNT - invbag::SLOT_COUNT) * ((server_slot - EQ::invbag::GENERAL_BAGS_BEGIN) / EQ::invbag::SLOT_COUNT));
+			titanium_slot = server_slot;
 		}
 		else if (server_slot <= EQ::invbag::CURSOR_BAG_END && server_slot >= EQ::invbag::CURSOR_BAG_BEGIN) {
-			titanium_slot = server_slot - (EQ::invbag::CURSOR_BAG_BEGIN - invbag::CURSOR_BAG_BEGIN);
+			titanium_slot = server_slot - 20;
 		}
 		else if (server_slot <= EQ::invslot::TRIBUTE_END && server_slot >= EQ::invslot::TRIBUTE_BEGIN) {
 			titanium_slot = server_slot;
@@ -3616,21 +3616,21 @@ namespace Titanium
 		else if (server_slot <= EQ::invslot::BANK_END && server_slot >= EQ::invslot::BANK_BEGIN) {
 			titanium_slot = server_slot;
 		}
-		else if (server_slot <= EQ::invbag::BANK_BAGS_END && server_slot >= EQ::invbag::BANK_BAGS_BEGIN) {
+		else if (server_slot <= EQ::invbag::BANK_BAGS_16_END && server_slot >= EQ::invbag::BANK_BAGS_BEGIN) {
-			titanium_slot = server_slot - (EQ::invbag::BANK_BAGS_BEGIN - invbag::BANK_BAGS_BEGIN) - ((EQ::invbag::SLOT_COUNT - invbag::SLOT_COUNT) * ((server_slot - EQ::invbag::BANK_BAGS_BEGIN) / EQ::invbag::SLOT_COUNT));
+			titanium_slot = server_slot;
 		}
 		else if (server_slot <= EQ::invslot::SHARED_BANK_END && server_slot >= EQ::invslot::SHARED_BANK_BEGIN) {
 			titanium_slot = server_slot;
 		}
 		else if (server_slot <= EQ::invbag::SHARED_BANK_BAGS_END &&
 				 server_slot >= EQ::invbag::SHARED_BANK_BAGS_BEGIN) {
-			titanium_slot = server_slot - (EQ::invbag::SHARED_BANK_BAGS_BEGIN - invbag::SHARED_BANK_BAGS_BEGIN) - ((EQ::invbag::SLOT_COUNT - invbag::SLOT_COUNT) * ((server_slot - EQ::invbag::SHARED_BANK_BAGS_BEGIN) / EQ::invbag::SLOT_COUNT));
+			titanium_slot = server_slot;
 		}
 		else if (server_slot <= EQ::invslot::TRADE_END && server_slot >= EQ::invslot::TRADE_BEGIN) {
 			titanium_slot = server_slot;
 		}
 		else if (server_slot <= EQ::invbag::TRADE_BAGS_END && server_slot >= EQ::invbag::TRADE_BAGS_BEGIN) {
-			titanium_slot = server_slot - (EQ::invbag::TRADE_BAGS_BEGIN - invbag::TRADE_BAGS_BEGIN) - ((EQ::invbag::SLOT_COUNT - invbag::SLOT_COUNT) * ((server_slot - EQ::invbag::TRADE_BAGS_BEGIN) / EQ::invbag::SLOT_COUNT));
+			titanium_slot = server_slot;
 		}
 		else if (server_slot <= EQ::invslot::WORLD_END && server_slot >= EQ::invslot::WORLD_BEGIN) {
 			titanium_slot = server_slot;
@@ -3687,10 +3687,10 @@ namespace Titanium
 			server_slot = titanium_slot + 4;
 		}
 		else if (titanium_slot <= invbag::GENERAL_BAGS_END && titanium_slot >= invbag::GENERAL_BAGS_BEGIN) {
-			server_slot = titanium_slot + (EQ::invbag::GENERAL_BAGS_BEGIN - invbag::GENERAL_BAGS_BEGIN) + ((EQ::invbag::SLOT_COUNT - invbag::SLOT_COUNT) * ((titanium_slot - invbag::GENERAL_BAGS_BEGIN) / invbag::SLOT_COUNT));
+			server_slot = titanium_slot;
 		}
 		else if (titanium_slot <= invbag::CURSOR_BAG_END && titanium_slot >= invbag::CURSOR_BAG_BEGIN) {
-			server_slot = titanium_slot + (EQ::invbag::CURSOR_BAG_BEGIN - invbag::CURSOR_BAG_BEGIN);
+			server_slot = titanium_slot + 20;
 		}
 		else if (titanium_slot <= invslot::TRIBUTE_END && titanium_slot >= invslot::TRIBUTE_BEGIN) {
 			server_slot = titanium_slot;
@@ -3705,19 +3705,19 @@ namespace Titanium
 			server_slot = titanium_slot;
 		}
 		else if (titanium_slot <= invbag::BANK_BAGS_END && titanium_slot >= invbag::BANK_BAGS_BEGIN) {
-			server_slot = titanium_slot + (EQ::invbag::BANK_BAGS_BEGIN - invbag::BANK_BAGS_BEGIN) + ((EQ::invbag::SLOT_COUNT - invbag::SLOT_COUNT) * ((titanium_slot - invbag::BANK_BAGS_BEGIN) / invbag::SLOT_COUNT));
+			server_slot = titanium_slot;
 		}
 		else if (titanium_slot <= invslot::SHARED_BANK_END && titanium_slot >= invslot::SHARED_BANK_BEGIN) {
 			server_slot = titanium_slot;
 		}
 		else if (titanium_slot <= invbag::SHARED_BANK_BAGS_END && titanium_slot >= invbag::SHARED_BANK_BAGS_BEGIN) {
-			server_slot = titanium_slot + (EQ::invbag::SHARED_BANK_BAGS_BEGIN - invbag::SHARED_BANK_BAGS_BEGIN) + ((EQ::invbag::SLOT_COUNT - invbag::SLOT_COUNT) * ((titanium_slot - invbag::SHARED_BANK_BAGS_BEGIN) / invbag::SLOT_COUNT));
+			server_slot = titanium_slot;
 		}
 		else if (titanium_slot <= invslot::TRADE_END && titanium_slot >= invslot::TRADE_BEGIN) {
 			server_slot = titanium_slot;
 		}
 		else if (titanium_slot <= invbag::TRADE_BAGS_END && titanium_slot >= invbag::TRADE_BAGS_BEGIN) {
-			server_slot = titanium_slot + (EQ::invbag::TRADE_BAGS_BEGIN - invbag::TRADE_BAGS_BEGIN) + ((EQ::invbag::SLOT_COUNT - invbag::SLOT_COUNT) * ((titanium_slot - invbag::TRADE_BAGS_BEGIN) / invbag::SLOT_COUNT));
+			server_slot = titanium_slot;
 		}
 		else if (titanium_slot <= invslot::WORLD_END && titanium_slot >= invslot::WORLD_BEGIN) {
 			server_slot = titanium_slot;

common/patches/uf.cpp

@@ -38,7 +38,7 @@
 #include "../raid.h"
 #include "../guilds.h"
 //#include "../repositories/trader_repository.h"
-#include <cereal/types/vector.hpp>
+#include "../cereal/include/cereal/types/vector.hpp"
 
 #include <iostream>
 #include <sstream>
@@ -76,7 +76,7 @@ namespace UF
 	{
 		//create our opcode manager if we havent already
 		if (opcodes == nullptr) {
-			std::string opfile = fmt::format("{}/patch_{}.conf", PathManager::Instance()->GetPatchPath(), name);
+			std::string opfile = fmt::format("{}/patch_{}.conf", path.GetPatchPath(), name);
 			//load up the opcode manager.
 			//TODO: figure out how to support shared memory with multiple patches...
 			opcodes = new RegularOpcodeManager();
@@ -117,7 +117,7 @@ namespace UF
 		//we need to go to every stream and replace it's manager.
 
 		if (opcodes != nullptr) {
-			std::string opfile = fmt::format("{}/patch_{}.conf", PathManager::Instance()->GetPatchPath(), name);
+			std::string opfile = fmt::format("{}/patch_{}.conf", path.GetPatchPath(), name);
 			if (!opcodes->ReloadOpcodes(opfile.c_str())) {
 				LogNetcode("[OPCODES] Error reloading opcodes file [{}] for patch [{}]", opfile.c_str(), name);
 				return;

common/path_manager.cpp

@@ -8,7 +8,7 @@
 
 namespace fs = std::filesystem;
 
-void PathManager::Init()
+void PathManager::LoadPaths()
 {
 	m_server_path = File::FindEqemuConfigPath();
 
@@ -48,23 +48,10 @@ void PathManager::Init()
 		return dir;
 	};
 
-	auto load_many_paths_fallback = [&](const std::vector<std::string>& dirs, const std::string& fallback, std::vector<std::string>& target) {
-		target.clear();
-		if (!dirs.empty()) {
-			for (const auto& path : dirs) {
-				target.push_back(resolve_path(path));
-			}
-		} else {
-			target.push_back(resolve_path(fallback));
-		}
-	};
-
-	load_many_paths_fallback(c->GetQuestDirectories(), c->QuestDir, m_quests_paths);
-	load_many_paths_fallback(c->GetPluginsDirectories(), c->PluginDir, m_plugin_paths);
-	load_many_paths_fallback(c->GetLuaModuleDirectories(), c->LuaModuleDir, m_lua_module_paths);
-
-	// resolve all paths
 	m_maps_path          = resolve_path(c->MapDir, {"maps", "Maps"});
+	m_quests_path        = resolve_path(c->QuestDir);
+	m_plugins_path       = resolve_path(c->PluginDir);
+	m_lua_modules_path   = resolve_path(c->LuaModuleDir);
 	m_lua_mods_path      = resolve_path("mods");
 	m_patch_path         = resolve_path(c->PatchDir);
 	m_opcode_path        = resolve_path(c->OpcodeDir);
@@ -75,10 +62,13 @@ void PathManager::Init()
 	std::vector<std::pair<std::string, std::string>> paths = {
 		{"server", m_server_path},
 		{"logs", m_log_path},
-		{"maps", m_maps_path},
 		{"lua mods", m_lua_mods_path},
+		{"lua_modules", m_lua_modules_path},
+		{"maps", m_maps_path},
 		{"patches", m_patch_path},
 		{"opcode", m_opcode_path},
+		{"plugins", m_plugins_path},
+		{"quests", m_quests_path},
 		{"shared_memory", m_shared_memory_path}
 	};
 
@@ -93,17 +83,6 @@ void PathManager::Init()
 			LogInfo("{:>{}} > [{:<{}}]", name, name_width, in_path, path_width);
 		}
 	}
-
-	auto log_paths = [&](const std::string& label, const std::vector<std::string>& paths) {
-		if (!paths.empty()) {
-			LogInfo("{:>{}} > [{:<{}}]", label, name_width - 1, Strings::Join(paths, ";"), path_width);
-		}
-	};
-
-	log_paths("quests", m_quests_paths);
-	log_paths("plugins", m_plugin_paths);
-	log_paths("lua_modules", m_lua_module_paths);
-
 	LogInfo("{}", Strings::Repeat("-", break_length));
 }
 
@@ -117,26 +96,21 @@ const std::string &PathManager::GetMapsPath() const
 	return m_maps_path;
 }
 
+const std::string &PathManager::GetQuestsPath() const
+{
+	return m_quests_path;
+}
+
+const std::string &PathManager::GetPluginsPath() const
+{
+	return m_plugins_path;
+}
+
 const std::string &PathManager::GetSharedMemoryPath() const
 {
 	return m_shared_memory_path;
 }
 
-std::vector<std::string> PathManager::GetQuestPaths() const
-{
-	return m_quests_paths;
-}
-
-std::vector<std::string> PathManager::GetPluginPaths() const
-{
-	return m_plugin_paths;
-}
-
-std::vector<std::string> PathManager::GetLuaModulePaths() const
-{
-	return m_lua_module_paths;
-}
-
 const std::string &PathManager::GetLogPath() const
 {
 	return m_log_path;
@@ -152,6 +126,11 @@ const std::string &PathManager::GetOpcodePath() const
 	return m_opcode_path;
 }
 
+const std::string &PathManager::GetLuaModulesPath() const
+{
+	return m_lua_modules_path;
+}
+
 const std::string &PathManager::GetLuaModsPath() const
 {
 	return m_lua_mods_path;

common/path_manager.h

@@ -3,17 +3,10 @@
 
 
 #include <string>
-#include <vector>
 
 class PathManager {
 public:
-	void Init();
+	void LoadPaths();
-
-	static PathManager *Instance()
-	{
-		static PathManager instance;
-		return &instance;
-	}
 
 	[[nodiscard]] const std::string &GetLogPath() const;
 	[[nodiscard]] const std::string &GetLuaModsPath() const;
@@ -21,27 +14,24 @@ public:
 	[[nodiscard]] const std::string &GetMapsPath() const;
 	[[nodiscard]] const std::string &GetPatchPath() const;
 	[[nodiscard]] const std::string &GetOpcodePath() const;
+	[[nodiscard]] const std::string &GetPluginsPath() const;
+	[[nodiscard]] const std::string &GetQuestsPath() const;
 	[[nodiscard]] const std::string &GetServerPath() const;
 	[[nodiscard]] const std::string &GetSharedMemoryPath() const;
-	[[nodiscard]] std::vector<std::string> GetQuestPaths() const;
-	[[nodiscard]] std::vector<std::string> GetPluginPaths() const;
-	[[nodiscard]] std::vector<std::string> GetLuaModulePaths() const;
 
 private:
-	std::string              m_log_path;
+	std::string m_log_path;
-	std::string              m_lua_mods_path;
+	std::string m_lua_mods_path;
-	std::string              m_maps_path;
+	std::string m_lua_modules_path;
-	std::string              m_patch_path;
+	std::string m_maps_path;
-	std::string              m_opcode_path;
+	std::string m_patch_path;
-	std::string              m_quests_path;
+	std::string m_opcode_path;
-	std::vector<std::string> m_quests_paths;
+	std::string m_plugins_path;
-	std::vector<std::string> m_plugin_paths;
+	std::string m_quests_path;
-	std::vector<std::string> m_lua_module_paths;
+	std::string m_server_path;
-
+	std::string m_shared_memory_path;
-
-private:
-	std::string              m_server_path;
-	std::string              m_shared_memory_path;
 };
 
+extern PathManager path;
+
 #endif //EQEMU_PATH_MANAGER_H

common/pch/app-pch.h

@@ -1,9 +0,0 @@
-#pragma once
-
-#include "../types.h"
-#include "../database.h"
-#include "../strings.h"
-#include "../eqemu_logsys.h"
-#include "../eqemu_logsys_log_aliases.h"
-#include "../features.h"
-#include "../global_define.h"

common/pch/pch.h

@@ -0,0 +1,34 @@
+// types
+#include <limits>
+#include <string>
+#include <cctype>
+#include <sstream>
+
+// containers
+#include <iterator>
+#include <set>
+#include <unordered_set>
+#include <map>
+#include <unordered_map>
+#include <list>
+#include <vector>
+
+// utilities
+#include <iostream>
+#include <cassert>
+#include <cmath>
+#include <memory>
+#include <functional>
+#include <algorithm>
+#include <utility>
+#include <tuple>
+#include <fstream>
+#include <cstdio>
+
+// fmt
+#include <fmt/format.h>
+
+// lua
+#include "lua.hpp"
+#include <luabind/luabind.hpp>
+#include <luabind/object.hpp>

common/pch/std-pch.h

@@ -1,14 +0,0 @@
-#pragma once
-
-// Lightweight, widely used
-#include <string>
-#include <vector>
-#include <map>
-#include <unordered_map>
-#include <memory>
-#include <limits>
-#include <cstdint>
-#include <cassert>
-
-// fmt
-#include <fmt/format.h>

common/process/process.cpp

@@ -1,8 +1,6 @@
 #include <string>
 #include <memory>
 #include "process.h"
-#include <fmt/format.h>
-#include <fmt/ranges.h>
 
 std::string Process::execute(const std::string &cmd)
 {

common/profanity_manager.h

@@ -23,7 +23,7 @@
 #include <string>
 #include <list>
 #include <fmt/format.h>
-#include <fmt/ranges.h>
+
 
 class DBcore;
 

common/races.h

@@ -21,7 +21,103 @@
 #include "../common/types.h"
 #include <string>
 
+namespace Gender {
+	constexpr uint8 Male   = 0;
+	constexpr uint8 Female = 1;
+	constexpr uint8 Neuter = 2;
+}
+
+//theres a big list straight from the client below.
+
+#define HUMAN 1
+#define BARBARIAN 2
+#define ERUDITE 3
+#define WOOD_ELF 4
+#define HIGH_ELF 5
+#define DARK_ELF 6
+#define HALF_ELF 7
+#define DWARF 8
+#define TROLL 9
+#define OGRE 10
+#define HALFLING 11
+#define GNOME 12
+#define WEREWOLF 14
+#define WOLF 42
+#define BEAR 43
+#define SKELETON 60
+#define TIGER 63
+#define ELEMENTAL 75
+#define ALLIGATOR 91
+#define OGGOK_CITIZEN 93
+#define EYE_OF_ZOMM 108
+#define WOLF_ELEMENTAL 120
+#define INVISIBLE_MAN 127
+#define IKSAR 128
+#define VAHSHIR 130
+#define CONTROLLED_BOAT 141
+#define MINOR_ILL_OBJ 142
+#define TREE 143
+#define IKSAR_SKELETON 161
+#define FROGLOK 330
+// TODO: check all clients for (BYTE) usage of '/who all' class and remove FROGLOK2, if possible (330 - 74 = 256 .. WORD->BYTE conversion loss...)
+#define FROGLOK2 74	// Not sure why /who all reports race as 74 for frogloks
+#define FAIRY 473
+#define DRAKKIN 522 // 32768
+#define EMU_RACE_NPC 131069 // was 65533
+#define EMU_RACE_PET 131070 // was 65534
+#define EMU_RACE_UNKNOWN 131071 // was 65535
+
+
+// player race values
+#define PLAYER_RACE_UNKNOWN 0
+#define PLAYER_RACE_HUMAN 1
+#define PLAYER_RACE_BARBARIAN 2
+#define PLAYER_RACE_ERUDITE 3
+#define PLAYER_RACE_WOOD_ELF 4
+#define PLAYER_RACE_HIGH_ELF 5
+#define PLAYER_RACE_DARK_ELF 6
+#define PLAYER_RACE_HALF_ELF 7
+#define PLAYER_RACE_DWARF 8
+#define PLAYER_RACE_TROLL 9
+#define PLAYER_RACE_OGRE 10
+#define PLAYER_RACE_HALFLING 11
+#define PLAYER_RACE_GNOME 12
+#define PLAYER_RACE_IKSAR 13
+#define PLAYER_RACE_VAHSHIR 14
+#define PLAYER_RACE_FROGLOK 15
+#define PLAYER_RACE_DRAKKIN 16
+
+#define PLAYER_RACE_COUNT 16
+
+
+#define PLAYER_RACE_EMU_NPC 17
+#define PLAYER_RACE_EMU_PET 18
+#define PLAYER_RACE_EMU_COUNT 19
+
+
+// player race bits
+#define PLAYER_RACE_UNKNOWN_BIT 0
+#define PLAYER_RACE_HUMAN_BIT 1
+#define PLAYER_RACE_BARBARIAN_BIT 2
+#define PLAYER_RACE_ERUDITE_BIT 4
+#define PLAYER_RACE_WOOD_ELF_BIT 8
+#define PLAYER_RACE_HIGH_ELF_BIT 16
+#define PLAYER_RACE_DARK_ELF_BIT 32
+#define PLAYER_RACE_HALF_ELF_BIT 64
+#define PLAYER_RACE_DWARF_BIT 128
+#define PLAYER_RACE_TROLL_BIT 256
+#define PLAYER_RACE_OGRE_BIT 512
+#define PLAYER_RACE_HALFLING_BIT 1024
+#define PLAYER_RACE_GNOME_BIT 2048
+#define PLAYER_RACE_IKSAR_BIT 4096
+#define PLAYER_RACE_VAHSHIR_BIT 8192
+#define PLAYER_RACE_FROGLOK_BIT 16384
+#define PLAYER_RACE_DRAKKIN_BIT 32768
+
+#define PLAYER_RACE_ALL_MASK 65535
+
 const char* GetRaceIDName(uint16 race_id);
+const char* GetPlayerRaceName(uint32 player_race_value);
 const char* GetGenderName(uint32 gender_id);
 
 bool IsPlayerRace(uint16 race_id);
@@ -31,13 +127,25 @@ uint32 GetPlayerRaceValue(uint16 race_id);
 uint16 GetPlayerRaceBit(uint16 race_id);
 
 uint16 GetRaceIDFromPlayerRaceValue(uint32 player_race_value);
+uint16 GetRaceIDFromPlayerRaceBit(uint32 player_race_bit);
 
 float GetRaceGenderDefaultHeight(int race, int gender);
 
-namespace Gender {
+// player race-/gender-based model feature validators
-	constexpr uint8 Male   = 0;
+namespace PlayerAppearance
-	constexpr uint8 Female = 1;
+{
-	constexpr uint8 Neuter = 2;
+	bool IsValidBeard(uint16 race_id, uint8 gender_id, uint8 beard_value, bool use_luclin = true);
+	bool IsValidBeardColor(uint16 race_id, uint8 gender_id, uint8 beard_color_value, bool use_luclin = true);
+	bool IsValidDetail(uint16 race_id, uint8 gender_id, uint32 detail_value, bool use_luclin = true);
+	bool IsValidEyeColor(uint16 race_id, uint8 gender_id, uint8 eye_color_value, bool use_luclin = true);
+	bool IsValidFace(uint16 race_id, uint8 gender_id, uint8 face_value, bool use_luclin = true);
+	bool IsValidHair(uint16 race_id, uint8 gender_id, uint8 hair_value, bool use_luclin = true);
+	bool IsValidHairColor(uint16 race_id, uint8 gender_id, uint8 hair_color_value, bool use_luclin = true);
+	bool IsValidHead(uint16 race_id, uint8 gender_id, uint8 head_value, bool use_luclin = true);
+	bool IsValidHeritage(uint16 race_id, uint8 gender_id, uint32 heritage_value, bool use_luclin = true);
+	bool IsValidTattoo(uint16 race_id, uint8 gender_id, uint32 tattoo_value, bool use_luclin = true);
+	bool IsValidTexture(uint16 race_id, uint8 gender_id, uint8 texture_value, bool use_luclin = true);
+	bool IsValidWoad(uint16 race_id, uint8 gender_id, uint8 woad_value, bool use_luclin = true);
 }
 
 namespace Race {
@@ -776,92 +884,8 @@ namespace Race {
 	constexpr uint16 Pegasus3                 = 732;
 	constexpr uint16 InteractiveObject        = 2250;
 	constexpr uint16 Node                     = 2254;
-}
 
-namespace RaceBitmask {
+	constexpr uint16 ALL_RACES_BITMASK = 65535;
-	constexpr uint16 Unknown   = 0;
-	constexpr uint16 Human     = 1;
-	constexpr uint16 Barbarian = 2;
-	constexpr uint16 Erudite   = 4;
-	constexpr uint16 WoodElf   = 8;
-	constexpr uint16 HighElf   = 16;
-	constexpr uint16 DarkElf   = 32;
-	constexpr uint16 HalfElf   = 64;
-	constexpr uint16 Dwarf     = 128;
-	constexpr uint16 Troll     = 256;
-	constexpr uint16 Ogre      = 512;
-	constexpr uint16 Halfling  = 1024;
-	constexpr uint16 Gnome     = 2048;
-	constexpr uint16 Iksar     = 4096;
-	constexpr uint16 VahShir   = 8192;
-	constexpr uint16 Froglok   = 16384;
-	constexpr uint16 Drakkin   = 32768;
-	constexpr uint16 All       = 65535;
-}
-
-namespace RaceIndex {
-	constexpr uint16 Human     = 1;
-	constexpr uint16 Barbarian = 2;
-	constexpr uint16 Erudite   = 3;
-	constexpr uint16 WoodElf   = 4;
-	constexpr uint16 HighElf   = 5;
-	constexpr uint16 DarkElf   = 6;
-	constexpr uint16 HalfElf   = 7;
-	constexpr uint16 Dwarf     = 8;
-	constexpr uint16 Troll     = 9;
-	constexpr uint16 Ogre      = 10;
-	constexpr uint16 Halfling  = 11;
-	constexpr uint16 Gnome     = 12;
-	constexpr uint16 Iksar     = 13;
-	constexpr uint16 VahShir   = 14;
-	constexpr uint16 Froglok   = 15;
-	constexpr uint16 Drakkin   = 16;
-}
-
-namespace RaceAppearance {
-	bool IsValidBeard(uint16 race_id, uint8 gender_id, uint8 beard_value, bool use_luclin = true);
-	bool IsValidBeardColor(uint16 race_id, uint8 gender_id, uint8 beard_color_value, bool use_luclin = true);
-	bool IsValidDetail(uint16 race_id, uint8 gender_id, uint32 detail_value, bool use_luclin = true);
-	bool IsValidEyeColor(uint16 race_id, uint8 gender_id, uint8 eye_color_value, bool use_luclin = true);
-	bool IsValidFace(uint16 race_id, uint8 gender_id, uint8 face_value, bool use_luclin = true);
-	bool IsValidHair(uint16 race_id, uint8 gender_id, uint8 hair_value, bool use_luclin = true);
-	bool IsValidHairColor(uint16 race_id, uint8 gender_id, uint8 hair_color_value, bool use_luclin = true);
-	bool IsValidHeritage(uint16 race_id, uint8 gender_id, uint32 heritage_value, bool use_luclin = true);
-	bool IsValidTattoo(uint16 race_id, uint8 gender_id, uint32 tattoo_value, bool use_luclin = true);
-	bool IsValidWoad(uint16 race_id, uint8 gender_id, uint8 woad_value, bool use_luclin = true);
-
-	constexpr int HumanMale       = (Race::Human << 8) | Gender::Male;
-	constexpr int HumanFemale     = (Race::Human << 8) | Gender::Female;
-	constexpr int BarbarianMale   = (Race::Barbarian << 8) | Gender::Male;
-	constexpr int BarbarianFemale = (Race::Barbarian << 8) | Gender::Female;
-	constexpr int EruditeMale     = (Race::Erudite << 8) | Gender::Male;
-	constexpr int EruditeFemale   = (Race::Erudite << 8) | Gender::Female;
-	constexpr int WoodElfMale     = (Race::WoodElf << 8) | Gender::Male;
-	constexpr int WoodElfFemale   = (Race::WoodElf << 8) | Gender::Female;
-	constexpr int HighElfMale     = (Race::HighElf << 8) | Gender::Male;
-	constexpr int HighElfFemale   = (Race::HighElf << 8) | Gender::Female;
-	constexpr int DarkElfMale     = (Race::DarkElf << 8) | Gender::Male;
-	constexpr int DarkElfFemale   = (Race::DarkElf << 8) | Gender::Female;
-	constexpr int HalfElfMale     = (Race::HalfElf << 8) | Gender::Male;
-	constexpr int HalfElfFemale   = (Race::HalfElf << 8) | Gender::Female;
-	constexpr int DwarfMale       = (Race::Dwarf << 8) | Gender::Male;
-	constexpr int DwarfFemale     = (Race::Dwarf << 8) | Gender::Female;
-	constexpr int TrollMale       = (Race::Troll << 8) | Gender::Male;
-	constexpr int TrollFemale     = (Race::Troll << 8) | Gender::Female;
-	constexpr int OgreMale        = (Race::Ogre << 8) | Gender::Male;
-	constexpr int OgreFemale      = (Race::Ogre << 8) | Gender::Female;
-	constexpr int HalflingMale    = (Race::Halfling << 8) | Gender::Male;
-	constexpr int HalflingFemale  = (Race::Halfling << 8) | Gender::Female;
-	constexpr int GnomeMale       = (Race::Gnome << 8) | Gender::Male;
-	constexpr int GnomeFemale     = (Race::Gnome << 8) | Gender::Female;
-	constexpr int IksarMale       = (Race::Iksar << 8) | Gender::Male;
-	constexpr int IksarFemale     = (Race::Iksar << 8) | Gender::Female;
-	constexpr int VahShirMale     = (Race::VahShir << 8) | Gender::Male;
-	constexpr int VahShirFemale   = (Race::VahShir << 8) | Gender::Female;
-	constexpr int FroglokMale     = (Race::Froglok2 << 8) | Gender::Male;
-	constexpr int FroglokFemale   = (Race::Froglok2 << 8) | Gender::Female;
-	constexpr int DrakkinMale     = (Race::Drakkin << 8) | Gender::Male;
-	constexpr int DrakkinFemale   = (Race::Drakkin << 8) | Gender::Female;
 }
 
 #endif

common/random.h

@@ -116,12 +116,6 @@ namespace EQ {
 			Reseed();
 		}
 
-		static Random* Instance()
-		{
-			static Random instance;
-			return &instance;
-		}
-
 	private:
 #ifndef BIASED_INT_DIST
 		typedef std::uniform_int_distribution<int>::param_type int_param_t;

common/repositories/base/base_character_corpses_repository.h

@@ -70,7 +70,6 @@ public:
 		uint32_t    gm_exp;
 		uint32_t    killed_by;
 		uint8_t     rezzable;
-		std::string entity_variables;
 	};
 
 	static std::string PrimaryKey()
@@ -132,7 +131,6 @@ public:
 			"gm_exp",
 			"killed_by",
 			"rezzable",
-			"entity_variables",
 		};
 	}
 
@@ -190,7 +188,6 @@ public:
 			"gm_exp",
 			"killed_by",
 			"rezzable",
-			"entity_variables",
 		};
 	}
 
@@ -282,7 +279,6 @@ public:
 		e.gm_exp           = 0;
 		e.killed_by        = 0;
 		e.rezzable         = 0;
-		e.entity_variables = "";
 
 		return e;
 	}
@@ -370,7 +366,6 @@ public:
 			e.gm_exp           = row[48] ? static_cast<uint32_t>(strtoul(row[48], nullptr, 10)) : 0;
 			e.killed_by        = row[49] ? static_cast<uint32_t>(strtoul(row[49], nullptr, 10)) : 0;
 			e.rezzable         = row[50] ? static_cast<uint8_t>(strtoul(row[50], nullptr, 10)) : 0;
-			e.entity_variables = row[51] ? row[51] : "";
 
 			return e;
 		}
@@ -454,7 +449,6 @@ public:
 		v.push_back(columns[48] + " = " + std::to_string(e.gm_exp));
 		v.push_back(columns[49] + " = " + std::to_string(e.killed_by));
 		v.push_back(columns[50] + " = " + std::to_string(e.rezzable));
-		v.push_back(columns[51] + " = '" + Strings::Escape(e.entity_variables) + "'");
 
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -527,7 +521,6 @@ public:
 		v.push_back(std::to_string(e.gm_exp));
 		v.push_back(std::to_string(e.killed_by));
 		v.push_back(std::to_string(e.rezzable));
-		v.push_back("'" + Strings::Escape(e.entity_variables) + "'");
 
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -608,7 +601,6 @@ public:
 			v.push_back(std::to_string(e.gm_exp));
 			v.push_back(std::to_string(e.killed_by));
 			v.push_back(std::to_string(e.rezzable));
-			v.push_back("'" + Strings::Escape(e.entity_variables) + "'");
 
 			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
 		}
@@ -693,7 +685,6 @@ public:
 			e.gm_exp           = row[48] ? static_cast<uint32_t>(strtoul(row[48], nullptr, 10)) : 0;
 			e.killed_by        = row[49] ? static_cast<uint32_t>(strtoul(row[49], nullptr, 10)) : 0;
 			e.rezzable         = row[50] ? static_cast<uint8_t>(strtoul(row[50], nullptr, 10)) : 0;
-			e.entity_variables = row[51] ? row[51] : "";
 
 			all_entries.push_back(e);
 		}
@@ -769,7 +760,6 @@ public:
 			e.gm_exp           = row[48] ? static_cast<uint32_t>(strtoul(row[48], nullptr, 10)) : 0;
 			e.killed_by        = row[49] ? static_cast<uint32_t>(strtoul(row[49], nullptr, 10)) : 0;
 			e.rezzable         = row[50] ? static_cast<uint8_t>(strtoul(row[50], nullptr, 10)) : 0;
-			e.entity_variables = row[51] ? row[51] : "";
 
 			all_entries.push_back(e);
 		}
@@ -895,7 +885,6 @@ public:
 		v.push_back(std::to_string(e.gm_exp));
 		v.push_back(std::to_string(e.killed_by));
 		v.push_back(std::to_string(e.rezzable));
-		v.push_back("'" + Strings::Escape(e.entity_variables) + "'");
 
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -969,7 +958,6 @@ public:
 			v.push_back(std::to_string(e.gm_exp));
 			v.push_back(std::to_string(e.killed_by));
 			v.push_back(std::to_string(e.rezzable));
-			v.push_back("'" + Strings::Escape(e.entity_variables) + "'");
 
 			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
 		}

common/repositories/base/base_character_parcels_containers_repository.h

@@ -30,7 +30,6 @@ public:
 		uint32_t aug_slot_5;
 		uint32_t aug_slot_6;
 		uint32_t quantity;
-		uint32_t evolve_amount;
 	};
 
 	static std::string PrimaryKey()
@@ -52,7 +51,6 @@ public:
 			"aug_slot_5",
 			"aug_slot_6",
 			"quantity",
-			"evolve_amount",
 		};
 	}
 
@@ -70,7 +68,6 @@ public:
 			"aug_slot_5",
 			"aug_slot_6",
 			"quantity",
-			"evolve_amount",
 		};
 	}
 
@@ -111,18 +108,17 @@ public:
 	{
 		CharacterParcelsContainers e{};
 
-		e.id            = 0;
+		e.id         = 0;
-		e.parcels_id    = 0;
+		e.parcels_id = 0;
-		e.slot_id       = 0;
+		e.slot_id    = 0;
-		e.item_id       = 0;
+		e.item_id    = 0;
-		e.aug_slot_1    = 0;
+		e.aug_slot_1 = 0;
-		e.aug_slot_2    = 0;
+		e.aug_slot_2 = 0;
-		e.aug_slot_3    = 0;
+		e.aug_slot_3 = 0;
-		e.aug_slot_4    = 0;
+		e.aug_slot_4 = 0;
-		e.aug_slot_5    = 0;
+		e.aug_slot_5 = 0;
-		e.aug_slot_6    = 0;
+		e.aug_slot_6 = 0;
-		e.quantity      = 0;
+		e.quantity   = 0;
-		e.evolve_amount = 0;
 
 		return e;
 	}
@@ -159,18 +155,17 @@ public:
 		if (results.RowCount() == 1) {
 			CharacterParcelsContainers e{};
 
-			e.id            = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.id         = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
-			e.parcels_id    = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
+			e.parcels_id = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
-			e.slot_id       = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
+			e.slot_id    = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
-			e.item_id       = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
+			e.item_id    = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
-			e.aug_slot_1    = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
+			e.aug_slot_1 = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
-			e.aug_slot_2    = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
+			e.aug_slot_2 = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
-			e.aug_slot_3    = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
+			e.aug_slot_3 = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
-			e.aug_slot_4    = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
+			e.aug_slot_4 = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
-			e.aug_slot_5    = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
+			e.aug_slot_5 = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
-			e.aug_slot_6    = row[9] ? static_cast<uint32_t>(strtoul(row[9], nullptr, 10)) : 0;
+			e.aug_slot_6 = row[9] ? static_cast<uint32_t>(strtoul(row[9], nullptr, 10)) : 0;
-			e.quantity      = row[10] ? static_cast<uint32_t>(strtoul(row[10], nullptr, 10)) : 0;
+			e.quantity   = row[10] ? static_cast<uint32_t>(strtoul(row[10], nullptr, 10)) : 0;
-			e.evolve_amount = row[11] ? static_cast<uint32_t>(strtoul(row[11], nullptr, 10)) : 0;
 
 			return e;
 		}
@@ -214,7 +209,6 @@ public:
 		v.push_back(columns[8] + " = " + std::to_string(e.aug_slot_5));
 		v.push_back(columns[9] + " = " + std::to_string(e.aug_slot_6));
 		v.push_back(columns[10] + " = " + std::to_string(e.quantity));
-		v.push_back(columns[11] + " = " + std::to_string(e.evolve_amount));
 
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -247,7 +241,6 @@ public:
 		v.push_back(std::to_string(e.aug_slot_5));
 		v.push_back(std::to_string(e.aug_slot_6));
 		v.push_back(std::to_string(e.quantity));
-		v.push_back(std::to_string(e.evolve_amount));
 
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -288,7 +281,6 @@ public:
 			v.push_back(std::to_string(e.aug_slot_5));
 			v.push_back(std::to_string(e.aug_slot_6));
 			v.push_back(std::to_string(e.quantity));
-			v.push_back(std::to_string(e.evolve_amount));
 
 			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
 		}
@@ -322,18 +314,17 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			CharacterParcelsContainers e{};
 
-			e.id            = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.id         = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
-			e.parcels_id    = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
+			e.parcels_id = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
-			e.slot_id       = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
+			e.slot_id    = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
-			e.item_id       = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
+			e.item_id    = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
-			e.aug_slot_1    = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
+			e.aug_slot_1 = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
-			e.aug_slot_2    = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
+			e.aug_slot_2 = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
-			e.aug_slot_3    = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
+			e.aug_slot_3 = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
-			e.aug_slot_4    = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
+			e.aug_slot_4 = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
-			e.aug_slot_5    = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
+			e.aug_slot_5 = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
-			e.aug_slot_6    = row[9] ? static_cast<uint32_t>(strtoul(row[9], nullptr, 10)) : 0;
+			e.aug_slot_6 = row[9] ? static_cast<uint32_t>(strtoul(row[9], nullptr, 10)) : 0;
-			e.quantity      = row[10] ? static_cast<uint32_t>(strtoul(row[10], nullptr, 10)) : 0;
+			e.quantity   = row[10] ? static_cast<uint32_t>(strtoul(row[10], nullptr, 10)) : 0;
-			e.evolve_amount = row[11] ? static_cast<uint32_t>(strtoul(row[11], nullptr, 10)) : 0;
 
 			all_entries.push_back(e);
 		}
@@ -358,18 +349,17 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			CharacterParcelsContainers e{};
 
-			e.id            = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.id         = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
-			e.parcels_id    = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
+			e.parcels_id = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
-			e.slot_id       = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
+			e.slot_id    = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
-			e.item_id       = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
+			e.item_id    = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
-			e.aug_slot_1    = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
+			e.aug_slot_1 = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
-			e.aug_slot_2    = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
+			e.aug_slot_2 = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
-			e.aug_slot_3    = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
+			e.aug_slot_3 = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
-			e.aug_slot_4    = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
+			e.aug_slot_4 = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
-			e.aug_slot_5    = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
+			e.aug_slot_5 = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
-			e.aug_slot_6    = row[9] ? static_cast<uint32_t>(strtoul(row[9], nullptr, 10)) : 0;
+			e.aug_slot_6 = row[9] ? static_cast<uint32_t>(strtoul(row[9], nullptr, 10)) : 0;
-			e.quantity      = row[10] ? static_cast<uint32_t>(strtoul(row[10], nullptr, 10)) : 0;
+			e.quantity   = row[10] ? static_cast<uint32_t>(strtoul(row[10], nullptr, 10)) : 0;
-			e.evolve_amount = row[11] ? static_cast<uint32_t>(strtoul(row[11], nullptr, 10)) : 0;
 
 			all_entries.push_back(e);
 		}
@@ -455,7 +445,6 @@ public:
 		v.push_back(std::to_string(e.aug_slot_5));
 		v.push_back(std::to_string(e.aug_slot_6));
 		v.push_back(std::to_string(e.quantity));
-		v.push_back(std::to_string(e.evolve_amount));
 
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -489,7 +478,6 @@ public:
 			v.push_back(std::to_string(e.aug_slot_5));
 			v.push_back(std::to_string(e.aug_slot_6));
 			v.push_back(std::to_string(e.quantity));
-			v.push_back(std::to_string(e.evolve_amount));
 
 			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
 		}

common/repositories/base/base_character_parcels_repository.h

@@ -30,7 +30,6 @@ public:
 		uint32_t    aug_slot_6;
 		uint32_t    slot_id;
 		uint32_t    quantity;
-		uint32_t    evolve_amount;
 		std::string from_name;
 		std::string note;
 		time_t      sent_date;
@@ -55,7 +54,6 @@ public:
 			"aug_slot_6",
 			"slot_id",
 			"quantity",
-			"evolve_amount",
 			"from_name",
 			"note",
 			"sent_date",
@@ -76,7 +74,6 @@ public:
 			"aug_slot_6",
 			"slot_id",
 			"quantity",
-			"evolve_amount",
 			"from_name",
 			"note",
 			"UNIX_TIMESTAMP(sent_date)",
@@ -120,21 +117,20 @@ public:
 	{
 		CharacterParcels e{};
 
-		e.id            = 0;
+		e.id         = 0;
-		e.char_id       = 0;
+		e.char_id    = 0;
-		e.item_id       = 0;
+		e.item_id    = 0;
-		e.aug_slot_1    = 0;
+		e.aug_slot_1 = 0;
-		e.aug_slot_2    = 0;
+		e.aug_slot_2 = 0;
-		e.aug_slot_3    = 0;
+		e.aug_slot_3 = 0;
-		e.aug_slot_4    = 0;
+		e.aug_slot_4 = 0;
-		e.aug_slot_5    = 0;
+		e.aug_slot_5 = 0;
-		e.aug_slot_6    = 0;
+		e.aug_slot_6 = 0;
-		e.slot_id       = 0;
+		e.slot_id    = 0;
-		e.quantity      = 0;
+		e.quantity   = 0;
-		e.evolve_amount = 0;
+		e.from_name  = "";
-		e.from_name     = "";
+		e.note       = "";
-		e.note          = "";
+		e.sent_date  = 0;
-		e.sent_date     = 0;
 
 		return e;
 	}
@@ -171,21 +167,20 @@ public:
 		if (results.RowCount() == 1) {
 			CharacterParcels e{};
 
-			e.id            = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.id         = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
-			e.char_id       = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
+			e.char_id    = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
-			e.item_id       = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
+			e.item_id    = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
-			e.aug_slot_1    = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
+			e.aug_slot_1 = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
-			e.aug_slot_2    = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
+			e.aug_slot_2 = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
-			e.aug_slot_3    = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
+			e.aug_slot_3 = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
-			e.aug_slot_4    = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
+			e.aug_slot_4 = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
-			e.aug_slot_5    = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
+			e.aug_slot_5 = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
-			e.aug_slot_6    = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
+			e.aug_slot_6 = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
-			e.slot_id       = row[9] ? static_cast<uint32_t>(strtoul(row[9], nullptr, 10)) : 0;
+			e.slot_id    = row[9] ? static_cast<uint32_t>(strtoul(row[9], nullptr, 10)) : 0;
-			e.quantity      = row[10] ? static_cast<uint32_t>(strtoul(row[10], nullptr, 10)) : 0;
+			e.quantity   = row[10] ? static_cast<uint32_t>(strtoul(row[10], nullptr, 10)) : 0;
-			e.evolve_amount = row[11] ? static_cast<uint32_t>(strtoul(row[11], nullptr, 10)) : 0;
+			e.from_name  = row[11] ? row[11] : "";
-			e.from_name     = row[12] ? row[12] : "";
+			e.note       = row[12] ? row[12] : "";
-			e.note          = row[13] ? row[13] : "";
+			e.sent_date  = strtoll(row[13] ? row[13] : "-1", nullptr, 10);
-			e.sent_date     = strtoll(row[14] ? row[14] : "-1", nullptr, 10);
 
 			return e;
 		}
@@ -229,10 +224,9 @@ public:
 		v.push_back(columns[8] + " = " + std::to_string(e.aug_slot_6));
 		v.push_back(columns[9] + " = " + std::to_string(e.slot_id));
 		v.push_back(columns[10] + " = " + std::to_string(e.quantity));
-		v.push_back(columns[11] + " = " + std::to_string(e.evolve_amount));
+		v.push_back(columns[11] + " = '" + Strings::Escape(e.from_name) + "'");
-		v.push_back(columns[12] + " = '" + Strings::Escape(e.from_name) + "'");
+		v.push_back(columns[12] + " = '" + Strings::Escape(e.note) + "'");
-		v.push_back(columns[13] + " = '" + Strings::Escape(e.note) + "'");
+		v.push_back(columns[13] + " = FROM_UNIXTIME(" + (e.sent_date > 0 ? std::to_string(e.sent_date) : "null") + ")");
-		v.push_back(columns[14] + " = FROM_UNIXTIME(" + (e.sent_date > 0 ? std::to_string(e.sent_date) : "null") + ")");
 
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -265,7 +259,6 @@ public:
 		v.push_back(std::to_string(e.aug_slot_6));
 		v.push_back(std::to_string(e.slot_id));
 		v.push_back(std::to_string(e.quantity));
-		v.push_back(std::to_string(e.evolve_amount));
 		v.push_back("'" + Strings::Escape(e.from_name) + "'");
 		v.push_back("'" + Strings::Escape(e.note) + "'");
 		v.push_back("FROM_UNIXTIME(" + (e.sent_date > 0 ? std::to_string(e.sent_date) : "null") + ")");
@@ -309,7 +302,6 @@ public:
 			v.push_back(std::to_string(e.aug_slot_6));
 			v.push_back(std::to_string(e.slot_id));
 			v.push_back(std::to_string(e.quantity));
-			v.push_back(std::to_string(e.evolve_amount));
 			v.push_back("'" + Strings::Escape(e.from_name) + "'");
 			v.push_back("'" + Strings::Escape(e.note) + "'");
 			v.push_back("FROM_UNIXTIME(" + (e.sent_date > 0 ? std::to_string(e.sent_date) : "null") + ")");
@@ -346,21 +338,20 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			CharacterParcels e{};
 
-			e.id            = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.id         = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
-			e.char_id       = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
+			e.char_id    = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
-			e.item_id       = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
+			e.item_id    = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
-			e.aug_slot_1    = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
+			e.aug_slot_1 = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
-			e.aug_slot_2    = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
+			e.aug_slot_2 = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
-			e.aug_slot_3    = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
+			e.aug_slot_3 = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
-			e.aug_slot_4    = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
+			e.aug_slot_4 = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
-			e.aug_slot_5    = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
+			e.aug_slot_5 = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
-			e.aug_slot_6    = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
+			e.aug_slot_6 = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
-			e.slot_id       = row[9] ? static_cast<uint32_t>(strtoul(row[9], nullptr, 10)) : 0;
+			e.slot_id    = row[9] ? static_cast<uint32_t>(strtoul(row[9], nullptr, 10)) : 0;
-			e.quantity      = row[10] ? static_cast<uint32_t>(strtoul(row[10], nullptr, 10)) : 0;
+			e.quantity   = row[10] ? static_cast<uint32_t>(strtoul(row[10], nullptr, 10)) : 0;
-			e.evolve_amount = row[11] ? static_cast<uint32_t>(strtoul(row[11], nullptr, 10)) : 0;
+			e.from_name  = row[11] ? row[11] : "";
-			e.from_name     = row[12] ? row[12] : "";
+			e.note       = row[12] ? row[12] : "";
-			e.note          = row[13] ? row[13] : "";
+			e.sent_date  = strtoll(row[13] ? row[13] : "-1", nullptr, 10);
-			e.sent_date     = strtoll(row[14] ? row[14] : "-1", nullptr, 10);
 
 			all_entries.push_back(e);
 		}
@@ -385,21 +376,20 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			CharacterParcels e{};
 
-			e.id            = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.id         = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
-			e.char_id       = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
+			e.char_id    = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
-			e.item_id       = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
+			e.item_id    = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
-			e.aug_slot_1    = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
+			e.aug_slot_1 = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
-			e.aug_slot_2    = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
+			e.aug_slot_2 = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
-			e.aug_slot_3    = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
+			e.aug_slot_3 = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
-			e.aug_slot_4    = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
+			e.aug_slot_4 = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
-			e.aug_slot_5    = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
+			e.aug_slot_5 = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
-			e.aug_slot_6    = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
+			e.aug_slot_6 = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
-			e.slot_id       = row[9] ? static_cast<uint32_t>(strtoul(row[9], nullptr, 10)) : 0;
+			e.slot_id    = row[9] ? static_cast<uint32_t>(strtoul(row[9], nullptr, 10)) : 0;
-			e.quantity      = row[10] ? static_cast<uint32_t>(strtoul(row[10], nullptr, 10)) : 0;
+			e.quantity   = row[10] ? static_cast<uint32_t>(strtoul(row[10], nullptr, 10)) : 0;
-			e.evolve_amount = row[11] ? static_cast<uint32_t>(strtoul(row[11], nullptr, 10)) : 0;
+			e.from_name  = row[11] ? row[11] : "";
-			e.from_name     = row[12] ? row[12] : "";
+			e.note       = row[12] ? row[12] : "";
-			e.note          = row[13] ? row[13] : "";
+			e.sent_date  = strtoll(row[13] ? row[13] : "-1", nullptr, 10);
-			e.sent_date     = strtoll(row[14] ? row[14] : "-1", nullptr, 10);
 
 			all_entries.push_back(e);
 		}
@@ -485,7 +475,6 @@ public:
 		v.push_back(std::to_string(e.aug_slot_6));
 		v.push_back(std::to_string(e.slot_id));
 		v.push_back(std::to_string(e.quantity));
-		v.push_back(std::to_string(e.evolve_amount));
 		v.push_back("'" + Strings::Escape(e.from_name) + "'");
 		v.push_back("'" + Strings::Escape(e.note) + "'");
 		v.push_back("FROM_UNIXTIME(" + (e.sent_date > 0 ? std::to_string(e.sent_date) : "null") + ")");
@@ -522,7 +511,6 @@ public:
 			v.push_back(std::to_string(e.aug_slot_6));
 			v.push_back(std::to_string(e.slot_id));
 			v.push_back(std::to_string(e.quantity));
-			v.push_back(std::to_string(e.evolve_amount));
 			v.push_back("'" + Strings::Escape(e.from_name) + "'");
 			v.push_back("'" + Strings::Escape(e.note) + "'");
 			v.push_back("FROM_UNIXTIME(" + (e.sent_date > 0 ? std::to_string(e.sent_date) : "null") + ")");

common/repositories/base/base_character_stats_record_repository.h

@@ -70,7 +70,6 @@ public:
 		int32_t     endurance_regen;
 		int32_t     shielding;
 		int32_t     spell_damage;
-		int32_t     heal_amount;
 		int32_t     spell_shielding;
 		int32_t     strikethrough;
 		int32_t     stun_resist;
@@ -155,7 +154,6 @@ public:
 			"endurance_regen",
 			"shielding",
 			"spell_damage",
-			"heal_amount",
 			"spell_shielding",
 			"strikethrough",
 			"stun_resist",
@@ -236,7 +234,6 @@ public:
 			"endurance_regen",
 			"shielding",
 			"spell_damage",
-			"heal_amount",
 			"spell_shielding",
 			"strikethrough",
 			"stun_resist",
@@ -351,7 +348,6 @@ public:
 		e.endurance_regen          = 0;
 		e.shielding                = 0;
 		e.spell_damage             = 0;
-		e.heal_amount              = 0;
 		e.spell_shielding          = 0;
 		e.strikethrough            = 0;
 		e.stun_resist              = 0;
@@ -462,30 +458,29 @@ public:
 			e.endurance_regen          = row[48] ? static_cast<int32_t>(atoi(row[48])) : 0;
 			e.shielding                = row[49] ? static_cast<int32_t>(atoi(row[49])) : 0;
 			e.spell_damage             = row[50] ? static_cast<int32_t>(atoi(row[50])) : 0;
-			e.heal_amount              = row[51] ? static_cast<int32_t>(atoi(row[51])) : 0;
+			e.spell_shielding          = row[51] ? static_cast<int32_t>(atoi(row[51])) : 0;
-			e.spell_shielding          = row[52] ? static_cast<int32_t>(atoi(row[52])) : 0;
+			e.strikethrough            = row[52] ? static_cast<int32_t>(atoi(row[52])) : 0;
-			e.strikethrough            = row[53] ? static_cast<int32_t>(atoi(row[53])) : 0;
+			e.stun_resist              = row[53] ? static_cast<int32_t>(atoi(row[53])) : 0;
-			e.stun_resist              = row[54] ? static_cast<int32_t>(atoi(row[54])) : 0;
+			e.backstab                 = row[54] ? static_cast<int32_t>(atoi(row[54])) : 0;
-			e.backstab                 = row[55] ? static_cast<int32_t>(atoi(row[55])) : 0;
+			e.wind                     = row[55] ? static_cast<int32_t>(atoi(row[55])) : 0;
-			e.wind                     = row[56] ? static_cast<int32_t>(atoi(row[56])) : 0;
+			e.brass                    = row[56] ? static_cast<int32_t>(atoi(row[56])) : 0;
-			e.brass                    = row[57] ? static_cast<int32_t>(atoi(row[57])) : 0;
+			e.string                   = row[57] ? static_cast<int32_t>(atoi(row[57])) : 0;
-			e.string                   = row[58] ? static_cast<int32_t>(atoi(row[58])) : 0;
+			e.percussion               = row[58] ? static_cast<int32_t>(atoi(row[58])) : 0;
-			e.percussion               = row[59] ? static_cast<int32_t>(atoi(row[59])) : 0;
+			e.singing                  = row[59] ? static_cast<int32_t>(atoi(row[59])) : 0;
-			e.singing                  = row[60] ? static_cast<int32_t>(atoi(row[60])) : 0;
+			e.baking                   = row[60] ? static_cast<int32_t>(atoi(row[60])) : 0;
-			e.baking                   = row[61] ? static_cast<int32_t>(atoi(row[61])) : 0;
+			e.alchemy                  = row[61] ? static_cast<int32_t>(atoi(row[61])) : 0;
-			e.alchemy                  = row[62] ? static_cast<int32_t>(atoi(row[62])) : 0;
+			e.tailoring                = row[62] ? static_cast<int32_t>(atoi(row[62])) : 0;
-			e.tailoring                = row[63] ? static_cast<int32_t>(atoi(row[63])) : 0;
+			e.blacksmithing            = row[63] ? static_cast<int32_t>(atoi(row[63])) : 0;
-			e.blacksmithing            = row[64] ? static_cast<int32_t>(atoi(row[64])) : 0;
+			e.fletching                = row[64] ? static_cast<int32_t>(atoi(row[64])) : 0;
-			e.fletching                = row[65] ? static_cast<int32_t>(atoi(row[65])) : 0;
+			e.brewing                  = row[65] ? static_cast<int32_t>(atoi(row[65])) : 0;
-			e.brewing                  = row[66] ? static_cast<int32_t>(atoi(row[66])) : 0;
+			e.jewelry                  = row[66] ? static_cast<int32_t>(atoi(row[66])) : 0;
-			e.jewelry                  = row[67] ? static_cast<int32_t>(atoi(row[67])) : 0;
+			e.pottery                  = row[67] ? static_cast<int32_t>(atoi(row[67])) : 0;
-			e.pottery                  = row[68] ? static_cast<int32_t>(atoi(row[68])) : 0;
+			e.research                 = row[68] ? static_cast<int32_t>(atoi(row[68])) : 0;
-			e.research                 = row[69] ? static_cast<int32_t>(atoi(row[69])) : 0;
+			e.alcohol                  = row[69] ? static_cast<int32_t>(atoi(row[69])) : 0;
-			e.alcohol                  = row[70] ? static_cast<int32_t>(atoi(row[70])) : 0;
+			e.fishing                  = row[70] ? static_cast<int32_t>(atoi(row[70])) : 0;
-			e.fishing                  = row[71] ? static_cast<int32_t>(atoi(row[71])) : 0;
+			e.tinkering                = row[71] ? static_cast<int32_t>(atoi(row[71])) : 0;
-			e.tinkering                = row[72] ? static_cast<int32_t>(atoi(row[72])) : 0;
+			e.created_at               = strtoll(row[72] ? row[72] : "-1", nullptr, 10);
-			e.created_at               = strtoll(row[73] ? row[73] : "-1", nullptr, 10);
+			e.updated_at               = strtoll(row[73] ? row[73] : "-1", nullptr, 10);
-			e.updated_at               = strtoll(row[74] ? row[74] : "-1", nullptr, 10);
 
 			return e;
 		}
@@ -570,30 +565,29 @@ public:
 		v.push_back(columns[48] + " = " + std::to_string(e.endurance_regen));
 		v.push_back(columns[49] + " = " + std::to_string(e.shielding));
 		v.push_back(columns[50] + " = " + std::to_string(e.spell_damage));
-		v.push_back(columns[51] + " = " + std::to_string(e.heal_amount));
+		v.push_back(columns[51] + " = " + std::to_string(e.spell_shielding));
-		v.push_back(columns[52] + " = " + std::to_string(e.spell_shielding));
+		v.push_back(columns[52] + " = " + std::to_string(e.strikethrough));
-		v.push_back(columns[53] + " = " + std::to_string(e.strikethrough));
+		v.push_back(columns[53] + " = " + std::to_string(e.stun_resist));
-		v.push_back(columns[54] + " = " + std::to_string(e.stun_resist));
+		v.push_back(columns[54] + " = " + std::to_string(e.backstab));
-		v.push_back(columns[55] + " = " + std::to_string(e.backstab));
+		v.push_back(columns[55] + " = " + std::to_string(e.wind));
-		v.push_back(columns[56] + " = " + std::to_string(e.wind));
+		v.push_back(columns[56] + " = " + std::to_string(e.brass));
-		v.push_back(columns[57] + " = " + std::to_string(e.brass));
+		v.push_back(columns[57] + " = " + std::to_string(e.string));
-		v.push_back(columns[58] + " = " + std::to_string(e.string));
+		v.push_back(columns[58] + " = " + std::to_string(e.percussion));
-		v.push_back(columns[59] + " = " + std::to_string(e.percussion));
+		v.push_back(columns[59] + " = " + std::to_string(e.singing));
-		v.push_back(columns[60] + " = " + std::to_string(e.singing));
+		v.push_back(columns[60] + " = " + std::to_string(e.baking));
-		v.push_back(columns[61] + " = " + std::to_string(e.baking));
+		v.push_back(columns[61] + " = " + std::to_string(e.alchemy));
-		v.push_back(columns[62] + " = " + std::to_string(e.alchemy));
+		v.push_back(columns[62] + " = " + std::to_string(e.tailoring));
-		v.push_back(columns[63] + " = " + std::to_string(e.tailoring));
+		v.push_back(columns[63] + " = " + std::to_string(e.blacksmithing));
-		v.push_back(columns[64] + " = " + std::to_string(e.blacksmithing));
+		v.push_back(columns[64] + " = " + std::to_string(e.fletching));
-		v.push_back(columns[65] + " = " + std::to_string(e.fletching));
+		v.push_back(columns[65] + " = " + std::to_string(e.brewing));
-		v.push_back(columns[66] + " = " + std::to_string(e.brewing));
+		v.push_back(columns[66] + " = " + std::to_string(e.jewelry));
-		v.push_back(columns[67] + " = " + std::to_string(e.jewelry));
+		v.push_back(columns[67] + " = " + std::to_string(e.pottery));
-		v.push_back(columns[68] + " = " + std::to_string(e.pottery));
+		v.push_back(columns[68] + " = " + std::to_string(e.research));
-		v.push_back(columns[69] + " = " + std::to_string(e.research));
+		v.push_back(columns[69] + " = " + std::to_string(e.alcohol));
-		v.push_back(columns[70] + " = " + std::to_string(e.alcohol));
+		v.push_back(columns[70] + " = " + std::to_string(e.fishing));
-		v.push_back(columns[71] + " = " + std::to_string(e.fishing));
+		v.push_back(columns[71] + " = " + std::to_string(e.tinkering));
-		v.push_back(columns[72] + " = " + std::to_string(e.tinkering));
+		v.push_back(columns[72] + " = FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");
-		v.push_back(columns[73] + " = FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");
+		v.push_back(columns[73] + " = FROM_UNIXTIME(" + (e.updated_at > 0 ? std::to_string(e.updated_at) : "null") + ")");
-		v.push_back(columns[74] + " = FROM_UNIXTIME(" + (e.updated_at > 0 ? std::to_string(e.updated_at) : "null") + ")");
 
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -666,7 +660,6 @@ public:
 		v.push_back(std::to_string(e.endurance_regen));
 		v.push_back(std::to_string(e.shielding));
 		v.push_back(std::to_string(e.spell_damage));
-		v.push_back(std::to_string(e.heal_amount));
 		v.push_back(std::to_string(e.spell_shielding));
 		v.push_back(std::to_string(e.strikethrough));
 		v.push_back(std::to_string(e.stun_resist));
@@ -770,7 +763,6 @@ public:
 			v.push_back(std::to_string(e.endurance_regen));
 			v.push_back(std::to_string(e.shielding));
 			v.push_back(std::to_string(e.spell_damage));
-			v.push_back(std::to_string(e.heal_amount));
 			v.push_back(std::to_string(e.spell_shielding));
 			v.push_back(std::to_string(e.strikethrough));
 			v.push_back(std::to_string(e.stun_resist));
@@ -878,30 +870,29 @@ public:
 			e.endurance_regen          = row[48] ? static_cast<int32_t>(atoi(row[48])) : 0;
 			e.shielding                = row[49] ? static_cast<int32_t>(atoi(row[49])) : 0;
 			e.spell_damage             = row[50] ? static_cast<int32_t>(atoi(row[50])) : 0;
-			e.heal_amount              = row[51] ? static_cast<int32_t>(atoi(row[51])) : 0;
+			e.spell_shielding          = row[51] ? static_cast<int32_t>(atoi(row[51])) : 0;
-			e.spell_shielding          = row[52] ? static_cast<int32_t>(atoi(row[52])) : 0;
+			e.strikethrough            = row[52] ? static_cast<int32_t>(atoi(row[52])) : 0;
-			e.strikethrough            = row[53] ? static_cast<int32_t>(atoi(row[53])) : 0;
+			e.stun_resist              = row[53] ? static_cast<int32_t>(atoi(row[53])) : 0;
-			e.stun_resist              = row[54] ? static_cast<int32_t>(atoi(row[54])) : 0;
+			e.backstab                 = row[54] ? static_cast<int32_t>(atoi(row[54])) : 0;
-			e.backstab                 = row[55] ? static_cast<int32_t>(atoi(row[55])) : 0;
+			e.wind                     = row[55] ? static_cast<int32_t>(atoi(row[55])) : 0;
-			e.wind                     = row[56] ? static_cast<int32_t>(atoi(row[56])) : 0;
+			e.brass                    = row[56] ? static_cast<int32_t>(atoi(row[56])) : 0;
-			e.brass                    = row[57] ? static_cast<int32_t>(atoi(row[57])) : 0;
+			e.string                   = row[57] ? static_cast<int32_t>(atoi(row[57])) : 0;
-			e.string                   = row[58] ? static_cast<int32_t>(atoi(row[58])) : 0;
+			e.percussion               = row[58] ? static_cast<int32_t>(atoi(row[58])) : 0;
-			e.percussion               = row[59] ? static_cast<int32_t>(atoi(row[59])) : 0;
+			e.singing                  = row[59] ? static_cast<int32_t>(atoi(row[59])) : 0;
-			e.singing                  = row[60] ? static_cast<int32_t>(atoi(row[60])) : 0;
+			e.baking                   = row[60] ? static_cast<int32_t>(atoi(row[60])) : 0;
-			e.baking                   = row[61] ? static_cast<int32_t>(atoi(row[61])) : 0;
+			e.alchemy                  = row[61] ? static_cast<int32_t>(atoi(row[61])) : 0;
-			e.alchemy                  = row[62] ? static_cast<int32_t>(atoi(row[62])) : 0;
+			e.tailoring                = row[62] ? static_cast<int32_t>(atoi(row[62])) : 0;
-			e.tailoring                = row[63] ? static_cast<int32_t>(atoi(row[63])) : 0;
+			e.blacksmithing            = row[63] ? static_cast<int32_t>(atoi(row[63])) : 0;
-			e.blacksmithing            = row[64] ? static_cast<int32_t>(atoi(row[64])) : 0;
+			e.fletching                = row[64] ? static_cast<int32_t>(atoi(row[64])) : 0;
-			e.fletching                = row[65] ? static_cast<int32_t>(atoi(row[65])) : 0;
+			e.brewing                  = row[65] ? static_cast<int32_t>(atoi(row[65])) : 0;
-			e.brewing                  = row[66] ? static_cast<int32_t>(atoi(row[66])) : 0;
+			e.jewelry                  = row[66] ? static_cast<int32_t>(atoi(row[66])) : 0;
-			e.jewelry                  = row[67] ? static_cast<int32_t>(atoi(row[67])) : 0;
+			e.pottery                  = row[67] ? static_cast<int32_t>(atoi(row[67])) : 0;
-			e.pottery                  = row[68] ? static_cast<int32_t>(atoi(row[68])) : 0;
+			e.research                 = row[68] ? static_cast<int32_t>(atoi(row[68])) : 0;
-			e.research                 = row[69] ? static_cast<int32_t>(atoi(row[69])) : 0;
+			e.alcohol                  = row[69] ? static_cast<int32_t>(atoi(row[69])) : 0;
-			e.alcohol                  = row[70] ? static_cast<int32_t>(atoi(row[70])) : 0;
+			e.fishing                  = row[70] ? static_cast<int32_t>(atoi(row[70])) : 0;
-			e.fishing                  = row[71] ? static_cast<int32_t>(atoi(row[71])) : 0;
+			e.tinkering                = row[71] ? static_cast<int32_t>(atoi(row[71])) : 0;
-			e.tinkering                = row[72] ? static_cast<int32_t>(atoi(row[72])) : 0;
+			e.created_at               = strtoll(row[72] ? row[72] : "-1", nullptr, 10);
-			e.created_at               = strtoll(row[73] ? row[73] : "-1", nullptr, 10);
+			e.updated_at               = strtoll(row[73] ? row[73] : "-1", nullptr, 10);
-			e.updated_at               = strtoll(row[74] ? row[74] : "-1", nullptr, 10);
 
 			all_entries.push_back(e);
 		}
@@ -977,30 +968,29 @@ public:
 			e.endurance_regen          = row[48] ? static_cast<int32_t>(atoi(row[48])) : 0;
 			e.shielding                = row[49] ? static_cast<int32_t>(atoi(row[49])) : 0;
 			e.spell_damage             = row[50] ? static_cast<int32_t>(atoi(row[50])) : 0;
-			e.heal_amount              = row[51] ? static_cast<int32_t>(atoi(row[51])) : 0;
+			e.spell_shielding          = row[51] ? static_cast<int32_t>(atoi(row[51])) : 0;
-			e.spell_shielding          = row[52] ? static_cast<int32_t>(atoi(row[52])) : 0;
+			e.strikethrough            = row[52] ? static_cast<int32_t>(atoi(row[52])) : 0;
-			e.strikethrough            = row[53] ? static_cast<int32_t>(atoi(row[53])) : 0;
+			e.stun_resist              = row[53] ? static_cast<int32_t>(atoi(row[53])) : 0;
-			e.stun_resist              = row[54] ? static_cast<int32_t>(atoi(row[54])) : 0;
+			e.backstab                 = row[54] ? static_cast<int32_t>(atoi(row[54])) : 0;
-			e.backstab                 = row[55] ? static_cast<int32_t>(atoi(row[55])) : 0;
+			e.wind                     = row[55] ? static_cast<int32_t>(atoi(row[55])) : 0;
-			e.wind                     = row[56] ? static_cast<int32_t>(atoi(row[56])) : 0;
+			e.brass                    = row[56] ? static_cast<int32_t>(atoi(row[56])) : 0;
-			e.brass                    = row[57] ? static_cast<int32_t>(atoi(row[57])) : 0;
+			e.string                   = row[57] ? static_cast<int32_t>(atoi(row[57])) : 0;
-			e.string                   = row[58] ? static_cast<int32_t>(atoi(row[58])) : 0;
+			e.percussion               = row[58] ? static_cast<int32_t>(atoi(row[58])) : 0;
-			e.percussion               = row[59] ? static_cast<int32_t>(atoi(row[59])) : 0;
+			e.singing                  = row[59] ? static_cast<int32_t>(atoi(row[59])) : 0;
-			e.singing                  = row[60] ? static_cast<int32_t>(atoi(row[60])) : 0;
+			e.baking                   = row[60] ? static_cast<int32_t>(atoi(row[60])) : 0;
-			e.baking                   = row[61] ? static_cast<int32_t>(atoi(row[61])) : 0;
+			e.alchemy                  = row[61] ? static_cast<int32_t>(atoi(row[61])) : 0;
-			e.alchemy                  = row[62] ? static_cast<int32_t>(atoi(row[62])) : 0;
+			e.tailoring                = row[62] ? static_cast<int32_t>(atoi(row[62])) : 0;
-			e.tailoring                = row[63] ? static_cast<int32_t>(atoi(row[63])) : 0;
+			e.blacksmithing            = row[63] ? static_cast<int32_t>(atoi(row[63])) : 0;
-			e.blacksmithing            = row[64] ? static_cast<int32_t>(atoi(row[64])) : 0;
+			e.fletching                = row[64] ? static_cast<int32_t>(atoi(row[64])) : 0;
-			e.fletching                = row[65] ? static_cast<int32_t>(atoi(row[65])) : 0;
+			e.brewing                  = row[65] ? static_cast<int32_t>(atoi(row[65])) : 0;
-			e.brewing                  = row[66] ? static_cast<int32_t>(atoi(row[66])) : 0;
+			e.jewelry                  = row[66] ? static_cast<int32_t>(atoi(row[66])) : 0;
-			e.jewelry                  = row[67] ? static_cast<int32_t>(atoi(row[67])) : 0;
+			e.pottery                  = row[67] ? static_cast<int32_t>(atoi(row[67])) : 0;
-			e.pottery                  = row[68] ? static_cast<int32_t>(atoi(row[68])) : 0;
+			e.research                 = row[68] ? static_cast<int32_t>(atoi(row[68])) : 0;
-			e.research                 = row[69] ? static_cast<int32_t>(atoi(row[69])) : 0;
+			e.alcohol                  = row[69] ? static_cast<int32_t>(atoi(row[69])) : 0;
-			e.alcohol                  = row[70] ? static_cast<int32_t>(atoi(row[70])) : 0;
+			e.fishing                  = row[70] ? static_cast<int32_t>(atoi(row[70])) : 0;
-			e.fishing                  = row[71] ? static_cast<int32_t>(atoi(row[71])) : 0;
+			e.tinkering                = row[71] ? static_cast<int32_t>(atoi(row[71])) : 0;
-			e.tinkering                = row[72] ? static_cast<int32_t>(atoi(row[72])) : 0;
+			e.created_at               = strtoll(row[72] ? row[72] : "-1", nullptr, 10);
-			e.created_at               = strtoll(row[73] ? row[73] : "-1", nullptr, 10);
+			e.updated_at               = strtoll(row[73] ? row[73] : "-1", nullptr, 10);
-			e.updated_at               = strtoll(row[74] ? row[74] : "-1", nullptr, 10);
 
 			all_entries.push_back(e);
 		}
@@ -1126,7 +1116,6 @@ public:
 		v.push_back(std::to_string(e.endurance_regen));
 		v.push_back(std::to_string(e.shielding));
 		v.push_back(std::to_string(e.spell_damage));
-		v.push_back(std::to_string(e.heal_amount));
 		v.push_back(std::to_string(e.spell_shielding));
 		v.push_back(std::to_string(e.strikethrough));
 		v.push_back(std::to_string(e.stun_resist));
@@ -1223,7 +1212,6 @@ public:
 			v.push_back(std::to_string(e.endurance_regen));
 			v.push_back(std::to_string(e.shielding));
 			v.push_back(std::to_string(e.spell_damage));
-			v.push_back(std::to_string(e.heal_amount));
 			v.push_back(std::to_string(e.spell_shielding));
 			v.push_back(std::to_string(e.strikethrough));
 			v.push_back(std::to_string(e.stun_resist));