pch

Incremental
Win gate
2026-05-22 16:28:28 +00:00 · 2023-12-16 21:03:58 -06:00 · 2023-12-16 19:44:33 -06:00 · 2023-12-16 19:36:42 -06:00 · 2023-12-16 19:28:55 -06:00 · 2023-12-16 19:23:08 -06:00
722 changed files with 47609 additions and 93365 deletions
@@ -1,6 +0,0 @@
-!Makefile
-base/*.sql
-base/*.zip
-base/db/
-base/maps/
-!base/expansion/Makefile
@@ -1,9 +0,0 @@
-# This is a "dev" image for running eqemu in development, also for dev containers
-ARG USERNAME=user-name-goes-here
-ARG USER_UID=1000
-ARG USER_GID=$USER_UID
-
-FROM --platform=linux/arm64 mcr.microsoft.com/devcontainers/base:debian
-RUN sudo apt update && sudo apt install -y --no-install-recommends build-essential libtool cmake curl debconf-utils git libluabind-dev libsodium-dev liblua5.2-0 liblua5.2-dev libmariadb-dev libssl-dev minizip make mariadb-client locales nano open-vm-tools unzip uuid-dev iputils-ping wget libcurl4-openssl-dev gdb libyaml-cpp-dev ccache ninja-build pv mariadb-server libperl-dev libjson-perl libio-stringy-perl liblua5.1-dev libluabind-dev libboost-dev mariadb-server valgrind telnet libgoogle-perftools-dev google-perftools
-
-USER $USERNAME
@@ -1,9 +0,0 @@
-# This is a "dev" image for running eqemu in development, also for dev containers
-ARG USERNAME=user-name-goes-here
-ARG USER_UID=1000
-ARG USER_GID=$USER_UID
-
-FROM mcr.microsoft.com/devcontainers/base:debian
-RUN sudo apt update && sudo apt install -y --no-install-recommends build-essential libtool cmake curl debconf-utils git libluabind-dev libsodium-dev liblua5.2-0 liblua5.2-dev libmariadb-dev libssl-dev minizip make mariadb-client locales nano open-vm-tools unzip uuid-dev iputils-ping wget libcurl4-openssl-dev gdb libyaml-cpp-dev ccache ninja-build pv mariadb-server libperl-dev libjson-perl libio-stringy-perl liblua5.1-dev libluabind-dev libboost-dev mariadb-server valgrind telnet libgoogle-perftools-dev google-perftools
-
-USER $USERNAME
@@ -1,284 +0,0 @@
-NAME := eqemu-server
-.ONESHELL:
-
-DOCKER_ARGS := --rm  --name ${NAME} -v $$PWD:/src -w /src ${NAME}
-DOCKER_ARM64_ARGS := --rm --platform linux/arm64 --name ${NAME}-arm64 -v $$PWD:/src -w /src ${NAME}-arm64
-
-.PHONY: build
-build:
-ifeq ($(findstring .devcontainer,$(CURDIR)),.devcontainer)
-	@make -C ../ -f .devcontainer/Makefile build --no-print-directory
-	exit
-endif
-	cd build$$BUILD_SUFFIX && cmake --build . --config Release --target all --
-
-.PHONY: cmake
-cmake:
-ifeq ($(findstring .devcontainer,$(CURDIR)),.devcontainer)
-	@make -C ../ -f .devcontainer/Makefile cmake --no-print-directory
-	exit
-endif
-	@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 ..
-
-clean:
-ifneq (,$(findstring .devcontainer,$$PWD))
-	@make -C ../ -f .devcontainer/Makefile clean --no-print-directory
-endif
-	rm -rf build
-
-docker-cmake:
-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 base/maps
-	@cd base/maps && wget -nc https://github.com/Akkadius/eqemu-maps/archive/refs/heads/master.zip
-	@cd base/maps && unzip -o master.zip
-	@cd base/maps && mv eqemu-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:
-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:
-ifeq ($(findstring .devcontainer,$(CURDIR)),.devcontainer)
-	@make -C ../ -f .devcontainer/Makefile login --no-print-directory
-	exit
-endif
-	cd build/bin && ./loginserver
-
-# Runs shared_memory binary
-.PHONY: shared
-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:
-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
-
-# Runs world binary
-.PHONY: world
-world:
-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:
-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:
-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
-
-valgrind-%:
-ifeq ($(findstring .devcontainer,$(CURDIR)),.devcontainer)
-	@make -C ../ -f .devcontainer/Makefile valgrind --no-print-directory
-	exit
-endif
-	cd build/bin && valgrind --leak-check=full --show-leak-kinds=all --track-origins=yes --verbose --log-file=logs/$*.valgrind.log ./$*
-
-# Start mariaDB standalone
-.PHONY: mariadb
-mariadb:
-	@sudo service mariadb start
-
-.PHONY: inject-mariadb
-inject-mariadb:
-	-sudo service mariadb start
-	-mkdir -p base/db/
-	-sudo mariadb -e 'DROP DATABASE IF EXISTS peq;'
-	-sudo mariadb -e 'CREATE DATABASE peq;'
-	-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 base/db/db.sql.zip))
-	@echo "base/db.sql.zip not found. Downloading latest from https://db.projecteq.net/"
-	wget -nc https://db.projecteq.net/latest -O base/db/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"
-	@echo "MariaDB is now injected."
-
-.PHONY: gm-%
-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:
-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
-	@if [ ! -f "build/depends/dependency_graph.py" ]; then \
-		wget https://raw.githubusercontent.com/pvigier/dependency-graph/master/dependency_graph.py -O build/depends/dependency_graph.py; \
-	fi
-	@echo "Generating dependency graphs (This may take a while)..."
-	@echo "Login..."
-	time python3 build/depends/dependency_graph.py -f png login build/depends/login.dot
-	@echo "World..."
-	time python3 build/depends/dependency_graph.py -f png world build/depends/world.dot
-	@echo "Zone..."
-	time python3 build/depends/dependency_graph.py -f png zone build/depends/zone.dot
-	@echo "Common..."
-	time python3 build/depends/dependency_graph.py -f png common build/depends/common.dot
-
-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
-
-cpu-zone:
-ifeq ($(findstring .devcontainer,$(CURDIR)),.devcontainer)
-	@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:
-ifeq ($(findstring .devcontainer,$(CURDIR)),.devcontainer)
-	@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:
-ifeq ($(findstring .devcontainer,$(CURDIR)),.devcontainer)
-	@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:
-ifeq ($(findstring .devcontainer,$(CURDIR)),.devcontainer)
-	@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
@@ -1,73 +0,0 @@
-{
-	"server": {
-		"zones": {
-			"defaultstatus": "0",
-			"ports": {
-				"low": "7000",
-				"high": "7400"
-			}
-		},
-		"qsdatabase": {
-			"host": "127.0.0.1",
-			"port": "3306",
-			"username": "peq",
-			"password": "peqpass",
-			"db": "peq"
-		},
-		"chatserver": {
-			"port": "7778",
-			"host": ""
-		},
-		"mailserver": {
-			"host": "",
-			"port": "7778"
-		},
-		"webinterface": {
-			"port": "9081"
-		},
-		"world": {
-			"longname": "New Devbox",
-			"address": "192.168.1.100",
-			"localaddress": "192.168.1.100",
-			"loginserver1": {
-				"account": "",
-				"password": "",
-				"legacy": 0,
-				"host": "login.projecteq.net",
-				"port": "5998"
-			},
-			"tcp": {
-				"ip": "127.0.0.1",
-				"port": "9001"
-			},
-			"telnet": {
-				"ip": "0.0.0.0",
-				"port": "9000",
-				"enabled": "true"
-			},
-			"key": "random-generate-here",
-			"http": {
-				"port": "9080",
-				"enabled": "true",
-				"mimefile": "mime.types"
-			},
-			"shortname": "dev"
-		},
-		"database": {
-			"db": "peq",
-			"host": "127.0.0.1",
-			"port": "3306",
-			"username": "peq",
-			"password": "peqpass"
-		},
-		"files": {
-			"opcodes": "assets/patches/opcodes.conf",
-			"mail_opcodes": "assets/patches/mail_opcodes.conf"
-		},
-		"directories": {
-			"patches": "assets/patches/",
-			"opcodes": "assets/patches/",
-			"plugins": "quests/plugins/"
-		}
-	}
-}
@@ -1,37 +0,0 @@
-{
-	"database": {
-		"host": "127.0.0.1",
-		"port": "3306",
-		"db": "peq",
-		"user": "peq",
-		"password": "peqpass"
-	},
-	"account": {
-		"auto_create_accounts": true
-	},
-	"worldservers": {
-		"unregistered_allowed": true,
-		"reject_duplicate_servers": false
-	},
-	"web_api": {
-		"enabled": true,
-		"port": 6000
-	},
-	"security": {
-		"mode": 14,
-		"allow_password_login": true,
-		"allow_token_login": true
-	},
-	"logging": {
-		"trace": false,
-		"world_trace": false,
-		"dump_packets_in": false,
-		"dump_packets_out": false
-	},
-	"client_configuration": {
-		"titanium_port": 5998,
-		"titanium_opcodes": "assets/patches/login_opcodes.conf",
-		"sod_port": 5999,
-		"sod_opcodes": "assets/patches/login_opcodes_sod.conf"
-	}
-}
@@ -1,49 +0,0 @@
-// For format details, see https://aka.ms/devcontainer.json. For config options, see the
-// README at: https://github.com/devcontainers/templates/tree/main/src/ubuntu
-{
-	"name": "eqemu",
-	"build": {
-		"dockerfile": "Dockerfile.debian.dev"
-	},
-	"appPort": [
-		"5998:5998/udp",
-		"7000:7000/udp",
-		"7001:7001/udp",
-		"7002:7002/udp",
-		"7003:7003/udp",
-		"7004:7004/udp",
-		"7005:7005/udp",
-		"9000:9000/udp",
-		"9001:9001/udp"
-	],
-	"forwardPorts": [
-		3306
-	],
-	"remoteEnv": {
-		"LOCALWSF": "${localWorkspaceFolder}",
-		"CONTAINERWSF": "${containerWorkspaceFolder}"
-	},
-	"containerUser": "vscode",
-	// add ptrace
-	"runArgs": [
-		"--cap-add=SYS_PTRACE",
-		"--security-opt",
-		"seccomp=unconfined"
-	],
-	"customizations": {
-		"vscode": {
-			"extensions": [
-				"ms-vscode.cpptools-extension-pack",
-				"vilicvane.sensitive-replace",
-				"maattdd.gitless",
-				"bibhasdn.unique-lines",
-				"GitHub.copilot",
-				"xackery.make-magic",
-				"Gruntfuggly.todo-tree",
-				"ms-vscode.cmake-tools"
-			]
-		}
-	},
-	"workspaceFolder": "/src",
-	"workspaceMount": "source=${localWorkspaceFolder},target=/src,type=bind,consistency=cached"
-}
@@ -15,7 +15,7 @@ volumes:

 steps:
  - name: Build Linux X64
-    image: akkadius/eqemu-server:v14
+    image: akkadius/eqemu-server:v13
    environment:
      GITHUB_TOKEN:
        from_secret: GH_RELEASE_GITHUB_API_TOKEN
@@ -61,6 +61,9 @@ bin/
 compile_flags.txt
 .cache/

+# vscode generated settings
+.vscode/
+
 # Build pipeline
 !utils/scripts/build/
 !utils/scripts/build/should-release/should-release
@@ -1,23 +0,0 @@
-{
-    "configurations": [
-        {
-            "name": "Linux",
-            "includePath": [
-                "${default}",
-                "${workspaceFolder}/submodules/fmt/include",
-                "${workspaceFolder}/submodules/cereal/include",
-                "${workspaceFolder}/submodules/glm",
-                "${workspaceFolder}/submodules/libuv/include"
-            ],
-            "defines": [
-                "LUA_EQEMU=1"
-            ],
-            "compilerPath": "/usr/bin/gcc",
-            "cStandard": "c17",
-            "cppStandard": "gnu++17",
-            "intelliSenseMode": "linux-gcc-x64",
-            "configurationProvider": "ms-vscode.cmake-tools"
-        }
-    ],
-    "version": 4
-}
@@ -1,173 +0,0 @@
-{
-	// Use IntelliSense to learn about possible attributes.
-	// Hover to view descriptions of existing attributes.
-	// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-	"version": "0.2.0",
-	"configurations": [
-		{
-			"name": "(gdb) attach",
-			"type": "cppdbg",
-			"request": "attach",
-			"program": "${workspaceFolder}/build/bin/world",
-			"MIMode": "gdb",
-			"setupCommands": [
-				{
-					"description": "Enable pretty-printing for gdb",
-					"text": "-enable-pretty-printing",
-					"ignoreFailures": true
-				},
-				{
-					"description": "Set Disassembly Flavor to Intel",
-					"text": "-gdb-set disassembly-flavor intel",
-					"ignoreFailures": true
-				}
-			]
-		},
-		{
-			"name": "(gdb) shared_memory",
-			"type": "cppdbg",
-			"request": "launch",
-			"program": "${workspaceFolder}/build/bin/shared_memory",
-			"cwd": "${workspaceFolder}/build/bin",
-			"MIMode": "gdb",
-			"setupCommands": [
-				{
-					"description": "Enable pretty-printing for gdb",
-					"text": "-enable-pretty-printing",
-					"ignoreFailures": true
-				},
-				{
-					"description": "Set Disassembly Flavor to Intel",
-					"text": "-gdb-set disassembly-flavor intel",
-					"ignoreFailures": true
-				}
-			]
-		},
-		{
-			"name": "(gdb) world",
-			"type": "cppdbg",
-			"request": "launch",
-			"program": "${workspaceFolder}/build/bin/world",
-			"cwd": "${workspaceFolder}/build/bin",
-			"MIMode": "gdb",
-			"setupCommands": [
-				{
-					"description": "Enable pretty-printing for gdb",
-					"text": "-enable-pretty-printing",
-					"ignoreFailures": true
-				},
-				{
-					"description": "Set Disassembly Flavor to Intel",
-					"text": "-gdb-set disassembly-flavor intel",
-					"ignoreFailures": true
-				}
-			]
-		},
-		{
-			"name": "(gdb) zone",
-			"type": "cppdbg",
-			"request": "launch",
-			"program": "${workspaceFolder}/build/bin/zone",
-			"cwd": "${workspaceFolder}/build/bin",
-			"args": [
-				"",
-			],
-			"MIMode": "gdb",
-			"setupCommands": [
-				{
-					"description": "Enable pretty-printing for gdb",
-					"text": "-enable-pretty-printing",
-					"ignoreFailures": true
-				},
-				{
-					"description": "Set Disassembly Flavor to Intel",
-					"text": "-gdb-set disassembly-flavor intel",
-					"ignoreFailures": true
-				}
-			]
-		},
-		{
-			"name": "(gdb) zone neriakb",
-			"type": "cppdbg",
-			"request": "launch",
-			"program": "${workspaceFolder}/build/bin/zone",
-			"cwd": "${workspaceFolder}/build/bin",
-			"args": [
-				"neriakb",
-			],
-			"MIMode": "gdb",
-			"setupCommands": [
-				{
-					"description": "Enable pretty-printing for gdb",
-					"text": "-enable-pretty-printing",
-					"ignoreFailures": true
-				},
-				{
-					"description": "Set Disassembly Flavor to Intel",
-					"text": "-gdb-set disassembly-flavor intel",
-					"ignoreFailures": true
-				}
-			]
-		},
-		{
-			"name": "(gdb) login",
-			"type": "cppdbg",
-			"request": "launch",
-			"program": "${workspaceFolder}/build/bin/loginserver",
-			"cwd": "${workspaceFolder}/build/bin",
-			"MIMode": "gdb",
-			"setupCommands": [
-				{
-					"description": "Enable pretty-printing for gdb",
-					"text": "-enable-pretty-printing",
-					"ignoreFailures": true
-				},
-				{
-					"description": "Set Disassembly Flavor to Intel",
-					"text": "-gdb-set disassembly-flavor intel",
-					"ignoreFailures": true
-				}
-			]
-		},
-		{
-			"name": "(gdb) ucs",
-			"type": "cppdbg",
-			"request": "launch",
-			"program": "${workspaceFolder}/build/bin/ucs",
-			"cwd": "${workspaceFolder}/build/bin",
-			"MIMode": "gdb",
-			"setupCommands": [
-				{
-					"description": "Enable pretty-printing for gdb",
-					"text": "-enable-pretty-printing",
-					"ignoreFailures": true
-				},
-				{
-					"description": "Set Disassembly Flavor to Intel",
-					"text": "-gdb-set disassembly-flavor intel",
-					"ignoreFailures": true
-				}
-			]
-		},
-		{
-			"name": "(gdb) queryserv",
-			"type": "cppdbg",
-			"request": "launch",
-			"program": "${workspaceFolder}/build/bin/queryserv",
-			"cwd": "${workspaceFolder}/build/bin",
-			"MIMode": "gdb",
-			"setupCommands": [
-				{
-					"description": "Enable pretty-printing for gdb",
-					"text": "-enable-pretty-printing",
-					"ignoreFailures": true
-				},
-				{
-					"description": "Set Disassembly Flavor to Intel",
-					"text": "-gdb-set disassembly-flavor intel",
-					"ignoreFailures": true
-				}
-			]
-		}
-	]
-}
@@ -1,136 +0,0 @@
-{
-	"editor.detectIndentation": false,
-	"editor.insertSpaces": false,
-	"editor.tabSize": 4,
-	"editor.autoIndent": "full",
-	"editor.trimAutoWhitespace": true,
-	"files.trimTrailingWhitespace": true,
-	//"editor.formatOnSave": true,
-	"search.exclude": {
-		"dependencies": false,
-	},
-	"C_Cpp.default.includePath": [
-		"/usr/include/x86_64-linux-gnu",
-		"/usr/include/lua5.2",
-		"/usr/include/mariadb",
-		"${workspaceFolder}/dependencies/curl_x64/include",
-		"${workspaceFolder}/dependencies/fmt/include",
-		"${workspaceFolder}/dependencies/glm",
-		"${workspaceFolder}/dependencies/libuv/include",
-		"${workspaceFolder}/dependencies/sol2",
-		"${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": {
-		"*.ipp": "cpp",
-		"functional": "cpp",
-		"string": "cpp",
-		"iostream": "cpp",
-		"map": "cpp",
-		"fstream": "cpp",
-		"type_traits": "cpp",
-		"utility": "cpp",
-		"cstring": "cpp",
-		"*.tcc": "cpp",
-		"cctype": "cpp",
-		"clocale": "cpp",
-		"cmath": "cpp",
-		"csignal": "cpp",
-		"cstdarg": "cpp",
-		"cstddef": "cpp",
-		"cstdio": "cpp",
-		"cstdlib": "cpp",
-		"ctime": "cpp",
-		"cwchar": "cpp",
-		"cwctype": "cpp",
-		"any": "cpp",
-		"array": "cpp",
-		"atomic": "cpp",
-		"strstream": "cpp",
-		"bit": "cpp",
-		"bitset": "cpp",
-		"chrono": "cpp",
-		"codecvt": "cpp",
-		"compare": "cpp",
-		"complex": "cpp",
-		"concepts": "cpp",
-		"condition_variable": "cpp",
-		"coroutine": "cpp",
-		"cstdint": "cpp",
-		"deque": "cpp",
-		"forward_list": "cpp",
-		"list": "cpp",
-		"set": "cpp",
-		"unordered_map": "cpp",
-		"unordered_set": "cpp",
-		"vector": "cpp",
-		"exception": "cpp",
-		"algorithm": "cpp",
-		"iterator": "cpp",
-		"memory": "cpp",
-		"memory_resource": "cpp",
-		"numeric": "cpp",
-		"optional": "cpp",
-		"random": "cpp",
-		"ratio": "cpp",
-		"regex": "cpp",
-		"source_location": "cpp",
-		"string_view": "cpp",
-		"system_error": "cpp",
-		"tuple": "cpp",
-		"future": "cpp",
-		"initializer_list": "cpp",
-		"iomanip": "cpp",
-		"iosfwd": "cpp",
-		"istream": "cpp",
-		"limits": "cpp",
-		"mutex": "cpp",
-		"new": "cpp",
-		"numbers": "cpp",
-		"ostream": "cpp",
-		"semaphore": "cpp",
-		"sstream": "cpp",
-		"stdexcept": "cpp",
-		"stop_token": "cpp",
-		"streambuf": "cpp",
-		"thread": "cpp",
-		"cfenv": "cpp",
-		"cinttypes": "cpp",
-		"typeindex": "cpp",
-		"typeinfo": "cpp",
-		"valarray": "cpp",
-		"variant": "cpp",
-		"csetjmp": "cpp",
-		"charconv": "cpp",
-		"format": "cpp",
-		"ranges": "cpp",
-		"span": "cpp"
-	},
-	"cmake.statusbar.advanced": {
-		"kit": {
-			"visibility": "hidden",
-		},
-		"debug": {
-			"visibility": "hidden",
-		},
-		"buildTarget": {
-			"visibility": "hidden",
-		},
-		"launch": {
-			"visibility": "hidden",
-		},
-		"ctest": {
-			"visibility": "icon",
-		}
-	}
-}
@@ -17,7 +17,6 @@ SET(CMAKE_CXX_STANDARD_REQUIRED ON)
 SET(CMAKE_CXX_EXTENSIONS OFF)

 OPTION(EQEMU_BUILD_STATIC "Build with static linking" OFF)
-OPTION(EQEMU_BUILD_PCH "Build with precompiled headers (Windows)" ON)

 IF (EQEMU_BUILD_STATIC)
 	SET(BUILD_SHARED_LIBS OFF)
@@ -31,13 +30,6 @@ IF (EQEMU_BUILD_STATIC)
 	ENDIF ()
 ENDIF (EQEMU_BUILD_STATIC)

-
-# Requires libgoogle-perftools-dev google-perftools packages for linux (debian)
-IF(EQEMU_ADD_PROFILER)
-	SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--no-as-needed,-lprofiler,--as-needed")
-ENDIF(EQEMU_ADD_PROFILER)
-
-
 IF(MSVC)
 	ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS)
 	ADD_DEFINITIONS(-DNOMINMAX)
@@ -29,15 +29,11 @@
 #include "../../common/content/world_content_service.h"
 #include "../../common/zone_store.h"
 #include "../../common/path_manager.h"
-#include "../../common/repositories/skill_caps_repository.h"
-#include "../../common/file.h"
-#include "../../common/events/player_event_logs.h"

-EQEmuLogSys         LogSys;
+EQEmuLogSys LogSys;
 WorldContentService content_service;
-ZoneStore           zone_store;
-PathManager         path;
-PlayerEventLogs     player_event_logs;
+ZoneStore zone_store;
+PathManager path;

 void ExportSpells(SharedDatabase *db);
 void ExportSkillCaps(SharedDatabase *db);
@@ -168,76 +164,81 @@ void ExportSpells(SharedDatabase *db)
 	fclose(f);
 }

-bool SkillUsable(SharedDatabase* db, int skill_id, int class_id)
+bool SkillUsable(SharedDatabase *db, int skill_id, int class_id)
 {
-	const auto& l = SkillCapsRepository::GetWhere(
-		*db,
-		fmt::format(
-			"`class_id` = {} AND `skill_id` = {} ORDER BY `cap` DESC LIMIT 1",
-			class_id,
-			skill_id
-		)
-	);

-	return !l.empty();
+	bool res = false;
+
+	std::string query   = StringFormat(
+		"SELECT max(cap) FROM skill_caps WHERE class=%d AND skillID=%d",
+		class_id, skill_id
+	);
+	auto        results = db->QueryDatabase(query);
+	if (!results.Success()) {
+		return false;
+	}
+
+	if (results.RowCount() == 0) {
+		return false;
+	}
+
+	auto row = results.begin();
+	if (row[0] && Strings::ToInt(row[0]) > 0) {
+		return true;
+	}
+
+	return false;
 }

-uint32 GetSkill(SharedDatabase* db, int skill_id, int class_id, int level)
+int GetSkill(SharedDatabase *db, int skill_id, int class_id, int level)
 {
-	const auto& l = SkillCapsRepository::GetWhere(
-		*db,
-		fmt::format(
-			"`class_id` = {} AND `skill_id` = {} AND `level` = {}",
-			class_id,
-			skill_id,
-			level
-		)
-	);

-	if (l.empty()) {
+	std::string query   = StringFormat(
+		"SELECT cap FROM skill_caps WHERE class=%d AND skillID=%d AND level=%d",
+		class_id, skill_id, level
+	);
+	auto        results = db->QueryDatabase(query);
+	if (!results.Success()) {
 		return 0;
 	}

-	auto e = l.front();
+	if (results.RowCount() == 0) {
+		return 0;
+	}

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

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

-	std::ofstream file(fmt::format("{}/export/SkillCaps.txt", path.GetServerPath()));
-	if (!file || !file.is_open()) {
+	std::string file = fmt::format("{}/export/SkillCaps.txt", path.GetServerPath());
+	FILE *f = fopen(file.c_str(), "w");
+	if (!f) {
 		LogError("Unable to open export/SkillCaps.txt to write, skipping.");
 		return;
 	}

-	const uint8 skill_cap_max_level = (
-		RuleI(Character, SkillCapMaxLevel) > 0 ?
-		RuleI(Character, SkillCapMaxLevel) :
-		RuleI(Character, MaxLevel)
-	);
-
-	for (uint8 class_id = Class::Warrior; class_id <= Class::Berserker; class_id++) {
-		for (uint8 skill_id = EQ::skills::Skill1HBlunt; skill_id <= EQ::skills::Skill2HPiercing; skill_id++) {
-			if (SkillUsable(db, skill_id, class_id)) {
-				uint32 previous_cap = 0;
-				for (uint8 level = 1; level <= skill_cap_max_level; level++) {
-					uint32 cap = GetSkill(db, skill_id, class_id, level);
+	for (int cl = 1; cl <= 16; ++cl) {
+		for (int skill = 0; skill <= 77; ++skill) {
+			if (SkillUsable(db, skill, cl)) {
+				int      previous_cap = 0;
+				for (int level        = 1; level <= 100; ++level) {
+					int cap = GetSkill(db, skill, cl, level);
 					if (cap < previous_cap) {
 						cap = previous_cap;
 					}

-					file << fmt::format("{}^{}^{}^{}^0", class_id, skill_id, level, cap) << std::endl;
-
+					fprintf(f, "%d^%d^%d^%d^0\n", cl, skill, level, cap);
 					previous_cap = cap;
 				}
 			}
 		}
 	}

-	file.close();
+	fclose(f);
 }

 void ExportBaseData(SharedDatabase *db)
@@ -27,15 +27,11 @@
 #include "../../common/content/world_content_service.h"
 #include "../../common/zone_store.h"
 #include "../../common/path_manager.h"
-#include "../../common/repositories/base_data_repository.h"
-#include "../../common/file.h"
-#include "../../common/events/player_event_logs.h"

-EQEmuLogSys         LogSys;
+EQEmuLogSys LogSys;
 WorldContentService content_service;
-ZoneStore           zone_store;
-PathManager         path;
-PlayerEventLogs     player_event_logs;
+ZoneStore zone_store;
+PathManager path;

 void ImportSpells(SharedDatabase *db);
 void ImportSkillCaps(SharedDatabase *db);
@@ -259,45 +255,50 @@ void ImportSkillCaps(SharedDatabase *db) {
 	fclose(f);
 }

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

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

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

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

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

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

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

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

 void ImportDBStrings(SharedDatabase *db) {
@@ -13,6 +13,7 @@ SET(common_sources
    crc32.cpp
    database/database_dump_service.cpp
    database.cpp
+    database_conversions.cpp
    database_instances.cpp
    database/database_update_manifest.cpp
    database/database_update_manifest_bots.cpp
@@ -83,7 +84,6 @@ SET(common_sources
    shared_tasks.cpp
    shareddb.cpp
    skills.cpp
-    skill_caps.cpp
    spdat.cpp
    strings.cpp
    struct_strategy.cpp
@@ -177,7 +177,6 @@ SET(repositories
    repositories/base/base_character_leadership_abilities_repository.h
    repositories/base/base_character_material_repository.h
    repositories/base/base_character_memmed_spells_repository.h
-    repositories/base/base_character_parcels_repository.h
    repositories/base/base_character_peqzone_flags_repository.h
    repositories/base/base_character_pet_buffs_repository.h
    repositories/base/base_character_pet_info_repository.h
@@ -224,9 +223,6 @@ SET(repositories
    repositories/base/base_group_leaders_repository.h
    repositories/base/base_guilds_repository.h
    repositories/base/base_guild_ranks_repository.h
-    repositories/base/base_guild_permissions_repository.h
-    repositories/base/base_guild_members_repository.h
-    repositories/base/base_guild_bank_repository.h
    repositories/base/base_guild_relations_repository.h
    repositories/base/base_horses_repository.h
    repositories/base/base_instance_list_repository.h
@@ -235,6 +231,7 @@ SET(repositories
    repositories/base/base_inventory_snapshots_repository.h
    repositories/base/base_ip_exemptions_repository.h
    repositories/base/base_items_repository.h
+    repositories/base/base_item_tick_repository.h
    repositories/base/base_ldon_trap_entries_repository.h
    repositories/base/base_ldon_trap_templates_repository.h
    repositories/base/base_level_exp_mods_repository.h
@@ -358,7 +355,6 @@ SET(repositories
    repositories/character_leadership_abilities_repository.h
    repositories/character_material_repository.h
    repositories/character_memmed_spells_repository.h
-    repositories/character_parcels_repository.h
    repositories/character_peqzone_flags_repository.h
    repositories/character_pet_buffs_repository.h
    repositories/character_pet_info_repository.h
@@ -405,9 +401,6 @@ SET(repositories
    repositories/group_leaders_repository.h
    repositories/guilds_repository.h
    repositories/guild_ranks_repository.h
-    repositories/guild_permissions_repository.h
-    repositories/guild_members_repository.h
-    repositories/guild_bank_repository.h
    repositories/guild_relations_repository.h
    repositories/horses_repository.h
    repositories/instance_list_repository.h
@@ -416,6 +409,7 @@ SET(repositories
    repositories/inventory_snapshots_repository.h
    repositories/ip_exemptions_repository.h
    repositories/items_repository.h
+    repositories/item_tick_repository.h
    repositories/ldon_trap_entries_repository.h
    repositories/ldon_trap_templates_repository.h
    repositories/level_exp_mods_repository.h
@@ -495,11 +489,12 @@ SET(repositories
    repositories/zone_repository.h
    repositories/zone_points_repository.h

-)
+    )

 SET(common_headers
    additive_lagged_fibonacci_engine.h
    base_packet.h
+    base_data.h
    bodytypes.h
    classes.h
    compression.h
@@ -546,6 +541,7 @@ SET(common_headers
    events/player_event_logs.h
    events/player_event_discord_formatter.h
    events/player_events.h
+    errmsg.h
    event_sub.h
    expedition_lockout_timer.h
    extprofile.h
@@ -567,9 +563,10 @@ SET(common_headers
    item_fieldlist.h
    item_instance.h
    json_config.h
+    languages.h
    light_source.h
    linked_list.h
-    loot.h
+    loottable.h
    mail_oplist.h
    md5.h
    memory_buffer.h
@@ -595,7 +592,7 @@ SET(common_headers
    ptimer.h
    queue.h
    races.h
-    raid.h
+	raid.h
    random.h
    rdtsc.h
    rulesys.h
@@ -609,7 +606,6 @@ SET(common_headers
    shared_tasks.h
    shareddb.h
    skills.h
-    skill_caps.h
    spdat.h
    strings.h
    struct_strategy.h
@@ -685,13 +681,13 @@ SOURCE_GROUP(Event FILES
    event/event_loop.h
    event/timer.h
    event/task.h
-)
+    )

 SOURCE_GROUP(Json FILES
    json/json.h
    json/jsoncpp.cpp
    json/json-forwards.h
-)
+    )

 SOURCE_GROUP(Net FILES
    net/console_server.cpp
@@ -728,7 +724,7 @@ SOURCE_GROUP(Net FILES
    net/websocket_server.h
    net/websocket_server_connection.cpp
    net/websocket_server_connection.h
-)
+    )

 SOURCE_GROUP(Patches FILES
    patches/patches.h
@@ -772,12 +768,12 @@ SOURCE_GROUP(Patches FILES
    patches/titanium_limits.cpp
    patches/uf.cpp
    patches/uf_limits.cpp
-)
+    )

 SOURCE_GROUP(StackWalker FILES
    StackWalker/StackWalker.h
    StackWalker/StackWalker.cpp
-)
+    )

 SOURCE_GROUP(Util FILES
    util/memory_stream.h
@@ -785,19 +781,20 @@ SOURCE_GROUP(Util FILES
    util/directory.h
    util/uuid.cpp
    util/uuid.h
-)
+    )

 INCLUDE_DIRECTORIES(Patches SocketLib StackWalker)

 ADD_LIBRARY(common ${common_sources} ${common_headers} ${repositories})

+IF(WIN32)
+    TARGET_PRECOMPILE_HEADERS(common PRIVATE pch/pch.h)
+ENDIF(WIN32)
+
 IF (UNIX)
    SET_SOURCE_FILES_PROPERTIES("SocketLib/Mime.cpp" PROPERTY COMPILE_FLAGS -Wno-unused-result)
    SET_SOURCE_FILES_PROPERTIES("patches/sod.cpp" "patches/sof.cpp" "patches/rof.cpp" "patches/rof2.cpp" "patches/uf.cpp" PROPERTIES COMPILE_FLAGS -O0)
 ENDIF (UNIX)

-IF (WIN32 AND EQEMU_BUILD_PCH)
-    TARGET_PRECOMPILE_HEADERS(common PRIVATE pch/pch.h)
-ENDIF ()

 SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
@@ -0,0 +1,34 @@
+/*	EQEMu: Everquest Server Emulator
+	Copyright (C) 2001-2013 EQEMu Development Team (http://eqemulator.net)
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; version 2 of the License.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY except by those people which sell it, which
+	are required to give you total support for your newly bought product;
+	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+	A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
+
+#ifndef __EQEMU_COMMON_BASE_DATA_H
+#define __EQEMU_COMMON_BASE_DATA_H
+
+struct BaseDataStruct
+{
+	double base_hp;
+	double base_mana;
+	double base_end;
+	double hp_regen;
+	double end_regen;
+	double hp_factor;
+	double mana_factor;
+	double endurance_factor;
+};
+
+#endif
@@ -64,6 +64,4 @@ typedef enum {
 } bodyType;
 /* bodytypes above 64 make the mob not show up */

-constexpr int format_as(bodyType type) { return static_cast<int>(type); }
-
 #endif
@@ -15,7 +15,7 @@
 	along with this program; if not, write to the Free Software
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 	*/
-#include <fmt/format.h>
+#include <fmt/core.h>
 #include "../common/global_define.h"
 #include "../common/classes.h"
 #include "data_verification.h"
@@ -18,7 +18,7 @@
 *
 */

-#include <fmt/format.h>
+#include <fmt/core.h>
 #include "eqemu_command_handler.h"
 #include "terminal_color.hpp"
 #include "../platform.h"
@@ -1,11 +1,29 @@
-#include "world_content_service.h"
+/**
+ * EQEmulator: Everquest Server Emulator
+ * Copyright (C) 2001-2019 EQEmulator Development Team (https://github.com/EQEmu/Server)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY except by those people which sell it, which
+ * are required to give you total support for your newly bought product;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */

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


 WorldContentService::WorldContentService()
@@ -102,7 +120,7 @@ std::vector<std::string> WorldContentService::GetContentFlagsDisabled()
 /**
 * @param content_flags
 */
-void WorldContentService::SetContentFlags(const std::vector<ContentFlagsRepository::ContentFlags> &content_flags)
+void WorldContentService::SetContentFlags(const std::vector<ContentFlagsRepository::ContentFlags>& content_flags)
 {
 	WorldContentService::content_flags = content_flags;
 }
@@ -150,14 +168,14 @@ bool WorldContentService::DoesPassContentFiltering(const ContentFlags &f)
 	}

 	// if we don't have any enabled flag in enabled flags, we fail
-	for (const auto &flag: Strings::Split(f.content_flags)) {
+	for (const auto& flag: Strings::Split(f.content_flags)) {
 		if (!Strings::Contains(GetContentFlagsEnabled(), flag)) {
 			return false;
 		}
 	}

 	// if we don't have any disabled flag in disabled flags, we fail
-	for (const auto &flag: Strings::Split(f.content_flags_disabled)) {
+	for (const auto& flag: Strings::Split(f.content_flags_disabled)) {
 		if (!Strings::Contains(GetContentFlagsDisabled(), flag)) {
 			return false;
 		}
@@ -178,13 +196,11 @@ void WorldContentService::ReloadContentFlags()
 		LogInfo(
 			"Loaded content flag [{}] [{}]",
 			f.flag_name,
-			(f.enabled ? "enabled" : "disabled")
+			(f.enabled ? "Enabled" : "Disabled")
 		);
 	}

 	SetContentFlags(set_content_flags);
-	LoadZones();
-	LoadStaticGlobalZoneInstances();
 }

 Database *WorldContentService::GetDatabase() const
@@ -199,18 +215,6 @@ WorldContentService *WorldContentService::SetDatabase(Database *database)
 	return this;
 }

-Database *WorldContentService::GetContentDatabase() const
-{
-	return m_content_database;
-}
-
-WorldContentService *WorldContentService::SetContentDatabase(Database *database)
-{
-	WorldContentService::m_content_database = database;
-
-	return this;
-}
-
 void WorldContentService::SetContentFlag(const std::string &content_flag_name, bool enabled)
 {
 	auto flags = ContentFlagsRepository::GetWhere(
@@ -235,135 +239,3 @@ void WorldContentService::SetContentFlag(const std::string &content_flag_name, b

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

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

 class Database;

-struct ContentFlags {
-	int16       min_expansion;
-	int16       max_expansion;
-	std::string content_flags;
-	std::string content_flags_disabled;
-};
-
 namespace Expansion {
 	static const int EXPANSION_ALL        = -1;
 	static const int EXPANSION_FILTER_MAX = 99;
@@ -164,35 +176,14 @@ public:
 	WorldContentService * SetDatabase(Database *database);
 	Database *GetDatabase() const;

-	WorldContentService * SetContentDatabase(Database *database);
-	Database *GetContentDatabase() const;
-
 	void SetContentFlag(const std::string &content_flag_name, bool enabled);

-	void HandleZoneRoutingMiddleware(ZoneChange_Struct *zc);
-
-	struct FindZoneResult {
-		uint32                               zone_id = 0;
-		InstanceListRepository::InstanceList instance;
-		ZoneRepository::Zone                 zone;
-	};
-
-	FindZoneResult FindZone(uint32 zone_id, uint32 instance_id);
-	bool IsInPublicStaticInstance(uint32 instance_id);
-
 private:
 	int current_expansion{};
 	std::vector<ContentFlagsRepository::ContentFlags> content_flags;

 	// reference to database
 	Database *m_database;
-	Database *m_content_database;
-
-	// holds a record of the zone table from the database
-	std::vector<ZoneRepository::Zone> m_zones = {};
-	WorldContentService *LoadStaticGlobalZoneInstances();
-	std::vector<InstanceListRepository::InstanceList> m_zone_instances;
-	WorldContentService * LoadZones();
 };

 extern WorldContentService content_service;
@@ -15,7 +15,7 @@
 #include <cstdio>
 #include <vector>

-#ifdef _WINDOWS
+#if WINDOWS
 #define popen _popen
 #endif

@@ -23,7 +23,7 @@ void SendCrashReport(const std::string &crash_report)
 {
 	// can configure multiple endpoints if need be
 	std::vector<std::string> endpoints = {
-		"https://spire.akkadius.com/api/v1/analytics/server-crash-report",
+		"http://spire.akkadius.com/api/v1/analytics/server-crash-report",
 //		"http://localhost:3010/api/v1/analytics/server-crash-report", // development
 	};

@@ -18,8 +18,8 @@
 #ifndef EQEMU_DATABASE_H
 #define EQEMU_DATABASE_H

-#define AUTHENTICATION_TIMEOUT    60
-#define INVALID_ID                0xFFFFFFFF
+#define AUTHENTICATION_TIMEOUT	60
+#define INVALID_ID				0xFFFFFFFF

 #include "global_define.h"
 #include "eqemu_logsys.h"
@@ -38,7 +38,8 @@
 class MySQLRequestResult;
 class Client;

-namespace EQ {
+namespace EQ
+{
 	class InventoryProfile;
 }

@@ -51,11 +52,10 @@ struct npcDecayTimes_Struct {

 struct VarCache_Struct {
 	std::map<std::string, std::string> m_cache;
-	uint32                             last_update;
+	uint32 last_update;
 	VarCache_Struct() : last_update(0) { }
-	void Add(const std::string& key, const std::string& value) { m_cache[key] = value; }
-	const std::string* Get(const std::string& key)
-	{
+	void Add(const std::string &key, const std::string &value) { m_cache[key] = value; }
+	const std::string *Get(const std::string &key) {
 		auto it = m_cache.find(key);
 		return (it != m_cache.end() ? &it->second : nullptr);
 	}
@@ -76,33 +76,37 @@ class PTimerList;

 #define SQL(...) #__VA_ARGS__

+class LogSettings;
 class Database : public DBcore {
 public:
 	Database();
-	Database(
-		const std::string& host,
-		const std::string& user,
-		const std::string& password,
-		const std::string& database,
-		uint32 port
-	);
-	bool Connect(
-		const std::string& host,
-		const std::string& user,
-		const std::string& password,
-		const std::string& database,
-		uint32 port,
-		std::string connection_label = "default"
-	);
+	Database(const char* host, const char* user, const char* passwd, const char* database,uint32 port);
+	bool Connect(const char* host, const char* user, const char* passwd, const char* database, uint32 port, std::string connection_label = "default");
 	~Database();

 	/* Character Creation */
-	bool DeleteCharacter(const std::string& name);
-	bool MoveCharacterToZone(const std::string& name, uint32 zone_id);
+
+	bool CreateCharacter(
+		uint32 account_id,
+		char *name,
+		uint16 gender,
+		uint16 race,
+		uint16 class_,
+		uint8 str,
+		uint8 sta,
+		uint8 cha,
+		uint8 dex,
+		uint8 int_,
+		uint8 agi,
+		uint8 wis,
+		uint8 face
+	);
+	bool DeleteCharacter(char *character_name);
+	bool MoveCharacterToZone(const char *charname, uint32 zone_id);
 	bool MoveCharacterToZone(uint32 character_id, uint32 zone_id);
-	bool ReserveName(uint32 account_id, const std::string& name);
-	bool SaveCharacterCreate(uint32 character_id, uint32 account_id, PlayerProfile_Struct* pp);
-	bool UpdateName(const std::string& old_name, const std::string& new_name);
+	bool ReserveName(uint32 account_id, char *name);
+	bool SaveCharacterCreate(uint32 character_id, uint32 account_id, PlayerProfile_Struct *pp);
+	bool UpdateName(const char *oldname, const char *newname);
 	bool CopyCharacter(
 		const std::string& source_character_name,
 		const std::string& destination_character_name,
@@ -110,175 +114,165 @@ public:
 	);

 	/* General Information Queries */
-	bool AddBannedIP(const std::string& banned_ip, const std::string& notes); //Add IP address to the banned_ips table.
-	bool AddToNameFilter(const std::string& name);
-	bool CheckBannedIPs(const std::string& login_ip); //Check incoming connection against banned IP table.
-	bool CheckGMIPs(const std::string& login_ip, uint32 account_id);
-	bool CheckNameFilter(const std::string& name, bool surname = false);
-	bool IsNameUsed(const std::string& name);

-	uint32 GetAccountIDByChar(const std::string& name, uint32* character_id = 0);
-	uint32 GetAccountIDByChar(uint32 character_id);
-	uint32 GetAccountIDByName(const std::string& account_name, const std::string& loginserver, int16* status = 0, uint32* lsid = 0);
-	uint32 GetCharacterID(const std::string& name);
-	uint32 GetGuildIDByCharID(uint32 character_id);
-	uint32 GetGroupIDByCharID(uint32 character_id);
-	uint32 GetRaidIDByCharID(uint32 character_id);
+	bool	AddBannedIP(std::string banned_ip, std::string notes); //Add IP address to the banned_ips table.
+	bool	AddToNameFilter(std::string name);
+	bool	CheckBannedIPs(std::string login_ip); //Check incoming connection against banned IP table.
+	bool	CheckGMIPs(std::string login_ip, uint32 account_id);
+	bool	CheckNameFilter(std::string name, bool surname = false);
+	bool	CheckUsedName(std::string name);

-	const std::string GetAccountName(uint32 account_id, uint32* lsaccount_id = 0);
-	const std::string GetCharName(uint32 character_id);
-	const std::string GetCharNameByID(uint32 character_id);
-	const std::string GetNPCNameByID(uint32 npc_id);
-	const std::string GetCleanNPCNameByID(uint32 npc_id);
-	void LoginIP(uint32 account_id, const std::string& login_ip);
+	uint32	GetAccountIDByChar(const char* charname, uint32* oCharID = 0);
+	uint32	GetAccountIDByChar(uint32 char_id);
+	uint32	GetAccountIDByName(std::string account_name, std::string loginserver, int16* status = 0, uint32* lsid = 0);
+	uint32	GetCharacterID(const char *name);
+	uint32	GetCharacterInfo(std::string character_name, uint32 *account_id, uint32 *zone_id, uint32 *instance_id);
+	uint32	GetGuildIDByCharID(uint32 char_id);
+	uint32  GetGroupIDByCharID(uint32 char_id);
+	uint32  GetRaidIDByCharID(uint32 char_id);
+
+	void	GetAccountName(uint32 accountid, char* name, uint32* oLSAccountID = 0);
+	void	GetCharName(uint32 char_id, char* name);
+	std::string GetCharNameByID(uint32 char_id);
+	std::string GetNPCNameByID(uint32 npc_id);
+	std::string GetCleanNPCNameByID(uint32 npc_id);
+	void	LoginIP(uint32 account_id, std::string login_ip);

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

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

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

 	/* Adventure related. */
-	void UpdateAdventureStatsEntry(uint32 character_id, uint8 theme_id, bool is_win = false, bool is_remove = false);
-	bool GetAdventureStats(uint32 character_id, AdventureStats_Struct* as);
+
+	void UpdateAdventureStatsEntry(uint32 char_id, uint8 theme, bool win = false, bool remove = false);
+	bool GetAdventureStats(uint32 char_id, AdventureStats_Struct *as);

 	/* Account Related */
-	const std::string GetLiveChar(uint32 account_id);
-	bool SetAccountStatus(const std::string& account_name, int16 status);
-	bool SetLocalPassword(uint32 account_id, const std::string& password);
-	bool UpdateLiveChar(const std::string& name, uint32 account_id);
-	int16 CheckStatus(uint32 account_id);
-	void SetAccountCRCField(uint32 account_id, const std::string& field_name, uint64 checksum);
-	uint32 CheckLogin(const std::string& name, const std::string& password, const std::string& loginserver, int16* status = 0);
-	uint32 CreateAccount(
-		const std::string& name,
-		const std::string& password,
-		int16 status,
-		const std::string& loginserver,
-		uint32 lsaccount_id
-	);
-	uint32 GetAccountIDFromLSID(
-		const std::string& in_loginserver_id,
-		uint32 in_loginserver_account_id,
-		char* in_account_name = 0,
-		int16* in_status = 0
-	);

-	uint8 GetAgreementFlag(uint32 account_id);
-	void SetAgreementFlag(uint32 account_id);
+	bool	DeleteAccount(const char *name, const char* loginserver);
+	bool	GetLiveChar(uint32 account_id, char* cname);
+	bool	SetAccountStatus(const char* name, int16 status);
+	bool	SetAccountStatus(const std::string& account_name, int16 status);
+	bool	SetLocalPassword(uint32 accid, const char* password);
+	bool	UpdateLiveChar(char* charname, uint32 account_id);

-	int GetIPExemption(const std::string& account_ip);
-	void SetIPExemption(const std::string& account_ip, int exemption_amount);
+	int16	CheckStatus(uint32 account_id);

-	int GetInstanceID(uint32 character_id, uint32 zone_id);
+	void	SetAccountCRCField(uint32 account_id, std::string field_name, uint64 checksum);
+
+	uint32	CheckLogin(const char* name, const char* password, const char *loginserver, int16* oStatus = 0);
+	uint32	CreateAccount(const char* name, const char* password, int16 status, const char* loginserver, uint32 lsaccount_id);
+	uint32	GetAccountIDFromLSID(const std::string& in_loginserver_id, uint32 in_loginserver_account_id, char* in_account_name = 0, int16* in_status = 0);
+	uint8	GetAgreementFlag(uint32 account_id);
+
+	void	GetAccountFromID(uint32 id, char* oAccountName, int16* oStatus);
+	void	SetAgreementFlag(uint32 account_id);
+
+	int  GetIPExemption(std::string account_ip);
+	void SetIPExemption(std::string account_ip, int exemption_amount);
+
+	int		GetInstanceID(uint32 char_id, uint32 zone_id);


 	/* Groups */
-	std::string GetGroupLeaderForLogin(const std::string& character_name);
-	char* GetGroupLeadershipInfo(
-		uint32 group_id,
-		char* leaderbuf,
-		char* maintank = nullptr,
-		char* assist = nullptr,
-		char* puller = nullptr,
-		char* marknpc = nullptr,
-		char* mentoree = nullptr,
-		int* mentor_percent = nullptr,
-		GroupLeadershipAA_Struct* GLAA = nullptr
-	);
-	std::string GetGroupLeaderName(uint32 group_id);
-	uint32 GetGroupID(const std::string& name);
-	void ClearGroup(uint32 group_id = 0);
-	void ClearGroupLeader(uint32 group_id = 0);
-	void SetGroupLeaderName(uint32 group_id, const std::string& name);
+
+	std::string GetGroupLeaderForLogin(std::string character_name);
+	char* GetGroupLeadershipInfo(uint32 gid, char* leaderbuf, char* maintank = nullptr, char* assist = nullptr, char* puller = nullptr, char *marknpc = nullptr, char *mentoree = nullptr, int *mentor_percent = nullptr, GroupLeadershipAA_Struct* GLAA = nullptr);
+
+	uint32	GetGroupID(const char* name);
+
+	void	ClearGroup(uint32 gid = 0);
+	void	ClearGroupLeader(uint32 gid = 0);
+	void	SetGroupID(const char* name, uint32 id, uint32 charid, uint32 ismerc = false);
+	void	SetGroupLeaderName(uint32 gid, const char* name);

 	/* Raids */
-	const std::string GetRaidLeaderName(uint32 raid_id);
-	uint32 GetRaidID(const std::string& name);
-	void ClearRaid(uint32 raid_id = 0);
-	void ClearRaidDetails(uint32 raid_id = 0);
-	void ClearRaidLeader(uint32 group_id = std::numeric_limits<uint32>::max(), uint32 raid_id = 0);
-	void GetGroupLeadershipInfo(
-		uint32 group_id,
-		uint32 raid_id,
-		char* maintank = nullptr,
-		char* assist = nullptr,
-		char* puller = nullptr,
-		char* marknpc = nullptr,
-		char* mentoree = nullptr,
-		int* mentor_percent = nullptr,
-		GroupLeadershipAA_Struct* GLAA = nullptr
-	);
-	void GetRaidLeadershipInfo(
-		uint32 raid_id,
-		char* maintank = nullptr,
-		char* assist = nullptr,
-		char* puller = nullptr,
-		char* marknpc = nullptr,
-		RaidLeadershipAA_Struct* RLAA = nullptr
-	);
-	void SetRaidGroupLeaderInfo(uint32 group_id, uint32 raid_id);

-	void PurgeAllDeletedDataBuckets();
-	void ClearGuildOnlineStatus();
+	const char *GetRaidLeaderName(uint32 rid);

+	uint32	GetRaidID(const char* name);
+
+	void	ClearRaid(uint32 rid = 0);
+	void	ClearRaidDetails(uint32 rid = 0);
+	void	ClearRaidLeader(uint32 gid = 0xFFFFFFFF, uint32 rid = 0);
+	void	GetGroupLeadershipInfo(uint32 gid, uint32 rid, char* maintank = nullptr, char* assist = nullptr, char* puller = nullptr, char *marknpc = nullptr, char *mentoree = nullptr, int *mentor_percent = nullptr, GroupLeadershipAA_Struct* GLAA = nullptr);
+	void	GetRaidLeadershipInfo(uint32 rid, char* maintank = nullptr, char* assist = nullptr, char* puller = nullptr, char *marknpc = nullptr, RaidLeadershipAA_Struct* RLAA = nullptr);
+	void	SetRaidGroupLeaderInfo(uint32 gid, uint32 rid);
+
+	void    PurgeAllDeletedDataBuckets();
+
+	/* Database Conversions 'database_conversions.cpp' */
+
+	bool	CheckDatabaseConversions();
+	bool	CheckDatabaseConvertCorpseDeblob();
+	bool	CheckDatabaseConvertPPDeblob();

 	/* Database Variables */
-	bool GetVariable(const std::string& name, std::string& value);
-	bool SetVariable(const std::string& name, const std::string& value);
-	bool LoadVariables();

-	uint8 GetPEQZone(uint32 zone_id, uint32 version);
-	uint32 GetServerType();
-	void AddReport(const std::string& who, const std::string& against, const std::string& lines);
-	struct TimeOfDay_Struct LoadTime(time_t& realtime);
-	bool SaveTime(int8 minute, int8 hour, int8 day, int8 month, int16 year);
-	void ClearMerchantTemp();
-	void ClearPTimers(uint32 character_id);
-	void SetFirstLogon(uint32 character_id, uint8 first_logon);
-	void SetLFG(uint32 character_id, bool is_lfg);
-	void SetLFP(uint32 character_id, bool is_lfp);
-	void SetLoginFlags(uint32 character_id, bool is_lfp, bool is_lfg, uint8 first_logon);
+	bool	GetVariable(std::string varname, std::string &varvalue);
+	bool	SetVariable(const std::string& varname, const std::string &varvalue);
+	bool	LoadVariables();

-	int64 CountInvSnapshots();
-	void ClearInvSnapshots(bool from_now = false);
+	/* General Queries */

-	void SourceDatabaseTableFromUrl(const std::string& table_name, const std::string& url);
-	void SourceSqlFromUrl(const std::string& url);
-	void PurgeCharacterParcels();
-	void Encode(std::string &in);
-	void Decode(std::string &in);
+	bool	GetZoneGraveyard(const uint32 graveyard_id, uint32* graveyard_zoneid = 0, float* graveyard_x = 0, float* graveyard_y = 0, float* graveyard_z = 0, float* graveyard_heading = 0);
+	bool	LoadPTimers(uint32 charid, PTimerList &into);
+
+	uint8	GetPEQZone(uint32 zone_id, uint32 version);
+	uint8	GetMinStatus(uint32 zone_id, uint32 instance_version);
+	uint8	GetRaceSkill(uint8 skillid, uint8 in_race);
+	uint8	GetServerType();
+	uint8	GetSkillCap(uint8 skillid, uint8 in_race, uint8 in_class, uint16 in_level);
+
+	void	AddReport(std::string who, std::string against, std::string lines);
+	struct TimeOfDay_Struct		LoadTime(time_t &realtime);
+	bool	SaveTime(int8 minute, int8 hour, int8 day, int8 month, int16 year);
+	void	ClearMerchantTemp();
+	void	ClearPTimers(uint32 charid);
+	void	SetFirstLogon(uint32 CharID, uint8 firstlogon);
+	void	SetLFG(uint32 CharID, bool LFG);
+	void	SetLFP(uint32 CharID, bool LFP);
+	void	SetLoginFlags(uint32 CharID, bool LFP, bool LFG, uint8 firstlogon);
+
+	int		CountInvSnapshots();
+	void	ClearInvSnapshots(bool from_now = false);
+
+	void SourceDatabaseTableFromUrl(std::string table_name, std::string url);
+	void SourceSqlFromUrl(std::string url);

 private:
-	Mutex           Mvarcache;
+
+	Mutex Mvarcache;
 	VarCache_Struct varcache;

 	/* Groups, utility methods. */
-	void ClearAllGroupLeaders();
-	void ClearAllGroups();
+	void    ClearAllGroupLeaders();
+	void    ClearAllGroups();

 	/* Raid, utility methods. */
 	void ClearAllRaids();
@@ -575,12 +575,7 @@ void DatabaseDumpService::RemoveSqlBackup()
 {
 	std::string file = fmt::format("{}.sql", GetDumpFileNameWithPath());
 	if (File::Exists(file)) {
-		try {
-			std::filesystem::remove(file);
-		}
-		catch (std::exception &e) {
-			LogError("std::filesystem::remove err [{}]", e.what());
-		}
+		std::filesystem::remove(file);
 	}

 	RemoveCredentialsFile();
@@ -76,9 +76,9 @@ void DatabaseUpdate::CheckDbUpdates()
 	}
 }

-std::string DatabaseUpdate::GetQueryResult(const ManifestEntry& e)
+std::string DatabaseUpdate::GetQueryResult(std::string query)
 {
-	auto results = (e.content_schema_update ? m_content_database : m_database)->QueryDatabase(e.check);
+	auto results = m_database->QueryDatabase(query);

 	std::vector<std::string> result_lines = {};

@@ -121,16 +121,6 @@ bool DatabaseUpdate::ShouldRunMigration(ManifestEntry &e, std::string query_resu
 	return false;
 }

-// check if we are running in a terminal
-bool is_atty()
-{
-#ifdef _WINDOWS
-	return ::_isatty(_fileno(stdin));
-#else
-	return isatty(fileno(stdin));
-#endif
-}
-
 // return true if we ran updates
 bool DatabaseUpdate::UpdateManifest(
 	std::vector<ManifestEntry> entries,
@@ -146,7 +136,7 @@ bool DatabaseUpdate::UpdateManifest(
 			for (auto &e: entries) {
 				if (e.version == version) {
 					bool        has_migration = true;
-					std::string r             = GetQueryResult(e);
+					std::string r             = GetQueryResult(e.check);
 					if (ShouldRunMigration(e, r)) {
 						has_migration = false;
 						missing_migrations.emplace_back(e.version);
@@ -189,7 +179,7 @@ bool DatabaseUpdate::UpdateManifest(
 				if (e.version == m) {
 					bool errored_migration = false;

-					auto r = (e.content_schema_update ? m_content_database : m_database)->QueryDatabaseMulti(e.sql);
+					auto r = m_database->QueryDatabaseMulti(e.sql);

 					// ignore empty query result "errors"
 					if (r.ErrorNumber() != 1065 && !r.ErrorMessage().empty()) {
@@ -197,38 +187,31 @@ bool DatabaseUpdate::UpdateManifest(
 						errored_migration = true;

 						LogInfo("Required database update failed. This could be a problem");
+						LogInfo("Would you like to skip this update? [y/n] (Timeout 60s)");

-						// if terminal attached then prompt for skip
-						if (is_atty()) {
-							LogInfo("Would you like to skip this update? [y/n] (Timeout 60s)");
+						// user input
+						std::string input;
+						bool        gave_input        = false;
+						time_t      start_time        = time(nullptr);
+						time_t      wait_time_seconds = 60;

-							// user input
-							std::string input;
-							bool        gave_input        = false;
-							time_t      start_time        = time(nullptr);
-							time_t      wait_time_seconds = 60;
-
-							// spawn a concurrent thread that waits for input from std::cin
-							std::thread t1(
-								[&]() {
-									std::cin >> input;
-									gave_input = true;
-								}
-							);
-							t1.detach();
-
-							// check the inputReceived flag once every 50ms for 10 seconds
-							while (time(nullptr) < start_time + wait_time_seconds && !gave_input) {
-								std::this_thread::sleep_for(std::chrono::milliseconds(50));
+						// spawn a concurrent thread that waits for input from std::cin
+						std::thread t1(
+							[&]() {
+								std::cin >> input;
+								gave_input = true;
 							}
+						);
+						t1.detach();

-							// prompt for user skip
-							if (Strings::Trim(input) == "y") {
-								errored_migration = false;
-								LogInfo("Skipping update [{}] [{}]", e.version, e.description);
-							}
-						} else {
-							errored_migration = true;
+						// check the inputReceived flag once every 50ms for 10 seconds
+						while (time(nullptr) < start_time + wait_time_seconds && !gave_input) {
+							std::this_thread::sleep_for(std::chrono::milliseconds(50));
+						}
+
+						// prompt for user skip
+						if (Strings::Trim(input) == "y") {
+							errored_migration = false;
 							LogInfo("Skipping update [{}] [{}]", e.version, e.description);
 						}
 					}
@@ -264,13 +247,6 @@ DatabaseUpdate *DatabaseUpdate::SetDatabase(Database *db)
 	return this;
 }

-DatabaseUpdate *DatabaseUpdate::SetContentDatabase(Database *db)
-{
-	m_content_database = db;
-
-	return this;
-}
-
 bool DatabaseUpdate::CheckVersionsUpToDate(DatabaseVersion v, DatabaseVersion b)
 {
 	LogInfo("{}", Strings::Repeat("-", BREAK_LENGTH));
@@ -10,7 +10,6 @@ struct ManifestEntry {
 	std::string condition{};   // condition or "match_type" - Possible values [contains|match|missing|empty|not_empty]
 	std::string match{};       // match field that is not always used, but works in conjunction with "condition" values [missing|match|contains]
 	std::string sql{};         // the SQL DDL that gets ran when the condition is true
-	bool        content_schema_update{}; // if true, this migration is a content schema update and should be ran against the content database
 };

 struct DatabaseVersion {
@@ -23,16 +22,14 @@ public:
 	DatabaseVersion GetDatabaseVersions();
 	DatabaseVersion GetBinaryDatabaseVersions();
 	void CheckDbUpdates();
-	std::string GetQueryResult(const ManifestEntry& e);
+	std::string GetQueryResult(std::string query);
 	static bool ShouldRunMigration(ManifestEntry &e, std::string query_result);
 	bool UpdateManifest(std::vector<ManifestEntry> entries, int version_low, int version_high);

 	DatabaseUpdate *SetDatabase(Database *db);
-	DatabaseUpdate *SetContentDatabase(Database *db);
 	bool HasPendingUpdates();
 private:
 	Database *m_database;
-	Database *m_content_database;
 	static bool CheckVersionsUpToDate(DatabaseVersion v, DatabaseVersion b);
 	void InjectBotsVersionColumn();
 };
@@ -4844,7 +4844,7 @@ UPDATE data_buckets SET bot_id = SUBSTRING_INDEX(SUBSTRING_INDEX( `key`, '-', 2
 			ADD COLUMN `marked_npc_3_zone_id` INT UNSIGNED NOT NULL DEFAULT '0' AFTER `marked_npc_3_entity_id`,
 			ADD COLUMN `marked_npc_3_instance_id` INT UNSIGNED NOT NULL DEFAULT '0' AFTER `marked_npc_3_zone_id`;
 		)"
-	},
+    },
 	ManifestEntry{
 		.version = 9235,
 		.description = "2023_07_31_character_stats_record.sql",
@@ -5016,7 +5016,7 @@ CREATE TABLE `spawn2_disabled` (
 ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4;
 INSERT INTO spawn2_disabled (spawn2_id, disabled) SELECT id, 1 FROM spawn2 WHERE enabled = 0;
 ALTER TABLE `spawn2` DROP COLUMN `enabled`;
-)",
+)"
 	},
 	ManifestEntry{
 		.version = 9242,
@@ -5028,8 +5028,7 @@ ALTER TABLE `spawn2` DROP COLUMN `enabled`;
 ALTER TABLE `spawnentry`
 ADD COLUMN `min_time` smallint(4) NOT NULL DEFAULT 0 AFTER `condition_value_filter`,
 ADD COLUMN `max_time` smallint(4) NOT NULL DEFAULT 0 AFTER `min_time`;
-)",
-		.content_schema_update = true
+)"
 	},
 	ManifestEntry{
 		.version = 9243,
@@ -5083,8 +5082,7 @@ INSERT INTO

 DROP TABLE `starting_items`;
 RENAME TABLE `starting_items_new` TO `starting_items`;
-)",
-		.content_schema_update = true
+)"
 	},
 	ManifestEntry{
 		.version = 9244,
@@ -5094,8 +5092,7 @@ RENAME TABLE `starting_items_new` TO `starting_items`;
 		.match = "0000-00-00 00:00:00",
 		.sql = R"(
 ALTER TABLE `items` MODIFY COLUMN `updated` datetime NULL DEFAULT NULL;
-		)",
-		.content_schema_update = true
+		)"
 	},
 	ManifestEntry{
 		.version = 9245,
@@ -5107,8 +5104,7 @@ ALTER TABLE `items` MODIFY COLUMN `updated` datetime NULL DEFAULT NULL;
 ALTER TABLE `object` CHANGE COLUMN `unknown08` `size_percentage` float NOT NULL DEFAULT 0 AFTER `icon`;
 ALTER TABLE `object` CHANGE COLUMN `unknown10` `solid_type` mediumint(5) NOT NULL DEFAULT 0 AFTER `size`;
 ALTER TABLE `object` CHANGE COLUMN `unknown20` `incline` int(11) NOT NULL DEFAULT 0 AFTER `solid_type`;
-)",
-		.content_schema_update = true
+)"
 	},
 	ManifestEntry{
 		.version = 9246,
@@ -5137,449 +5133,9 @@ CHANGE COLUMN `slot` `inventory_slot` mediumint(9) NOT NULL DEFAULT -1 AFTER `st

 ALTER TABLE `starting_items`
 CHANGE COLUMN `temporary` `class_list` text CHARACTER SET latin1 COLLATE latin1_swedish_ci NULL DEFAULT NULL AFTER `id`;
-)",
-		.content_schema_update = true
-	},
-	ManifestEntry{
-		.version = 9248,
-		.description = "2023_12_22_drop_npc_emotes_index.sql",
-		.check = "show index from npc_emotes where key_name = 'emoteid'",
-		.condition = "not_empty",
-		.match = "",
-		.sql = R"(
-ALTER TABLE `npc_emotes` DROP INDEX `emoteid`;
-)",
-		.content_schema_update = true
-	},
-	ManifestEntry{
-		.version = 9249,
-		.description = "2023_12_26_add_tasks_enabled_column.sql",
-		.check = "SHOW COLUMNS FROM `tasks` LIKE 'enabled'",
-		.condition = "empty",
-		.match = "",
-		.sql = R"(
-ALTER TABLE `tasks`
-ADD COLUMN `enabled` smallint NULL DEFAULT 1 AFTER `faction_amount`
-)",
-		.content_schema_update = true
-	},
-	ManifestEntry{
-		.version = 9250,
-		.description = "2023_01_06_task_activities_list_group.sql",
-		.check = "SHOW COLUMNS FROM `task_activities` LIKE 'list_group'",
-		.condition = "empty",
-		.match = "",
-		.sql = R"(
-ALTER TABLE `task_activities`
-	ADD COLUMN `list_group` TINYINT UNSIGNED NOT NULL DEFAULT '0' AFTER `optional`;
-)",
-		.content_schema_update = true
-	},
-	ManifestEntry{
-		.version = 9251,
-		.description = "2023_01_12_instance_list_notes.sql",
-		.check = "SHOW COLUMNS FROM `instance_list` LIKE 'notes'",
-		.condition = "empty",
-		.match = "",
-		.sql = R"(
-ALTER TABLE `instance_list`
-	ADD COLUMN `notes` varchar(50) NOT NULL DEFAULT '' AFTER `never_expires`;
-)",
-	},
-	ManifestEntry{
-		.version = 9252,
-		.description = "2024_01_07_zone_idle_when_empty.sql",
-		.check = "SHOW COLUMNS FROM `zone` LIKE 'idle_when_empty'",
-		.condition = "empty",
-		.match = "",
-		.sql = R"(
-ALTER TABLE `zone`
-ADD COLUMN `idle_when_empty` tinyint(1) UNSIGNED NOT NULL DEFAULT 1 AFTER `min_lava_damage`,
-ADD COLUMN `seconds_before_idle` int(11) UNSIGNED NOT NULL DEFAULT 60 AFTER `idle_when_empty`;
-)",
-		.content_schema_update = true
-	},
-	ManifestEntry{
-		.version = 9253,
-		.description = "2024_01_13_merchantlist_slot.sql",
-		.check = "SHOW COLUMNS FROM `merchantlist` LIKE 'slot'",
-		.condition = "missing",
-		.match = "unsigned",
-		.sql = R"(
-ALTER TABLE `merchantlist`
-	MODIFY COLUMN `slot` int(11) UNSIGNED NOT NULL DEFAULT 0
-)",
-		.content_schema_update = true
-	},
-	ManifestEntry{
-		.version = 9254,
-		.description = "2024_01_13_merchantlist_temp_slot.sql",
-		.check = "SHOW COLUMNS FROM `merchantlist_temp` LIKE 'slot'",
-		.condition = "contains",
-		.match = "tinyint",
-		.sql = R"(
-ALTER TABLE `merchantlist_temp`
-	MODIFY COLUMN `slot` int(11) UNSIGNED NOT NULL DEFAULT 0
-)"
-	},
-	ManifestEntry{
-		.version = 9255,
-		.description = "2024_01_13_drop_item_tick_deprecated.sql",
-		.check = "show tables like 'item_tick'",
-		.condition = "not_empty",
-		.match = "",
-		.sql = R"(
-DROP TABLE IF EXISTS item_tick
-)"
-	},
-	ManifestEntry{
-		.version = 9256,
-		.description = "2024_01_16_increase_spawngroup_size.sql",
-		.check = "SHOW COLUMNS FROM `spawngroup` LIKE 'name'",
-		.condition = "contains",
-		.match = "varchar(50)",
-		.sql = R"(
-ALTER TABLE `spawngroup`
-MODIFY COLUMN `name` varchar(200) CHARACTER SET latin1 COLLATE latin1_swedish_ci NOT NULL DEFAULT '' AFTER `id`;
-)",
-		.content_schema_update = true
-	},
-	ManifestEntry{
-		.version = 9257,
-		.description = "2024_01_16_ground_spawns_fix_z.sql",
-		.check = "SHOW COLUMNS FROM `ground_spawns` LIKE 'fix_z'",
-		.condition = "empty",
-		.match = "",
-		.sql = R"(
-ALTER TABLE `ground_spawns`
-ADD COLUMN `fix_z` tinyint(1) UNSIGNED NOT NULL DEFAULT 1 AFTER `respawn_timer`;
-)",
-		.content_schema_update = true
-	},
-	ManifestEntry{
-		.version = 9258,
-		.description = "2024_02_04_base_data.sql",
-		.check = "SHOW COLUMNS FROM `base_data` LIKE 'hp_regen'",
-		.condition = "empty",
-		.match = "",
-		.sql = R"(
-ALTER TABLE `base_data`
-CHANGE COLUMN `unk1` `hp_regen` double NOT NULL AFTER `end`,
-CHANGE COLUMN `unk2` `end_regen` double NOT NULL AFTER `hp_regen`,
-MODIFY COLUMN `level` tinyint(3) UNSIGNED NOT NULL FIRST,
-MODIFY COLUMN `class` tinyint(2) UNSIGNED NOT NULL AFTER `level`;
-)",
-		.content_schema_update = true
-	},
-	ManifestEntry{
-		.version = 9259,
-		.description = "2024_01_13_corpse_rez_overhaul.sql",
-		.check = "SHOW COLUMNS FROM `character_corpses` LIKE 'rez_time'",
-		.condition = "empty",
-		.match = "",
-		.sql = R"(
-ALTER TABLE `character_corpses`
-ADD COLUMN `rez_time` int(11) UNSIGNED NOT NULL DEFAULT 0 AFTER `wc_9`,
-ADD COLUMN `gm_exp` int(11) UNSIGNED NOT NULL DEFAULT 0 AFTER `rez_time`,
-ADD COLUMN `killed_by` int(11) UNSIGNED NOT NULL DEFAULT 0 AFTER `gm_exp`,
-ADD COLUMN `rezzable` tinyint(1) UNSIGNED NOT NULL DEFAULT 0 AFTER `killed_by`;
-)"
-	},
-	ManifestEntry{
-		.version = 9260,
-		.description = "2023_11_11_guild_features.sql",
-		.check = "SHOW TABLES LIKE 'guild_permissions'",
-		.condition = "empty",
-		.match = "",
-		.sql = R"(
-CREATE TABLE `guild_permissions` (
-	`id` INT(11) NOT NULL AUTO_INCREMENT,
-	`perm_id` INT(11) NOT NULL DEFAULT '0',
-	`guild_id` INT(11) NOT NULL DEFAULT '0',
-	`permission` INT(11) NOT NULL DEFAULT '0',
-	PRIMARY KEY (`id`) USING BTREE,
-	UNIQUE INDEX `perm_id_guild_id` (`perm_id`, `guild_id`) USING BTREE
-)
-ENGINE=InnoDB
-AUTO_INCREMENT=1;
-
-UPDATE guild_ranks SET title = 'Leader' WHERE `rank` = '1';
-UPDATE guild_ranks SET title = 'Senior Officer' WHERE `rank` = '2';
-UPDATE guild_ranks SET title = 'Officer' WHERE `rank` = '3';
-UPDATE guild_ranks SET title = 'Senior Member' WHERE `rank` = '4';
-UPDATE guild_ranks SET title = 'Member' WHERE `rank` = '5';
-UPDATE guild_ranks SET title = 'Junior Member' WHERE `rank` = '6';
-UPDATE guild_ranks SET title = 'Initiate' WHERE `rank` = '7';
-UPDATE guild_ranks SET title = 'Recruit' WHERE `rank` = '8';
-
-DELETE FROM guild_ranks WHERE `rank` = 0;
-
-ALTER TABLE `guild_ranks`
-	DROP COLUMN `can_hear`,
-	DROP COLUMN `can_speak`,
-	DROP COLUMN `can_invite`,
-	DROP COLUMN `can_remove`,
-	DROP COLUMN `can_promote`,
-	DROP COLUMN `can_demote`,
-	DROP COLUMN `can_motd`,
-	DROP COLUMN `can_warpeace`;
-
-UPDATE guild_members SET `rank` = '5' WHERE `rank` = '0';
-UPDATE guild_members SET `rank` = '3' WHERE `rank` = '1';
-UPDATE guild_members SET `rank` = '1' WHERE `rank` = '2';
-
-ALTER TABLE `guild_members`
-	ADD COLUMN `online` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0' AFTER `alt`;
-
-ALTER TABLE `guilds`
-	ADD COLUMN `favor` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `url`;
-
-CREATE TABLE guild_tributes (
-  guild_id int(11) unsigned NOT NULL DEFAULT 0,
-  tribute_id_1 int(11) unsigned NOT NULL DEFAULT 0,
-  tribute_id_1_tier int(11) unsigned NOT NULL DEFAULT 0,
-  tribute_id_2 int(11) unsigned NOT NULL DEFAULT 0,
-  tribute_id_2_tier int(11) unsigned NOT NULL DEFAULT 0,
-  time_remaining int(11) unsigned NOT NULL DEFAULT 0,
-  enabled int(11) unsigned NOT NULL DEFAULT 0,
-  PRIMARY KEY (guild_id) USING BTREE
-) ENGINE=InnoDB;
-)"
-	},
-	ManifestEntry{
-		.version = 9261,
-		.description = "2024_02_11_character_corpses.sql",
-		.check = "SHOW COLUMNS FROM `character_corpses` LIKE 'time_of_death'",
-		.condition = "contains",
-		.match = "0000-00-00 00:00:00",
-		.sql = R"(
-ALTER TABLE `character_corpses` MODIFY COLUMN `time_of_death` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP;
-		)"
-	},
-	ManifestEntry{
-		.version = 9262,
-		.description = "2024_02_11_object_contents.sql",
-		.check = "SHOW COLUMNS FROM `object_contents` LIKE 'droptime'",
-		.condition = "contains",
-		.match = "0000-00-00 00:00:00",
-		.sql = R"(
-ALTER TABLE `object_contents` MODIFY COLUMN `droptime` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP;
-		)"
-	},
-	ManifestEntry{
-		.version = 9263,
-		.description = "2024_02_16_rearrange_zone_columns.sql",
-		.check = "show columns from zone like 'note'",
-		.condition = "missing",
-		.match = "varchar(200)",
-		.sql = R"(
-ALTER TABLE `zone`
-MODIFY COLUMN `id` int(10) NOT NULL AUTO_INCREMENT FIRST,
-MODIFY COLUMN `zoneidnumber` int(4) NOT NULL DEFAULT 0 AFTER `id`,
-MODIFY COLUMN `version` tinyint(3) UNSIGNED NOT NULL DEFAULT 0 AFTER `zoneidnumber`,
-MODIFY COLUMN `short_name` varchar(32) CHARACTER SET latin1 COLLATE latin1_swedish_ci NULL DEFAULT NULL AFTER `version`,
-MODIFY COLUMN `long_name` text CHARACTER SET latin1 COLLATE latin1_swedish_ci NOT NULL AFTER `short_name`,
-MODIFY COLUMN `min_status` tinyint(3) UNSIGNED NOT NULL DEFAULT 0 AFTER `long_name`,
-MODIFY COLUMN `note` varchar(200) CHARACTER SET latin1 COLLATE latin1_swedish_ci NULL DEFAULT NULL AFTER `map_file_name`,
-MODIFY COLUMN `min_expansion` tinyint(4) NOT NULL DEFAULT -1 AFTER `note`,
-MODIFY COLUMN `max_expansion` tinyint(4) NOT NULL DEFAULT -1 AFTER `min_expansion`,
-MODIFY COLUMN `content_flags` varchar(100) CHARACTER SET latin1 COLLATE latin1_swedish_ci NULL DEFAULT NULL AFTER `max_expansion`,
-MODIFY COLUMN `content_flags_disabled` varchar(100) CHARACTER SET latin1 COLLATE latin1_swedish_ci NULL DEFAULT NULL AFTER `content_flags`,
-MODIFY COLUMN `expansion` tinyint(3) NOT NULL DEFAULT 0 AFTER `content_flags_disabled`,
-MODIFY COLUMN `file_name` varchar(16) CHARACTER SET latin1 COLLATE latin1_swedish_ci NULL DEFAULT NULL AFTER `expansion`,
-MODIFY COLUMN `safe_x` float NOT NULL DEFAULT 0 AFTER `file_name`,
-MODIFY COLUMN `safe_y` float NOT NULL DEFAULT 0 AFTER `safe_x`,
-MODIFY COLUMN `safe_z` float NOT NULL DEFAULT 0 AFTER `safe_y`,
-MODIFY COLUMN `safe_heading` float NOT NULL DEFAULT 0 AFTER `safe_z`;
-		)",
-		.content_schema_update = true
-	},
-	ManifestEntry{
-		.version = 9264,
-		.description = "2024_02_18_starting_items_augments.sql",
-		.check = "SHOW COLUMNS FROM `starting_items` LIKE 'augment_one'",
-		.condition = "empty",
-		.match = "",
-		.sql = R"(
-ALTER TABLE `starting_items`
-ADD COLUMN `augment_one` int(11) UNSIGNED NOT NULL DEFAULT 0 AFTER `item_charges`,
-ADD COLUMN `augment_two` int(11) UNSIGNED NOT NULL DEFAULT 0 AFTER `augment_one`,
-ADD COLUMN `augment_three` int(11) UNSIGNED NOT NULL DEFAULT 0 AFTER `augment_two`,
-ADD COLUMN `augment_four` int(11) UNSIGNED NOT NULL DEFAULT 0 AFTER `augment_three`,
-ADD COLUMN `augment_five` int(11) UNSIGNED NOT NULL DEFAULT 0 AFTER `augment_four`,
-ADD COLUMN `augment_six` int(11) UNSIGNED NOT NULL DEFAULT 0 AFTER `augment_five`;
-		)",
-		.content_schema_update = true
-	},
-	ManifestEntry{
-		.version = 9265,
-		.description = "2024_03_03_add_id_to_guild_bank.sql",
-		.check = "SHOW COLUMNS FROM `guild_bank` LIKE 'id'",
-		.condition = "empty",
-		.match = "",
-		.sql = R"(
-ALTER TABLE `guild_bank`
-ADD COLUMN `id` INT UNSIGNED NOT NULL AUTO_INCREMENT FIRST,
-ADD PRIMARY KEY (`id`);
-		)",
-	},
-	ManifestEntry{
-		.version = 9266,
-		.description = "2024_03_02_rule_values_rule_value_length.sql",
-		.check = "SHOW COLUMNS FROM `rule_values` LIKE 'rule_value'",
-		.condition = "contains",
-		.match = "varchar(30)",
-		.sql = R"(
-ALTER TABLE `rule_values`
-MODIFY COLUMN `rule_value` text CHARACTER SET latin1 COLLATE latin1_swedish_ci NULL DEFAULT NULL AFTER `rule_name`;
-		)"
-	},
-	ManifestEntry{
-		.version = 9267,
-		.description = "2024_02_18_group_id_bot_id.sql",
-		.check = "SHOW COLUMNS FROM `group_id` LIKE 'bot_id'",
-		.condition = "empty",
-		.match = "",
-		.sql = R"(
-ALTER TABLE `group_id`
-CHANGE COLUMN `groupid` `group_id` int(11) UNSIGNED NOT NULL DEFAULT 0 FIRST,
-CHANGE COLUMN `charid` `character_id` int(11) UNSIGNED NOT NULL DEFAULT 0 AFTER `group_id`,
-CHANGE COLUMN `ismerc` `merc_id` int(11) UNSIGNED NOT NULL DEFAULT 0 AFTER `name`,
-ADD COLUMN `bot_id` int(11) UNSIGNED NOT NULL DEFAULT 0 AFTER `character_id`,
-MODIFY COLUMN `name` varchar(64) NOT NULL DEFAULT '' AFTER `character_id`,
-DROP PRIMARY KEY,
-ADD PRIMARY KEY (`group_id`, `character_id`, `bot_id`, `merc_id`) USING BTREE;
-ALTER TABLE `group_id`
-MODIFY COLUMN `character_id` int(11) UNSIGNED NOT NULL DEFAULT 0 AFTER `name`;
-)"
-	},
-	ManifestEntry{
-		.version = 9268,
-		.description = "2024_03_23_skill_caps.sql",
-		.check = "SHOW COLUMNS FROM `skill_caps` LIKE 'skill_id'",
-		.condition = "empty",
-		.match = "",
-		.sql = R"(
-ALTER TABLE `skill_caps`
-CHANGE COLUMN `skillID` `skill_id` tinyint(3) UNSIGNED NOT NULL DEFAULT 0 FIRST,
-CHANGE COLUMN `class` `class_id` tinyint(3) UNSIGNED NOT NULL DEFAULT 0 AFTER `skill_id`,
-ADD COLUMN `id` int(3) UNSIGNED NOT NULL AUTO_INCREMENT FIRST,
-DROP PRIMARY KEY,
-ADD PRIMARY KEY (`id`) USING BTREE,
-ADD INDEX `level_skill_cap`(`skill_id`, `class_id`, `level`, `cap`);
-)",
-		.content_schema_update = true,
-	},
-	ManifestEntry{
-		.version = 9269,
-		.description = "2024_03_27_account_auto_login_charname.sql",
-		.check = "SHOW COLUMNS FROM `account` LIKE 'auto_login_charname'",
-		.condition = "empty",
-		.match = "",
-		.sql = R"(
-ALTER TABLE `account`
-ADD COLUMN `auto_login_charname` varchar(64) CHARACTER SET latin1 COLLATE latin1_swedish_ci NOT NULL DEFAULT '' AFTER `charname`;
-)"
-	},
-	ManifestEntry{
-		.version = 9270,
-		.description = "2024_04_31_content_flagging_lootdrop_entries.sql",
-		.check = "SHOW COLUMNS FROM `lootdrop_entries` LIKE 'content_flags'",
-		.condition = "empty",
-		.match = "",
-		.sql = R"(
-ALTER TABLE `lootdrop_entries` ADD `min_expansion` tinyint(4) NOT NULL DEFAULT -1;
-ALTER TABLE `lootdrop_entries` ADD `max_expansion` tinyint(4) NOT NULL DEFAULT -1;
-ALTER TABLE `lootdrop_entries` ADD `content_flags` varchar(100) NULL;
-ALTER TABLE `lootdrop_entries` ADD `content_flags_disabled` varchar(100) NULL;
-)",
-		.content_schema_update = true
-	},
-	ManifestEntry{
-		.version = 9271,
-		.description = "2024_03_10_parcel_implementation.sql",
-		.check = "SHOW TABLES LIKE 'character_parcels'",
-		.condition = "empty",
-		.match = "",
-		.sql = R"(CREATE TABLE `character_parcels` (
-				`id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
-				`char_id` INT(10) UNSIGNED NOT NULL DEFAULT '0',
-				`item_id` INT(10) UNSIGNED NOT NULL DEFAULT '0',
-				`slot_id` INT(10) UNSIGNED NOT NULL DEFAULT '0',
-				`quantity` INT(10) UNSIGNED NOT NULL DEFAULT '0',
-				`from_name` VARCHAR(64) NULL DEFAULT NULL COLLATE 'latin1_swedish_ci',
-				`note` VARCHAR(1024) NULL DEFAULT NULL COLLATE 'latin1_swedish_ci',
-				`sent_date` DATETIME NULL DEFAULT NULL,
-				PRIMARY KEY (`id`) USING BTREE,
-				UNIQUE INDEX `data_constraint` (`slot_id`, `char_id`) USING BTREE
-				)
-				COLLATE='latin1_swedish_ci'
-				ENGINE=InnoDB
-				AUTO_INCREMENT=1;
-		)"
-	},
-	ManifestEntry{
-		.version     = 9272,
-		.description = "2024_04_23_add_parcel_support_for_augmented_items.sql",
-		.check       = "SHOW COLUMNS FROM `character_parcels` LIKE 'aug_slot_1'",
-		.condition   = "empty",
-		.match       = "",
-		.sql         = R"(
-ALTER TABLE `character_parcels`
-	ADD COLUMN `aug_slot_1` INT UNSIGNED NOT NULL DEFAULT '0' AFTER `item_id`,
-	ADD COLUMN `aug_slot_2` INT UNSIGNED NOT NULL DEFAULT '0' AFTER `aug_slot_1`,
-	ADD COLUMN `aug_slot_3` INT UNSIGNED NOT NULL DEFAULT '0' AFTER `aug_slot_2`,
-	ADD COLUMN `aug_slot_4` INT UNSIGNED NOT NULL DEFAULT '0' AFTER `aug_slot_3`,
-	ADD COLUMN `aug_slot_5` INT UNSIGNED NOT NULL DEFAULT '0' AFTER `aug_slot_4`,
-	ADD COLUMN `aug_slot_6` INT UNSIGNED NOT NULL DEFAULT '0' AFTER `aug_slot_5`;
-)"
-	},
-	ManifestEntry{
-		.version = 9273,
-		.description = "2024_04_24_door_close_timer.sql",
-		.check = "SHOW COLUMNS FROM `doors` LIKE 'close_timer_ms'",
-		.condition = "empty",
-		.match = "",
-		.sql = R"(
-ALTER TABLE `doors`
-ADD COLUMN `close_timer_ms` smallint(8) UNSIGNED NOT NULL DEFAULT 5000 AFTER `is_ldon_door`;
-)",
-		.content_schema_update = true
-	},
-	ManifestEntry{
-		.version = 9274,
-		.description = "2024_05_02_parcel_npc_content.sql",
-		.check = "SHOW COLUMNS FROM `npc_types` LIKE 'is_parcel_merchant'",
-		.condition = "empty",
-		.match = "",
-		.sql = R"(
-ALTER TABLE `npc_types`
-ADD COLUMN `is_parcel_merchant` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0' AFTER `keeps_sold_items`;
-)",
-		.content_schema_update = true
-	},
-	ManifestEntry{
-		.version = 9275,
-		.description = "2024_04_28_character_extra_haste.sql",
-		.check = "SHOW COLUMNS FROM `character_data` LIKE 'extra_haste'",
-		.condition = "empty",
-		.match = "",
-		.sql = R"(
-ALTER TABLE `character_data`
-ADD COLUMN `extra_haste` int(11) NOT NULL DEFAULT 0 AFTER `wis`;
-)"
-	},
-	ManifestEntry{
-		.version = 9276,
-		.description = "2024_05_12_fix_guild_bank_dup_issue.sql",
-		.check = "SHOW COLUMNS FROM `guild_bank` WHERE FIELD = 'qty' AND Type LIKE '%unsigned';",
-		.condition = "not_empty",
-		.match = "",
-		.sql = R"(
-ALTER TABLE `guild_bank`
-	CHANGE COLUMN `qty` `qty` INT(10) NOT NULL DEFAULT '0' AFTER `itemid`;
 )"
 	}
+
 // -- template; copy/paste this when you need to create a new entry
 //	ManifestEntry{
 //		.version = 9228,
@@ -82,74 +82,6 @@ CREATE TABLE `bot_starting_items`  (
 `content_flags_disabled` varchar(100) CHARACTER SET latin1 COLLATE latin1_swedish_ci NULL DEFAULT NULL,
 PRIMARY KEY (`id`)
 ) ENGINE = InnoDB CHARACTER SET = latin1 COLLATE = latin1_swedish_ci;
-)",
-	},
-	ManifestEntry{
-		.version = 9041,
-		.description = "2023_12_04_bot_timers.sql",
-		.check = "SHOW COLUMNS FROM `bot_timers` LIKE 'recast_time'",
-		.condition = "empty",
-		.match = "",
-		.sql = R"(
-ALTER TABLE `bot_timers`
-	ADD COLUMN `recast_time` INT(11) UNSIGNED NOT NULL DEFAULT '0' AFTER `timer_value`,
-	ADD COLUMN `is_spell` TINYINT(2) UNSIGNED NOT NULL DEFAULT 0 AFTER `recast_time`,
-	ADD COLUMN `is_disc` TINYINT(2) UNSIGNED NOT NULL DEFAULT 0 AFTER `is_spell`,
-	ADD COLUMN `spell_id` INT(11) UNSIGNED NOT NULL DEFAULT '0' AFTER `is_disc`,
-	ADD COLUMN `is_item` TINYINT(2) UNSIGNED NOT NULL DEFAULT 0 AFTER `spell_id`,
-	ADD COLUMN `item_id` INT(11) UNSIGNED NOT NULL DEFAULT '0' AFTER `is_item`;
-ALTER TABLE `bot_timers`
-	DROP FOREIGN KEY `FK_bot_timers_1`;
-ALTER TABLE `bot_timers`
-	DROP PRIMARY KEY;
-ALTER TABLE `bot_timers`
-	ADD PRIMARY KEY (`bot_id`, `timer_id`, `spell_id`, `item_id`);
-)"
-	},
-	ManifestEntry{
-		.version = 9042,
-		.description = "2024_01_27_delete_bot_foreign_keys.sql",
-		.check = "SHOW CREATE TABLE `bot_stances`",
-		.condition = "contains",
-		.match = "FOREIGN",
-		.sql = R"(
-ALTER TABLE `bot_buffs` DROP FOREIGN KEY `FK_bot_buffs_1`;
-ALTER TABLE `bot_heal_rotations` DROP FOREIGN KEY `FK_bot_heal_rotations`;
-ALTER TABLE `bot_heal_rotation_members` DROP FOREIGN KEY `FK_bot_heal_rotation_members_1`;
-ALTER TABLE `bot_heal_rotation_members` DROP FOREIGN KEY `FK_bot_heal_rotation_members_2`;
-ALTER TABLE `bot_heal_rotation_targets` DROP FOREIGN KEY `FK_bot_heal_rotation_targets`;
-ALTER TABLE `bot_inventories` DROP FOREIGN KEY `FK_bot_inventories_1`;
-ALTER TABLE `bot_pets` DROP FOREIGN KEY `FK_bot_pets_1`;
-ALTER TABLE `bot_pet_buffs` DROP FOREIGN KEY `FK_bot_pet_buffs_1`;
-ALTER TABLE `bot_pet_inventories` DROP FOREIGN KEY `FK_bot_pet_inventories_1`;
-ALTER TABLE `bot_stances` DROP FOREIGN KEY `FK_bot_stances_1`;
-)"
-	},
-	ManifestEntry{
-		.version = 9043,
-		.description = "2024_02_18_bot_starting_items_augments.sql",
-		.check = "SHOW COLUMNS FROM `bot_starting_items` LIKE 'augment_one'",
-		.condition = "empty",
-		.match = "",
-		.sql = R"(
-ALTER TABLE `bot_starting_items`
-ADD COLUMN `augment_one` int(11) UNSIGNED NOT NULL DEFAULT 0 AFTER `item_charges`,
-ADD COLUMN `augment_two` int(11) UNSIGNED NOT NULL DEFAULT 0 AFTER `augment_one`,
-ADD COLUMN `augment_three` int(11) UNSIGNED NOT NULL DEFAULT 0 AFTER `augment_two`,
-ADD COLUMN `augment_four` int(11) UNSIGNED NOT NULL DEFAULT 0 AFTER `augment_three`,
-ADD COLUMN `augment_five` int(11) UNSIGNED NOT NULL DEFAULT 0 AFTER `augment_four`,
-ADD COLUMN `augment_six` int(11) UNSIGNED NOT NULL DEFAULT 0 AFTER `augment_five`;
-)"
-	},
-	ManifestEntry{
-		.version = 9044,
-		.description = "2024_04_23_bot_extra_haste.sql",
-		.check = "SHOW COLUMNS FROM `bot_data` LIKE 'extra_haste'",
-		.condition = "empty",
-		.match = "",
-		.sql = R"(
-ALTER TABLE `bot_data`
-ADD COLUMN `extra_haste` mediumint(8) NOT NULL DEFAULT 0 AFTER `wis`;
 )"
 	}
 // -- template; copy/paste this when you need to create a new entry
@@ -0,0 +1,39 @@
+#include "../common/global_define.h"
+#include "../common/rulesys.h"
+#include "../common/strings.h"
+
+#include "database.h"
+#include "database/database_update.h"
+
+
+// Disgrace: for windows compile
+#ifdef _WINDOWS
+#include <windows.h>
+#define snprintf	_snprintf
+#define strncasecmp	_strnicmp
+#define strcasecmp	_stricmp
+#else
+
+#include "unix.h"
+#include <netinet/in.h>
+#include <sys/time.h>
+
+#endif
+
+#pragma pack(1)
+
+DatabaseUpdate database_update;
+
+bool Database::CheckDatabaseConversions()
+{
+	auto *r = RuleManager::Instance();
+	r->LoadRules(this, "default", false);
+	if (!RuleB(Bots, Enabled) && DoesTableExist("bot_data")) {
+		LogInfo("Bot tables found but rule not enabled, enabling");
+		r->SetRule("Bots:Enabled", "true", this, true, true);
+	}
+
+	database_update.SetDatabase(this)->CheckDbUpdates();
+
+	return true;
+}
@@ -421,25 +421,20 @@ void Database::AssignGroupToInstance(uint32 group_id, uint32 instance_id)
 	auto zone_id = GetInstanceZoneID(instance_id);
 	auto version = GetInstanceVersion(instance_id);

-	const auto& l = GroupIdRepository::GetWhere(
+	auto l = GroupIdRepository::GetWhere(
 		*this,
 		fmt::format(
-			"`group_id` = {}",
+			"groupid = {}",
 			group_id
 		)
 	);
-
 	if (l.empty()) {
 		return;
 	}

 	for (const auto& e : l) {
-		if (!e.character_id) {
-			continue;
-		}
-
-		if (!GetInstanceID(zone_id, e.character_id, version)) {
-			AddClientToInstance(instance_id, e.character_id);
+		if (!GetInstanceID(zone_id, e.charid, version)) {
+			AddClientToInstance(instance_id, e.charid);
 		}
 	}
 }
@@ -509,7 +504,7 @@ void Database::FlagInstanceByRaidLeader(uint32 zone_id, int16 version, uint32 ch
 		return;
 	}

-	auto raid_leader_id = GetCharacterID(GetRaidLeaderName(raid_id).c_str());
+	auto raid_leader_id = GetCharacterID(GetRaidLeaderName(raid_id));
 	auto raid_leader_instance_id = GetInstanceID(zone_id, raid_leader_id, version);

 	if (!raid_leader_instance_id) {
@@ -575,23 +570,3 @@ void Database::SetInstanceDuration(uint16 instance_id, uint32 new_duration)

 	InstanceListRepository::UpdateOne(*this, i);
 }
-
-void Database::CleanupInstanceCorpses() {
-	auto l = InstanceListRepository::GetWhere(
-		*this,
-		"never_expires = 0"
-	);
-
-	if (l.empty()) {
-		return;
-	}
-
-	std::vector<std::string> instance_ids;
-	for (const auto& e : l) {
-		instance_ids.emplace_back(std::to_string(e.id));
-	}
-
-	const auto imploded_instance_ids = Strings::Implode(",", instance_ids);
-
-	CharacterCorpsesRepository::BuryInstances(*this, imploded_instance_ids);
-}
@@ -59,7 +59,6 @@ namespace DatabaseSchema {
 			{"character_leadership_abilities", "id"},
 			{"character_material",             "id"},
 			{"character_memmed_spells",        "id"},
-			{"character_parcels",              "char_id"},
 			{"character_pet_buffs",            "char_id"},
 			{"character_pet_info",             "char_id"},
 			{"character_pet_inventory",        "char_id"},
@@ -72,7 +71,7 @@ namespace DatabaseSchema {
 			{"character_tasks",                "charid"},
 			{"character_tribute",              "character_id"},
 			{"completed_tasks",                "charid"},
-			{"data_buckets",                   "character_id"},
+			{"data_buckets",                   "id"},
 			{"faction_values",                 "char_id"},
 			{"friends",                        "charid"},
 			{"guild_members",                  "char_id"},
@@ -129,7 +128,6 @@ namespace DatabaseSchema {
 			"character_leadership_abilities",
 			"character_material",
 			"character_memmed_spells",
-			"character_parcels",
 			"character_pet_buffs",
 			"character_pet_info",
 			"character_pet_inventory",
@@ -148,10 +146,8 @@ namespace DatabaseSchema {
 			"friends",
 			"guild_bank",
 			"guild_members",
-			"guild_permissions",
 			"guild_ranks",
 			"guild_relations",
-			"guild_tributes",
 			"guilds",
 			"instance_list_player",
 			"inventory",
@@ -336,6 +332,7 @@ namespace DatabaseSchema {
 			"group_leaders",
 			"instance_list",
 			"ip_exemptions",
+			"item_tick",
 			"lfguild",
 			"merc_buffs",
 			"merchantlist_temp",
@@ -8,6 +8,7 @@

 #include "dbcore.h"

+#include <errmsg.h>
 #include <fstream>
 #include <iostream>
 #include <mysqld_error.h>
@@ -137,7 +138,7 @@ MySQLRequestResult DBcore::QueryDatabase(const char *query, uint32 querylen, boo
 		 * Error logging
 		 */
 		if (mysql_errno(mysql) > 0 && query[0] != '\0') {
-			LogMySQLError("MySQL Error ({}) [{}] Query [{}]", mysql_errno(mysql), mysql_error(mysql), query);
+			LogMySQLError("[{}] [{}]\n[{}]", mysql_errno(mysql), mysql_error(mysql), query);
 		}

 		return MySQLRequestResult(nullptr, 0, 0, 0, 0, mysql_errno(mysql), errorBuffer);
@@ -14,9 +14,6 @@
 #include <string.h>
 #include <mutex>

-#define CR_SERVER_GONE_ERROR    2006
-#define CR_SERVER_LOST          2013
-
 class DBcore {
 public:
 	enum eStatus {
@@ -71,8 +71,6 @@ namespace EQ
 			bit_DeityAll           = UINT32_MAX
 		};

-		constexpr int format_as(DeityType type) { return static_cast<int>(type); }
-
 		extern DeityTypeBit GetDeityBitmask(DeityType deity_type);
 		extern std::string GetDeityName(DeityType deity_type);
 		extern const std::map<DeityType, std::string>& GetDeityMap();
@@ -22,6 +22,7 @@
 #include "data_verification.h"
 #include "eqemu_logsys.h"
 #include "eqemu_logsys_log_aliases.h"
+#include "languages.h"
 #include "rulesys.h"

 int16 EQ::invtype::GetInvTypeSize(int16 inv_type) {
@@ -158,45 +159,45 @@ int EQ::constants::ConvertStanceTypeToIndex(StanceType stance_type) {
 	return 0;
 }

-const std::map<uint8, std::string>& EQ::constants::GetLanguageMap()
+const std::map<int, std::string>& EQ::constants::GetLanguageMap()
 {
-	static const std::map<uint8, std::string> language_map = {
-		{ Language::CommonTongue,  "Common Tongue" },
-		{ Language::Barbarian,     "Barbarian" },
-		{ Language::Erudian,       "Erudian" },
-		{ Language::Elvish,        "Elvish" },
-		{ Language::DarkElvish,    "Dark Elvish" },
-		{ Language::Dwarvish,      "Dwarvish" },
-		{ Language::Troll,         "Troll" },
-		{ Language::Ogre,          "Ogre" },
-		{ Language::Gnomish,       "Gnomish" },
-		{ Language::Halfling,      "Halfling" },
-		{ Language::ThievesCant,   "Thieves Cant" },
-		{ Language::OldErudian,    "Old Erudian" },
-		{ Language::ElderElvish,   "Elder Elvish" },
-		{ Language::Froglok,       "Froglok" },
-		{ Language::Goblin,        "Goblin" },
-		{ Language::Gnoll,         "Gnoll" },
-		{ Language::CombineTongue, "Combine Tongue" },
-		{ Language::ElderTeirDal,  "Elder Teir'Dal" },
-		{ Language::Lizardman,     "Lizardman" },
-		{ Language::Orcish,        "Orcish" },
-		{ Language::Faerie,        "Faerie" },
-		{ Language::Dragon,        "Dragon" },
-		{ Language::ElderDragon,   "Elder Dragon" },
-		{ Language::DarkSpeech,    "Dark Speech" },
-		{ Language::VahShir,       "Vah Shir" },
-		{ Language::Alaran,        "Alaran" },
-		{ Language::Hadal,         "Hadal" },
-		{ Language::Unknown27,     "Unknown" }
+	static const std::map<int, std::string> language_map = {
+		{ LANG_COMMON_TONGUE, "Common Tongue" },
+		{ LANG_BARBARIAN, "Barbarian" },
+		{ LANG_ERUDIAN, "Erudian" },
+		{ LANG_ELVISH, "Elvish" },
+		{ LANG_DARK_ELVISH, "Dark Elvish" },
+		{ LANG_DWARVISH, "Dwarvish" },
+		{ LANG_TROLL, "Troll" },
+		{ LANG_OGRE, "Ogre" },
+		{ LANG_GNOMISH, "Gnomish" },
+		{ LANG_HALFLING, "Halfling" },
+		{ LANG_THIEVES_CANT, "Thieves Cant" },
+		{ LANG_OLD_ERUDIAN, "Old Erudian" },
+		{ LANG_ELDER_ELVISH, "Elder Elvish" },
+		{ LANG_FROGLOK, "Froglok" },
+		{ LANG_GOBLIN, "Goblin" },
+		{ LANG_GNOLL, "Gnoll" },
+		{ LANG_COMBINE_TONGUE, "Combine Tongue" },
+		{ LANG_ELDER_TEIRDAL, "Elder Teirdal" },
+		{ LANG_LIZARDMAN, "Lizardman" },
+		{ LANG_ORCISH, "Orcish" },
+		{ LANG_FAERIE, "Faerie" },
+		{ LANG_DRAGON, "Dragon" },
+		{ LANG_ELDER_DRAGON, "Elder Dragon" },
+		{ LANG_DARK_SPEECH, "Dark Speech" },
+		{ LANG_VAH_SHIR, "Vah Shir" },
+		{ LANG_ALARAN, "Alaran" },
+		{ LANG_HADAL, "Hadal" },
+		{ LANG_UNKNOWN, "Unknown" }
 	};

 	return language_map;
 }

-std::string EQ::constants::GetLanguageName(uint8 language_id)
+std::string EQ::constants::GetLanguageName(int language_id)
 {
-	if (!EQ::ValueWithin(language_id, Language::CommonTongue, Language::Unknown27)) {
+	if (!EQ::ValueWithin(language_id, LANG_COMMON_TONGUE, LANG_UNKNOWN)) {
 		return std::string();
 	}

@@ -508,6 +509,7 @@ std::string EQ::constants::GetObjectTypeName(int object_type)
 {
 	if (!EQ::ValueWithin(object_type, ObjectTypes::SmallBag, ObjectTypes::NoDeposit)) {
 		return std::string();
+
 	}

 	return EQ::constants::GetObjectTypeMap().find(object_type)->second;
@@ -562,7 +564,6 @@ std::string EQ::constants::GetEmoteEventTypeName(uint8 emote_event_type)
 const std::map<uint8, std::string> &EQ::constants::GetEmoteTypeMap()
 {
 	static const std::map<uint8, std::string> emote_type_map = {
-		{ EmoteTypes::Say, "Say" },
 		{ EmoteTypes::Emote, "Emote" },
 		{ EmoteTypes::Shout, "Shout" },
 		{ EmoteTypes::Proximity, "Proximity" }
@@ -573,166 +574,9 @@ const std::map<uint8, std::string> &EQ::constants::GetEmoteTypeMap()

 std::string EQ::constants::GetEmoteTypeName(uint8 emote_type)
 {
-	if (!EQ::ValueWithin(emote_type, EmoteTypes::Say, EmoteTypes::Proximity)) {
+	if (!EQ::ValueWithin(emote_type, EmoteTypes::Emote, EmoteTypes::Proximity)) {
 		return std::string();
 	}

 	return EQ::constants::GetEmoteTypeMap().find(emote_type)->second;
 }
-
-const std::map<uint32, std::string>& EQ::constants::GetAppearanceTypeMap()
-{
-	static const std::map<uint32, std::string> appearance_type_map = {
-		{ AppearanceType::Die, "Die" },
-		{ AppearanceType::WhoLevel, "Who Level" },
-		{ AppearanceType::MaxHealth, "Max Health" },
-		{ AppearanceType::Invisibility, "Invisibility" },
-		{ AppearanceType::PVP, "PVP" },
-		{ AppearanceType::Light, "Light" },
-		{ AppearanceType::Animation, "Animation" },
-		{ AppearanceType::Sneak, "Sneak" },
-		{ AppearanceType::SpawnID, "Spawn ID" },
-		{ AppearanceType::Health, "Health" },
-		{ AppearanceType::Linkdead, "Linkdead" },
-		{ AppearanceType::FlyMode, "Fly Mode" },
-		{ AppearanceType::GM, "GM" },
-		{ AppearanceType::Anonymous, "Anonymous" },
-		{ AppearanceType::GuildID, "Guild ID" },
-		{ AppearanceType::GuildRank, "Guild Rank" },
-		{ AppearanceType::AFK, "AFK" },
-		{ AppearanceType::Pet, "Pet" },
-		{ AppearanceType::Summoned, "Summoned" },
-		{ AppearanceType::Split, "Split" },
-		{ AppearanceType::Size, "Size" },
-		{ AppearanceType::SetType, "Set Type" },
-		{ AppearanceType::NPCName, "NPCName" },
-		{ AppearanceType::AARank, "AARank" },
-		{ AppearanceType::CancelSneakHide, "Cancel Sneak Hide" },
-		{ AppearanceType::AreaHealthRegen, "Area Health Regeneration" },
-		{ AppearanceType::AreaManaRegen, "Area Mana Regeneration" },
-		{ AppearanceType::AreaEnduranceRegen, "Area Endurance Regeneration" },
-		{ AppearanceType::FreezeBeneficialBuffs, "Freeze Beneficial Buffs" },
-		{ AppearanceType::NPCTintIndex, "NPC Tint Index" },
-		{ AppearanceType::GroupAutoConsent, "Group Auto Consent" },
-		{ AppearanceType::RaidAutoConsent, "Raid Auto Consent" },
-		{ AppearanceType::GuildAutoConsent, "Guild Auto Consent" },
-		{ AppearanceType::ShowHelm, "Show Helm" },
-		{ AppearanceType::DamageState, "Damage State" },
-		{ AppearanceType::EQPlayers, "EQ Players" },
-		{ AppearanceType::FindBits, "Find Bits" },
-		{ AppearanceType::TextureType, "Texture Type" },
-		{ AppearanceType::FacePick, "Face Pick" },
-		{ AppearanceType::AntiCheat, "Anti Cheat" },
-		{ AppearanceType::GuildShow, "Guild Show" },
-		{ AppearanceType::OfflineMode, "Offline Mode" }
-	};
-
-	return appearance_type_map;
-}
-
-std::string EQ::constants::GetAppearanceTypeName(uint32 appearance_type)
-{
-	const auto& a = EQ::constants::GetAppearanceTypeMap().find(appearance_type);
-	if (a != EQ::constants::GetAppearanceTypeMap().end()) {
-		return a->second;
-	}
-
-	return std::string();
-}
-
-const std::map<uint32, std::string>& EQ::constants::GetSpecialAbilityMap()
-{
-	static const std::map<uint32, std::string> special_ability_map = {
-		{ SPECATK_SUMMON,            "Summon" },
-		{ SPECATK_ENRAGE,            "Enrage" },
-		{ SPECATK_RAMPAGE,           "Rampage" },
-		{ SPECATK_AREA_RAMPAGE,      "Area Rampage" },
-		{ SPECATK_FLURRY,            "Flurry" },
-		{ SPECATK_TRIPLE,            "Triple Attack" },
-		{ SPECATK_QUAD,              "Quadruple Attack" },
-		{ SPECATK_INNATE_DW,         "Dual Wield" },
-		{ SPECATK_BANE,              "Bane Attack" },
-		{ SPECATK_MAGICAL,           "Magical Attack" },
-		{ SPECATK_RANGED_ATK,        "Ranged Attack" },
-		{ UNSLOWABLE,                "Immune to Slow" },
-		{ UNMEZABLE,                 "Immune to Mesmerize" },
-		{ UNCHARMABLE,               "Immune to Charm" },
-		{ UNSTUNABLE,                "Immune to Stun" },
-		{ UNSNAREABLE,               "Immune to Snare" },
-		{ UNFEARABLE,                "Immune to Fear" },
-		{ UNDISPELLABLE,             "Immune to Dispell" },
-		{ IMMUNE_MELEE,              "Immune to Melee" },
-		{ IMMUNE_MAGIC,              "Immune to Magic" },
-		{ IMMUNE_FLEEING,            "Immune to Fleeing" },
-		{ IMMUNE_MELEE_EXCEPT_BANE,  "Immune to Melee except Bane" },
-		{ IMMUNE_MELEE_NONMAGICAL,   "Immune to Non-Magical Melee" },
-		{ IMMUNE_AGGRO,              "Immune to Aggro" },
-		{ IMMUNE_AGGRO_ON,           "Immune to Being Aggro" },
-		{ IMMUNE_CASTING_FROM_RANGE, "Immune to Ranged Spells" },
-		{ IMMUNE_FEIGN_DEATH,        "Immune to Feign Death" },
-		{ IMMUNE_TAUNT,              "Immune to Taunt" },
-		{ NPC_TUNNELVISION,          "Tunnel Vision" },
-		{ NPC_NO_BUFFHEAL_FRIENDS,   "Does Not Heal of Buff Allies" },
-		{ IMMUNE_PACIFY,             "Immune to Pacify" },
-		{ LEASH,                     "Leashed" },
-		{ TETHER,                    "Tethered" },
-		{ DESTRUCTIBLE_OBJECT,       "Destructible Object" },
-		{ NO_HARM_FROM_CLIENT,       "Immune to Harm from Client" },
-		{ ALWAYS_FLEE,               "Always Flees" },
-		{ FLEE_PERCENT,              "Flee Percentage" },
-		{ ALLOW_BENEFICIAL,          "Allows Beneficial Spells" },
-		{ DISABLE_MELEE,             "Melee is Disabled" },
-		{ NPC_CHASE_DISTANCE,        "Chase Distance" },
-		{ ALLOW_TO_TANK,             "Allowed to Tank" },
-		{ IGNORE_ROOT_AGGRO_RULES,   "Ignores Root Aggro" },
-		{ CASTING_RESIST_DIFF,       "Casting Resist Difficulty" },
-		{ COUNTER_AVOID_DAMAGE,      "Counter Damage Avoidance" },
-		{ PROX_AGGRO,                "Proximity Aggro" },
-		{ IMMUNE_RANGED_ATTACKS,     "Immune to Ranged Attacks" },
-		{ IMMUNE_DAMAGE_CLIENT,      "Immune to Client Damage" },
-		{ IMMUNE_DAMAGE_NPC,         "Immune to NPC Damage" },
-		{ IMMUNE_AGGRO_CLIENT,       "Immune to Client Aggro" },
-		{ IMMUNE_AGGRO_NPC,          "Immune to NPC Aggro" },
-		{ MODIFY_AVOID_DAMAGE,       "Modify Damage Avoidance" },
-		{ IMMUNE_FADING_MEMORIES,    "Immune to Memory Fades" },
-		{ IMMUNE_OPEN,               "Immune to Open" },
-		{ IMMUNE_ASSASSINATE,        "Immune to Assassinate" },
-		{ IMMUNE_HEADSHOT,           "Immune to Headshot" },
-		{ IMMUNE_AGGRO_BOT,          "Immune to Bot Aggro" },
-		{ IMMUNE_DAMAGE_BOT,         "Immune to Bot Damage" },
-	};
-
-	return special_ability_map;
-}
-
-std::string EQ::constants::GetSpecialAbilityName(uint32 ability_id)
-{
-	const auto& a = EQ::constants::GetSpecialAbilityMap().find(ability_id);
-	if (a != EQ::constants::GetSpecialAbilityMap().end()) {
-		return a->second;
-	}
-
-	return std::string();
-}
-
-const std::map<uint32, std::string>& EQ::constants::GetConsiderColorMap()
-{
-	static const std::map<uint32, std::string> consider_color_map = {
-		{ ConsiderColor::Green,         "Green" },
-		{ ConsiderColor::DarkBlue,      "Dark Blue" },
-		{ ConsiderColor::Gray,          "Gray" },
-		{ ConsiderColor::White,         "White" },
-		{ ConsiderColor::Red,           "Red" },
-		{ ConsiderColor::Yellow,        "Yellow" },
-		{ ConsiderColor::LightBlue,     "Light Blue" },
-		{ ConsiderColor::WhiteTitanium, "White" },
-	};
-
-	return consider_color_map;
-}
-
-std::string EQ::constants::GetConsiderColorName(uint32 consider_color)
-{
-	const auto& c = EQ::constants::GetConsiderColorMap().find(consider_color);
-	return c != EQ::constants::GetConsiderColorMap().end() ? c->second : std::string();
-}
@@ -350,7 +350,6 @@ namespace EQ
 		};

 		enum EmoteTypes : uint8 {
-			Say,
 			Emote,
 			Shout,
 			Proximity
@@ -359,8 +358,8 @@ namespace EQ
 		const char *GetStanceName(StanceType stance_type);
 		int ConvertStanceTypeToIndex(StanceType stance_type);

-		extern const std::map<uint8, std::string>& GetLanguageMap();
-		std::string GetLanguageName(uint8 language_id);
+		extern const std::map<int, std::string>& GetLanguageMap();
+		std::string GetLanguageName(int language_id);

 		extern const std::map<uint32, std::string>& GetLDoNThemeMap();
 		std::string GetLDoNThemeName(uint32 theme_id);
@@ -398,15 +397,6 @@ namespace EQ
 		extern const std::map<uint8, std::string>& GetEmoteTypeMap();
 		std::string GetEmoteTypeName(uint8 emote_type);

-		extern const std::map<uint32, std::string>& GetAppearanceTypeMap();
-		std::string GetAppearanceTypeName(uint32 animation_type);
-
-		extern const std::map<uint32, std::string>& GetSpecialAbilityMap();
-		std::string GetSpecialAbilityName(uint32 ability_id);
-
-		extern const std::map<uint32, std::string>& GetConsiderColorMap();
-		std::string GetConsiderColorName(uint32 consider_color);
-
 		const int STANCE_TYPE_FIRST = stancePassive;
 		const int STANCE_TYPE_LAST = stanceBurnAE;
 		const int STANCE_TYPE_COUNT = stanceBurnAE;
@@ -562,17 +552,6 @@ enum ConsiderLevel : uint8 {
 	Scowls
 };

-namespace ConsiderColor {
-	constexpr uint32 Green         = 2;
-	constexpr uint32 DarkBlue      = 4;
-	constexpr uint32 Gray          = 6;
-	constexpr uint32 White         = 10;
-	constexpr uint32 Red           = 13;
-	constexpr uint32 Yellow        = 15;
-	constexpr uint32 LightBlue     = 18;
-	constexpr uint32 WhiteTitanium = 20;
-};
-
 enum TargetDescriptionType : uint8 {
 	LCSelf,
 	UCSelf,
@@ -614,67 +593,6 @@ enum class ApplySpellType {
 	Raid
 };

-enum {
-	SPECATK_SUMMON            = 1,
-	SPECATK_ENRAGE            = 2,
-	SPECATK_RAMPAGE           = 3,
-	SPECATK_AREA_RAMPAGE      = 4,
-	SPECATK_FLURRY            = 5,
-	SPECATK_TRIPLE            = 6,
-	SPECATK_QUAD              = 7,
-	SPECATK_INNATE_DW         = 8,
-	SPECATK_BANE              = 9,
-	SPECATK_MAGICAL           = 10,
-	SPECATK_RANGED_ATK        = 11,
-	UNSLOWABLE                = 12,
-	UNMEZABLE                 = 13,
-	UNCHARMABLE               = 14,
-	UNSTUNABLE                = 15,
-	UNSNAREABLE               = 16,
-	UNFEARABLE                = 17,
-	UNDISPELLABLE             = 18,
-	IMMUNE_MELEE              = 19,
-	IMMUNE_MAGIC              = 20,
-	IMMUNE_FLEEING            = 21,
-	IMMUNE_MELEE_EXCEPT_BANE  = 22,
-	IMMUNE_MELEE_NONMAGICAL   = 23,
-	IMMUNE_AGGRO              = 24,
-	IMMUNE_AGGRO_ON           = 25,
-	IMMUNE_CASTING_FROM_RANGE = 26,
-	IMMUNE_FEIGN_DEATH        = 27,
-	IMMUNE_TAUNT              = 28,
-	NPC_TUNNELVISION          = 29,
-	NPC_NO_BUFFHEAL_FRIENDS   = 30,
-	IMMUNE_PACIFY             = 31,
-	LEASH                     = 32,
-	TETHER                    = 33,
-	DESTRUCTIBLE_OBJECT       = 34,
-	NO_HARM_FROM_CLIENT       = 35,
-	ALWAYS_FLEE               = 36,
-	FLEE_PERCENT              = 37,
-	ALLOW_BENEFICIAL          = 38,
-	DISABLE_MELEE             = 39,
-	NPC_CHASE_DISTANCE        = 40,
-	ALLOW_TO_TANK             = 41,
-	IGNORE_ROOT_AGGRO_RULES   = 42,
-	CASTING_RESIST_DIFF       = 43,
-	COUNTER_AVOID_DAMAGE      = 44, // Modify by percent NPC's opponents chance to riposte, block, parry or dodge individually, or for all skills
-	PROX_AGGRO                = 45,
-	IMMUNE_RANGED_ATTACKS     = 46,
-	IMMUNE_DAMAGE_CLIENT      = 47,
-	IMMUNE_DAMAGE_NPC         = 48,
-	IMMUNE_AGGRO_CLIENT       = 49,
-	IMMUNE_AGGRO_NPC          = 50,
-	MODIFY_AVOID_DAMAGE       = 51, // Modify by percent the NPCs chance to riposte, block, parry or dodge individually, or for all skills
-	IMMUNE_FADING_MEMORIES    = 52,
-	IMMUNE_OPEN               = 53,
-	IMMUNE_ASSASSINATE        = 54,
-	IMMUNE_HEADSHOT           = 55,
-	IMMUNE_AGGRO_BOT          = 56,
-	IMMUNE_DAMAGE_BOT         = 57,
-	MAX_SPECIAL_ATTACK        = 58
-};
-

 namespace HeroicBonusBucket
 {
@@ -45,7 +45,6 @@ typedef enum { //EQEmu internal opcodes list
 	_maxEmuOpcode
 } EmuOpcode;

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

 #endif
@@ -228,7 +228,6 @@ N(OP_GuildBank),
 N(OP_GuildBankItemList),
 N(OP_GuildCreate),
 N(OP_GuildDelete),
-N(OP_GuildDeleteGuild),
 N(OP_GuildDemote),
 N(OP_GuildInvite),
 N(OP_GuildInviteAccept),
@@ -240,33 +239,15 @@ N(OP_GuildManageStatus),
 N(OP_GuildMemberLevelUpdate),
 N(OP_GuildMemberList),
 N(OP_GuildMemberUpdate),
-N(OP_GuildMemberLevel),
-N(OP_GuildMemberRankAltBanker),
-N(OP_GuildMemberPublicNote),
-N(OP_GuildMemberAdd),
-N(OP_GuildMemberRename),
-N(OP_GuildMemberDelete),
-N(OP_GuildMemberDetails),
-N(OP_GuildRenameGuild),
 N(OP_GuildMOTD),
 N(OP_GuildPeace),
 N(OP_GuildPromote),
 N(OP_GuildPublicNote),
 N(OP_GuildRemove),
-N(OP_GuildSelectTribute),
-N(OP_GuildModifyBenefits),
-N(OP_GuildTributeToggleReq),
-N(OP_GuildTributeToggleReply),
-N(OP_GuildOptInOut),
-N(OP_GuildSaveActiveTributes),
-N(OP_GuildSendActiveTributes),
-N(OP_GuildTributeFavorAndTimer),
 N(OP_GuildsList),
 N(OP_GuildStatus),
 N(OP_GuildTributeInfo),
-N(OP_GuildUpdate),
-N(OP_GuildTributeDonateItem),
-N(OP_GuildTributeDonatePlat),
+N(OP_GuildUpdateURLAndChannel),
 N(OP_GuildWar),
 N(OP_Heartbeat),
 N(OP_Hide),
@@ -444,7 +425,6 @@ N(OP_ReqClientSpawn),
 N(OP_ReqNewZone),
 N(OP_RequestClientZoneChange),
 N(OP_RequestDuel),
-N(OP_RequestGuildTributes),
 N(OP_RequestKnowledgeBase),
 N(OP_RequestTitles),
 N(OP_RespawnWindow),
@@ -510,11 +490,6 @@ N(OP_ShopEndConfirm),
 N(OP_ShopItem),
 N(OP_ShopPlayerBuy),
 N(OP_ShopPlayerSell),
-N(OP_ShopSendParcel),
-N(OP_ShopDeleteParcel),
-N(OP_ShopRespondParcel),
-N(OP_ShopRetrieveParcel), 
-N(OP_ShopParcelIcon),
 N(OP_ShopRequest),
 N(OP_SimpleMessage),
 N(OP_SkillUpdate),
@@ -23,59 +23,61 @@
 #include "skills.h"
 #include "types.h"

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

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

 constexpr int16 RECAST_TYPE_UNLINKED_ITEM = -1;

@@ -684,53 +686,6 @@ namespace Zones {
 	constexpr uint16 APPRENTICE = 999; // Designer Apprentice
 }

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

 typedef enum {
 	FilterNone = 0,
@@ -1120,33 +1075,4 @@ enum MoneySubtypes
 	SharedBank // Platinum Only
 };

-namespace RaidLootType {
-	constexpr uint32 LeaderOnly                = 1;
-	constexpr uint32 LeaderAndGroupLeadersOnly = 2;
-	constexpr uint32 LeaderSelected            = 3;
-	constexpr uint32 EntireRaid                = 4;
-}
-
-namespace LeadershipAbilitySlot {
-	constexpr uint16 HealthOfTargetsTarget = 14;
-}
-
-enum ExpSource
-{
-	Quest,
-	GM,
-	Kill,
-	Death,
-	Resurrection,
-	LDoNChest,
-	Task,
-	Sacrifice
-};
-
-#define PARCEL_SEND_ITEMS    0
-#define PARCEL_SEND_MONEY    1
-#define PARCEL_MONEY_ITEM_ID 99990 // item id of money
-#define PARCEL_LIMIT         5
-#define PARCEL_BEGIN_SLOT    1
-
 #endif /*COMMON_EQ_CONSTANTS_H*/
@@ -27,9 +27,6 @@
 #include "../common/version.h"
 #include "emu_constants.h"
 #include "textures.h"
-#include "../cereal/include/cereal/archives/binary.hpp"
-#include "../cereal/include/cereal/types/string.hpp"
-#include "../cereal/include/cereal/types/vector.hpp"


 static const uint32 BUFF_COUNT = 42;
@@ -127,17 +124,6 @@ struct LDoNTrapTemplate
 	uint8 locked;
 };

-enum CrystalReclaimTypes
-{
-	Ebon = 5,
-	Radiant = 4,
-};
-
-namespace ItemStackSizeConstraint {
-	constexpr int16 Minimum = 1;
-	constexpr int16 Maximum = 1000;
-}
-
 ///////////////////////////////////////////////////////////////////////////////


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

 struct PlayerState_Struct {
@@ -401,7 +386,7 @@ struct NewZone_Struct {
 /*0724*/	uint32 underworld_teleport_index; // > 0 teleports w/ zone point index, invalid succors, if this value is 0, it prevents you from running off edges that would end up underworld
 /*0728*/	uint32 lava_damage; // Seen 50
 /*0732*/	uint32 min_lava_damage; // Seen 10
-/*0736*/	float safe_heading;
+/*0736*/
 };

 /*
@@ -640,12 +625,6 @@ struct ConsentResponse_Struct {
 	char zonename[32];
 };

-struct NameApproval_Struct {
-	char name[64];
-	uint32 race_id;
-	uint32 class_id;
-};
-
 /*
 ** Name Generator Struct
 ** Length: 72 bytes
@@ -1536,32 +1515,20 @@ struct ExpUpdate_Struct
 ** Packet Types: See ItemPacketType enum
 **
 */
-enum ItemPacketType {
-    ItemPacketViewLink       = 0x00,
-    ItemPacketMerchant       = 0x64,
-    ItemPacketTradeView      = 0x65,
-    ItemPacketLoot           = 0x66,
-    ItemPacketTrade          = 0x67,
-    ItemPacketCharInventory  = 0x69,
-    ItemPacketLimbo          = 0x6A,
-    ItemPacketWorldContainer = 0x6B,
-    ItemPacketTributeItem    = 0x6C,
-    ItemPacketGuildTribute   = 0x6D,
-    ItemPacketCharmUpdate    = 0x6E, // noted as incorrect
-    ItemPacketRecovery       = 0x71,
-    ItemPacketParcel         = 0x73,
-    ItemPacketInvalid        = 0xFF
-};
-
-enum MerchantWindowTabDisplay {
-    None                 = 0x00,
-    SellBuy              = 0x01,
-    Recover              = 0x02,
-    SellBuyRecover       = 0x03,
-    Parcel               = 0x04,
-    SellBuyParcel        = 0x05,
-    RecoverParcel        = 0x06,
-    SellBuyRecoverParcel = 0x07
+enum ItemPacketType
+{
+	ItemPacketViewLink			= 0x00,
+	ItemPacketMerchant			= 0x64,
+	ItemPacketTradeView			= 0x65,
+	ItemPacketLoot				= 0x66,
+	ItemPacketTrade				= 0x67,
+	ItemPacketCharInventory		= 0x69,
+	ItemPacketLimbo				= 0x6A,
+	ItemPacketWorldContainer	= 0x6B,
+	ItemPacketTributeItem		= 0x6C,
+	ItemPacketGuildTribute		= 0x6D,
+	ItemPacketCharmUpdate		= 0x6E, // noted as incorrect
+	ItemPacketInvalid			= 0xFF
 };

 //enum ItemPacketType
@@ -1693,105 +1660,11 @@ struct GuildsList_Struct {
 	GuildsListEntry_Struct Guilds[MAX_NUMBER_GUILDS];
 };

-struct GuildsListMessagingEntry_Struct {
-	/*000*/	uint32		guild_id;
-	/*004*/	std::string guild_name;
-
-	template<class Archive>
-	void serialize(Archive& archive)
-	{
-		archive(
-			CEREAL_NVP(guild_id),
-			CEREAL_NVP(guild_name)
-		);
-	}
-};
-
-struct GuildsListMessaging_Struct {
-	/*000*/    char                                         header[64];
-	/*064*/    uint32                                       no_of_guilds;
-	/*068*/    uint32                                       string_length;
-	/*072*/    std::vector<GuildsListMessagingEntry_Struct> guild_detail;
-
-	template<class Archive>
-	void serialize(Archive& archive)
-	{
-		archive(
-			CEREAL_NVP(header),
-			CEREAL_NVP(no_of_guilds),
-			CEREAL_NVP(string_length),
-			CEREAL_NVP(guild_detail)
-		);
-	}
-};
-
 struct GuildUpdate_Struct {
 	uint32	guildID;
 	GuildsListEntry_Struct entry;
 };

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

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

@@ -2104,75 +1969,12 @@ struct TimeOfDay_Struct {
 };

 // Darvik: shopkeeper structs
-struct MerchantClick_Struct
-{
-    /*000*/ uint32 npc_id;      // Merchant NPC's entity id
-    /*004*/ uint32 player_id;
-    /*008*/ uint32 command;     // 1=open, 0=cancel/close
-    /*012*/ float  rate;        // cost multiplier, dosent work anymore
-    /*016*/ int32  tab_display; // bitmask b000 none, b001 Purchase/Sell, b010 Recover, b100 Parcels
-    /*020*/ int32  unknown020;  // Seen 2592000 from Server or -1 from Client
-    /*024*/
+struct Merchant_Click_Struct {
+/*000*/ uint32	npcid;			// Merchant NPC's entity id
+/*004*/ uint32	playerid;
+/*008*/ uint32	command;		//1=open, 0=cancel/close
+/*012*/ float	rate;			//cost multiplier, dosent work anymore
 };
-
-enum MerchantActions {
-    Close = 0,
-    Open  = 1
-};
-
-struct Parcel_Struct
-{
-    /*000*/ uint32 npc_id;
-    /*004*/ uint32 item_slot;
-    /*008*/ uint32 quantity;
-    /*012*/ uint32 money_flag;
-    /*016*/ char   send_to[64];
-    /*080*/ char   note[128];
-    /*208*/ uint32 unknown_208;
-    /*212*/ uint32 unknown_212;
-    /*216*/ uint32 unknown_216;
-};
-
-struct ParcelRetrieve_Struct
-{
-    uint32 merchant_entity_id;
-    uint32 player_entity_id;
-    uint32 parcel_slot_id;
-    uint32 parcel_item_id;
-};
-
-struct ParcelMessaging_Struct {
-	ItemPacketType packet_type;
-	std::string    serialized_item;
-	uint32         sent_time;
-	std::string    player_name;
-	std::string    note;
-	uint32         slot_id;
-
-	template<class Archive>
-	void serialize(Archive &archive)
-	{
-		archive(
-			CEREAL_NVP(packet_type),
-			CEREAL_NVP(serialized_item),
-			CEREAL_NVP(sent_time),
-			CEREAL_NVP(player_name),
-			CEREAL_NVP(note),
-			CEREAL_NVP(slot_id)
-		);
-	}
-};
-
-struct ParcelIcon_Struct {
-	uint32 status; //0 off 1 on 2 overlimit
-};
-
-enum ParcelIconActions {
-	IconOff   = 0,
-	IconOn    = 1,
-	Overlimit = 2
-};
-
 /*
 Unknowns:
 0 is e7 from 01 to // MAYBE SLOT IN PURCHASE
@@ -3519,7 +3321,6 @@ struct Internal_GuildMemberEntry_Struct {
 //	char	public_note[1];				//variable length.
 	uint16	zoneinstance;				//network byte order
 	uint16	zone_id;					//network byte order
-	uint32  online;
 };

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

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

 struct GuildRemoveStruct{
@@ -3632,9 +3397,9 @@ struct GuildRemoveStruct{
 	uint32	leaderstatus; //?
 };

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

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

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

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

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

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

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

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

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

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

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

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

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


@@ -5493,6 +5128,8 @@ struct GroupMakeLeader_Struct
 //ex for a blank crowns window you would send:
 //999999|1|999999|0
 //any items come after in much the same way adventure merchant items do except there is no theme included
+#define ALT_CURRENCY_OP_POPULATE 8
+#define ALT_CURRENCY_OP_UPDATE 7

 //Server -> Client
 //Populates the initial Alternate Currency Window
@@ -5903,6 +5540,28 @@ struct MercenaryMerchantResponse_Struct {
 /*0004*/
 };

+struct ServerLootItem_Struct {
+	uint32	item_id;	  // uint32	item_id;
+	int16  equip_slot;	  // int16	equip_slot;
+	uint16 charges;	  // uint8	charges;
+	uint16 lootslot;	  // uint16	lootslot;
+	uint32 aug_1;		  // uint32	aug_1;
+	uint32 aug_2;		  // uint32	aug_2;
+	uint32 aug_3;		  // uint32	aug_3;
+	uint32 aug_4;		  // uint32	aug_4;
+	uint32 aug_5;		  // uint32	aug_5;
+	uint32 aug_6;		  // uint32	aug_5;
+	bool attuned;
+	std::string custom_data;
+	uint32 ornamenticon {};
+	uint32 ornamentidfile {};
+	uint32 ornament_hero_model {};
+	uint16 trivial_min_level;
+	uint16 trivial_max_level;
+	uint16 npc_min_level;
+	uint16 npc_max_level;
+};
+
 //Found in client near a ref to the string:
 //"Got a broadcast message for ... %s ...\n"
 struct ClientMarqueeMessage_Struct {
@@ -5921,6 +5580,9 @@ struct ClientMarqueeMessage_Struct {

 };

+typedef std::list<ServerLootItem_Struct*> ItemList;
+
+
 struct fling_struct {
 /* 00 */ uint32 collision; // 0 collision is off, anything else it's on
 /* 04 */ int32 travel_time; // ms -- UF we need to calc this, RoF+ -1 auto calcs
@@ -20,12 +20,9 @@
 #include "eqemu_config.h"
 #include "misc_functions.h"
 #include "strings.h"
-#include "eqemu_logsys.h"
-#include "json/json.hpp"

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

 std::string EQEmuConfig::ConfigFile = "eqemu_config.json";
 EQEmuConfig *EQEmuConfig::_config = nullptr;
@@ -114,12 +111,13 @@ void EQEmuConfig::parse_config()
 		DisableConfigChecks = true;
 	}

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

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

 struct LoginConfig {
 	std::string LoginHost;
@@ -62,6 +62,14 @@ class EQEmuConfig
 		std::string SharedKey;
 		bool DisableConfigChecks;

+		// From <chatserver/>
+		std::string ChatHost;
+		uint16 ChatPort;
+
+		// From <mailserver/>
+		std::string MailHost;
+		uint16 MailPort;
+
 		// From <database/>
 		std::string DatabaseHost;
 		std::string DatabaseUsername;
@@ -114,18 +122,12 @@ class EQEmuConfig

 		bool auto_database_updates;

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

 //	map<string,uint16> StaticZones;

 	protected:

-		std::string m_ucs_host;
-		uint16      m_ucs_port;
-
 		static EQEmuConfig *_config;
 		Json::Value _root;
 		static std::string ConfigFile;
@@ -184,7 +186,6 @@ class EQEmuConfig
 		}

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

 #endif
@@ -651,9 +651,6 @@ EQEmuLogSys *EQEmuLogSys::LoadLogDatabaseSettings()
 	}

 	// Auto inject categories that don't exist in the database...
-
-	std::vector<LogsysCategoriesRepository::LogsysCategories> db_categories_to_add{};
-
 	for (int i = Logs::AA; i != Logs::MaxCategoryID; i++) {

 		bool is_missing_in_database = std::find(db_categories.begin(), db_categories.end(), i) == db_categories.end();
@@ -668,7 +665,11 @@ EQEmuLogSys *EQEmuLogSys::LoadLogDatabaseSettings()
 		}

 		if (is_missing_in_database && !is_deprecated_category) {
-			LogInfo("Automatically adding new log category [{}] ({})", Logs::LogCategoryName[i], i);
+			LogInfo(
+				"Automatically adding new log category [{}] ({})",
+				Logs::LogCategoryName[i],
+				i
+			);

 			auto new_category = LogsysCategoriesRepository::NewEntity();
 			new_category.log_category_id          = i;
@@ -677,14 +678,9 @@ EQEmuLogSys *EQEmuLogSys::LoadLogDatabaseSettings()
 			new_category.log_to_gmsay             = log_settings[i].log_to_gmsay;
 			new_category.log_to_file              = log_settings[i].log_to_file;
 			new_category.log_to_discord           = log_settings[i].log_to_discord;
-			db_categories_to_add.emplace_back(new_category);
-		}
-	}

-	if (!db_categories_to_add.empty()) {
-		LogsysCategoriesRepository::ReplaceMany(*m_database, db_categories_to_add);
-		LoadLogDatabaseSettings();
-		return this;
+			LogsysCategoriesRepository::InsertOne(*m_database, new_category);
+		}
 	}

 	LogInfo("Loaded [{}] log categories", categories.size());
@@ -701,8 +697,6 @@ EQEmuLogSys *EQEmuLogSys::LoadLogDatabaseSettings()
 	log_settings[Logs::Crash].log_to_console = static_cast<uint8>(Logs::General);
 	log_settings[Logs::Crash].log_to_gmsay   = static_cast<uint8>(Logs::General);
 	log_settings[Logs::Crash].log_to_file    = static_cast<uint8>(Logs::General);
-	log_settings[Logs::Info].log_to_file     = static_cast<uint8>(Logs::General);
-	log_settings[Logs::Info].log_to_console  = static_cast<uint8>(Logs::General);

 	return this;
 }
@@ -33,9 +33,10 @@
 #endif
 #endif

-#include <fmt/format.h>
+#undef FMT_HEADER_ONLY
+#include <fmt/core.h>
 #include "types.h"
-
+ 
 namespace Logs {
 	enum DebugLevel {
 		General = 1,    // 1 - Low-Level general debugging, useful info on single line
@@ -140,8 +141,6 @@ namespace Logs {
 		DataBuckets,
 		Zoning,
 		EqTime,
-		Corpses,
-		XTargets,
 		MaxCategoryID /* Don't Remove this */
 	};

@@ -241,8 +240,6 @@ namespace Logs {
 		"DataBuckets",
 		"Zoning",
 		"EqTime",
-		"Corpses",
-		"XTargets"
 	};
 }

@@ -824,26 +824,6 @@
        OutF(LogSys, Logs::Detail, Logs::EqTime, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
 } while (0)

-#define LogCorpses(message, ...) do {\
-    if (LogSys.IsLogEnabled(Logs::General, Logs::Corpses))\
-        OutF(LogSys, Logs::General, Logs::Corpses, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
-} while (0)
-
-#define LogCorpsesDetail(message, ...) do {\
-    if (LogSys.IsLogEnabled(Logs::Detail, Logs::Corpses))\
-        OutF(LogSys, Logs::Detail, Logs::Corpses, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
-} while (0)
-
-#define LogXTargets(message, ...) do {\
-    if (LogSys.IsLogEnabled(Logs::General, Logs::XTargets))\
-        OutF(LogSys, Logs::General, Logs::XTargets, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
-} while (0)
-
-#define LogXTargetsDetail(message, ...) do {\
-    if (LogSys.IsLogEnabled(Logs::Detail, Logs::XTargets))\
-        OutF(LogSys, Logs::Detail, Logs::XTargets, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
-} while (0)
-
 #define Log(debug_level, log_category, message, ...) do {\
    if (LogSys.IsLogEnabled(debug_level, log_category))\
        LogSys.Out(debug_level, log_category, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
@@ -0,0 +1,59 @@
+/*	Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+
+	This library is free software; you can redistribute it and/or
+	modify it under the terms of the GNU Library General Public
+	License as published by the Free Software Foundation; either
+	version 2 of the License, or (at your option) any later version.
+
+	This library is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+	Library General Public License for more details.
+
+	You should have received a copy of the GNU Library General Public
+	License along with this library; if not, write to the Free
+	Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+	MA 02111-1307, USA */
+
+/*	Error messages for mysql clients */
+/*	error messages for the demon is in share/language/errmsg.sys */
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+void	init_client_errs(void);
+extern const char *client_errors[];	/* Error messages */
+#ifdef	__cplusplus
+}
+#endif
+
+#define CR_MIN_ERROR		2000	/* For easier client code */
+#define CR_MAX_ERROR		2999
+#if defined(OS2) && defined( MYSQL_SERVER)
+#define CER(X) client_errors[(X)-CR_MIN_ERROR]
+#else
+#define ER(X) client_errors[(X)-CR_MIN_ERROR]
+#endif
+#define CLIENT_ERRMAP		2	/* Errormap used by my_error() */
+
+#define CR_UNKNOWN_ERROR	2000
+#define CR_SOCKET_CREATE_ERROR	2001
+#define CR_CONNECTION_ERROR	2002
+#define CR_CONN_HOST_ERROR	2003
+#define CR_IPSOCK_ERROR		2004
+#define CR_UNKNOWN_HOST		2005
+#define CR_SERVER_GONE_ERROR	2006
+#define CR_VERSION_ERROR	2007
+#define CR_OUT_OF_MEMORY	2008
+#define CR_WRONG_HOST_INFO	2009
+#define CR_LOCALHOST_CONNECTION 2010
+#define CR_TCP_CONNECTION	2011
+#define CR_SERVER_HANDSHAKE_ERR 2012
+#define CR_SERVER_LOST		2013
+#define CR_COMMANDS_OUT_OF_SYNC 2014
+#define CR_NAMEDPIPE_CONNECTION 2015
+#define CR_NAMEDPIPEWAIT_ERROR 2016
+#define CR_NAMEDPIPEOPEN_ERROR 2017
+#define CR_NAMEDPIPESETSTATE_ERROR 2018
+#define CR_CANT_READ_CHARSET	2019
+#define CR_NET_PACKET_TOO_LARGE 2020
@@ -2,7 +2,7 @@
 #include "../repositories/character_data_repository.h"
 #include "../json/json_archive_single_line.h"
 #include <vector>
-#include <fmt/format.h>
+#include <fmt/core.h>
 #include <cereal/archives/json.hpp>
 #include <cereal/types/vector.hpp>

@@ -37,8 +37,6 @@ void PlayerEventLogs::Init()
 		db.emplace_back(e.id);
 	}

-	std::vector<PlayerEventLogSettingsRepository::PlayerEventLogSettings> settings_to_insert{};
-
 	// insert entries that don't exist in database
 	for (int i = PlayerEvent::GM_COMMAND; i != PlayerEvent::MAX; i++) {
 		bool is_in_database = std::find(db.begin(), db.end(), i) != db.end();
@@ -58,21 +56,21 @@ void PlayerEventLogs::Init()

 		bool is_missing_in_database = std::find(db.begin(), db.end(), i) == db.end();
 		if (is_missing_in_database && is_implemented && !is_deprecated) {
-			LogInfo("[New] PlayerEvent [{}] ({})", PlayerEvent::EventName[i], i);
+			LogInfo(
+				"[New] PlayerEvent [{}] ({})",
+				PlayerEvent::EventName[i],
+				i
+			);

 			auto c = PlayerEventLogSettingsRepository::NewEntity();
 			c.id             = i;
 			c.event_name     = PlayerEvent::EventName[i];
 			c.event_enabled  = m_settings[i].event_enabled;
 			c.retention_days = m_settings[i].retention_days;
-			settings_to_insert.emplace_back(c);
+			PlayerEventLogSettingsRepository::InsertOne(*m_database, c);
 		}
 	}

-	if (!settings_to_insert.empty()) {
-		PlayerEventLogSettingsRepository::ReplaceMany(*m_database, settings_to_insert);
-	}
-
 	bool processing_in_world = !RuleB(Logging, PlayerEventsQSProcess) && IsWorld();
 	bool processing_in_qs    = RuleB(Logging, PlayerEventsQSProcess) && IsQueryServ();

@@ -613,7 +611,7 @@ void PlayerEventLogs::Process()

 void PlayerEventLogs::ProcessRetentionTruncation()
 {
-	LogPlayerEvents("Running truncation");
+	LogInfo("Running truncation");

 	for (int i = PlayerEvent::GM_COMMAND; i != PlayerEvent::MAX; i++) {
 		if (m_settings[i].retention_days > 0) {
@@ -697,11 +695,6 @@ void PlayerEventLogs::SetSettingsDefaults()
 	m_settings[PlayerEvent::KILLED_NAMED_NPC].event_enabled   = 1;
 	m_settings[PlayerEvent::KILLED_RAID_NPC].event_enabled    = 1;
 	m_settings[PlayerEvent::ITEM_CREATION].event_enabled      = 1;
-	m_settings[PlayerEvent::GUILD_TRIBUTE_DONATE_ITEM].event_enabled = 1;
-	m_settings[PlayerEvent::GUILD_TRIBUTE_DONATE_PLAT].event_enabled = 1;
-	m_settings[PlayerEvent::PARCEL_SEND].event_enabled               = 1;
-	m_settings[PlayerEvent::PARCEL_RETRIEVE].event_enabled           = 1;
-	m_settings[PlayerEvent::PARCEL_DELETE].event_enabled             = 1;

 	for (int i = PlayerEvent::GM_COMMAND; i != PlayerEvent::MAX; i++) {
 		m_settings[i].retention_days = RETENTION_DAYS_DEFAULT;
@@ -56,11 +56,6 @@ namespace PlayerEvent {
 		KILLED_NAMED_NPC,
 		KILLED_RAID_NPC,
 		ITEM_CREATION,
-		GUILD_TRIBUTE_DONATE_ITEM,
-		GUILD_TRIBUTE_DONATE_PLAT,
-		PARCEL_SEND,
-		PARCEL_RETRIEVE,
-		PARCEL_DELETE, 
 		MAX // dont remove
 	};

@@ -69,7 +64,7 @@ namespace PlayerEvent {
 	// If event is unimplemented just tag (Unimplemented) in the name
 	// Events don't get saved to the database if unimplemented or deprecated
 	// Events tagged as deprecated will get automatically removed
-	static const char *EventName[EventType::MAX] = {
+	static const char *EventName[PlayerEvent::MAX] = {
 		"None",
 		"GM Command",
 		"Zoning",
@@ -117,12 +112,7 @@ namespace PlayerEvent {
 		"Killed NPC",
 		"Killed Named NPC",
 		"Killed Raid NPC",
-		"Item Creation",
-		"Guild Tribute Donate Item",
-		"Guild Tribute Donate Platinum",
-		"Parcel Item Sent",
-		"Parcel Item Retrieved",
-		"Parcel Prune Routine"
+		"Item Creation"
 	};

 	// Generic struct used by all events
@@ -952,135 +942,6 @@ namespace PlayerEvent {
 			);
 		}
 	};
-
-	struct GuildTributeDonateItem {
-		uint32      item_id;
-		uint32 		guild_favor;
-
-		// cereal
-		template<class Archive>
-		void serialize(Archive &ar)
-		{
-			ar(
-				CEREAL_NVP(item_id),
-				CEREAL_NVP(guild_favor)
-			);
-		}
-	};
-
-	struct GuildTributeDonatePlat {
-		uint32      plat;
-		uint32 		guild_favor;
-
-		// cereal
-		template<class Archive>
-		void serialize(Archive &ar)
-		{
-			ar(
-				CEREAL_NVP(plat),
-				CEREAL_NVP(guild_favor)
-			);
-		}
-	};
-
-	struct ParcelRetrieve {
-		uint32      item_id;
-		uint32      quantity;
-		std::string from_player_name;
-		uint32      sent_date;
-		uint32      aug_slot_1;
-		uint32      aug_slot_2;
-		uint32      aug_slot_3;
-		uint32      aug_slot_4;
-		uint32      aug_slot_5;
-		uint32      aug_slot_6;
-
-		// cereal
-		template<class Archive>
-		void serialize(Archive &ar)
-		{
-			ar(
-				CEREAL_NVP(item_id),
-				CEREAL_NVP(quantity),
-				CEREAL_NVP(from_player_name),
-				CEREAL_NVP(sent_date),
-				CEREAL_NVP(aug_slot_1),
-				CEREAL_NVP(aug_slot_2),
-				CEREAL_NVP(aug_slot_3),
-				CEREAL_NVP(aug_slot_4),
-				CEREAL_NVP(aug_slot_5),
-				CEREAL_NVP(aug_slot_6)
-			);
-		}
-	};
-
-	struct ParcelSend {
-		uint32      item_id;
-		uint32      quantity;
-		std::string from_player_name;
-		std::string to_player_name;
-		uint32      sent_date;
-		uint32      aug_slot_1;
-		uint32      aug_slot_2;
-		uint32      aug_slot_3;
-		uint32      aug_slot_4;
-		uint32      aug_slot_5;
-		uint32      aug_slot_6;
-
-		// cereal
-		template<class Archive>
-		void serialize(Archive &ar)
-		{
-			ar(
-				CEREAL_NVP(item_id),
-				CEREAL_NVP(quantity),
-				CEREAL_NVP(from_player_name),
-				CEREAL_NVP(to_player_name),
-				CEREAL_NVP(sent_date),
-				CEREAL_NVP(aug_slot_1),
-				CEREAL_NVP(aug_slot_2),
-				CEREAL_NVP(aug_slot_3),
-				CEREAL_NVP(aug_slot_4),
-				CEREAL_NVP(aug_slot_5),
-				CEREAL_NVP(aug_slot_6)
-			);
-		}
-	};
-
-	struct ParcelDelete {
-		uint32      item_id;
-		uint32      quantity;
-		uint32      char_id;
-		std::string from_name;
-		std::string note;
-		uint32      sent_date;
-		uint32      aug_slot_1;
-		uint32      aug_slot_2;
-		uint32      aug_slot_3;
-		uint32      aug_slot_4;
-		uint32      aug_slot_5;
-		uint32      aug_slot_6;
-
-		// cereal
-		template<class Archive>
-		void serialize(Archive &ar)
-		{
-			ar(
-				CEREAL_NVP(item_id),
-				CEREAL_NVP(quantity),
-				CEREAL_NVP(char_id),
-				CEREAL_NVP(from_name),
-				CEREAL_NVP(note),
-				CEREAL_NVP(sent_date),
-				CEREAL_NVP(aug_slot_1),
-				CEREAL_NVP(aug_slot_2),
-				CEREAL_NVP(aug_slot_3),
-				CEREAL_NVP(aug_slot_4),
-				CEREAL_NVP(aug_slot_5),
-				CEREAL_NVP(aug_slot_6)
-				);
-		}
-	};
 }

 #endif //EQEMU_PLAYER_EVENTS_H
@@ -22,6 +22,7 @@
 #include "../common/strings.h"
 #include "../common/rulesys.h"
 #include "../common/util/uuid.h"
+#include <fmt/core.h>
 #include <fmt/format.h>

 const char* const DZ_REPLAY_TIMER_NAME = "Replay Timer"; // see December 14, 2016 patch notes
@@ -96,12 +96,12 @@ bool IsOfEqualRace(int r1, int r2)
 	// TODO: add more values
 	switch (r1) {
 		case DARK_ELF:
-			if (r2 == Race::NeriakCitizen) {
+			if (r2 == RACE_NERIAK_CITIZEN_77) {
 				return true;
 			}
 			break;
 		case BARBARIAN:
-			if (r2 == Race::HalasCitizen) {
+			if (r2 == RACE_HALAS_CITIZEN_90) {
 				return true;
 			}
 	}
@@ -24,15 +24,17 @@
 #include <string>

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

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

+// Faction Associations give a much more live like faction system
+// Basically the primary faction and magnitude of a faction hit will generate the rest of them
+
+// Largest faction I could find quickly was Lord Inquisitor Seru with 9 total hits (8 associations) so 8 + 2 for max for now
+#define MAX_FACTION_ASSOC 10
+
+// this is the ID of a faction association and it's multiplier
+struct FactionAssociationHit {
+	int id;
+	float multiplier;
+};
+
+struct FactionAssociations {
+	// maybe there should be more data here, fine for now
+	FactionAssociationHit hits[MAX_FACTION_ASSOC];
+};
+
 const char *FactionValueToString(FACTION_VALUE faction_value);
 FACTION_VALUE CalculateFaction(FactionMods* fm, int32 tmpCharacter_value);
 #endif
@@ -35,6 +35,11 @@ Core Zone features

 */

+
+//Uncomment this to cause a zone to basically idle
+//when there are no players in it, mobs stop wandering, etc..
+#define IDLE_WHEN_EMPTY
+
 #ifdef EMBPERL
 //Enable the new XS based perl parser
 #define EMBPERL_XS
@@ -35,24 +35,24 @@

 #endif

-#include <fmt/format.h>
+#include <fmt/core.h>
 #include <filesystem>
 #include <iostream>
-#include <sys/stat.h>

 namespace fs = std::filesystem;

-
+/**
+ * @param name
+ * @return
+ */
 bool File::Exists(const std::string &name)
 {
-	struct stat sb{};
-	if (stat(name.c_str(), &sb) == 0) {
-		return true;
-	}
-
-	return false;
+	return fs::exists(fs::path{name});
 }

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

 class Database;

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

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

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

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

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

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

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

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

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

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

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

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

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

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


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

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

 #include "types.h"

 #define GUILD_NONE		0xFFFFFFFF // user has no guild

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

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

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

-constexpr int format_as(GuildAction action) { return static_cast<int>(action); }
-
 #endif
@@ -173,8 +173,7 @@ EQ::ItemInstance* EQ::InventoryProfile::GetItem(int16 slot_id) const
 		result = _GetItem(m_inv, slot_id);
 	}
 	else if ((slot_id >= invslot::EQUIPMENT_BEGIN && slot_id <= invslot::EQUIPMENT_END) ||
-		(slot_id >= invslot::TRIBUTE_BEGIN && slot_id <= invslot::TRIBUTE_END) ||
-		(slot_id >= invslot::GUILD_TRIBUTE_BEGIN && slot_id <= invslot::GUILD_TRIBUTE_END)) {
+		(slot_id >= invslot::TRIBUTE_BEGIN && slot_id <= invslot::TRIBUTE_END)) {
 		// Equippable slots (on body)
 		result = _GetItem(m_worn, slot_id);
 	}
@@ -466,10 +465,6 @@ EQ::ItemInstance* EQ::InventoryProfile::PopItem(int16 slot_id)
 		p = m_worn[slot_id];
 		m_worn.erase(slot_id);
 	}
-	else if (slot_id >= invslot::GUILD_TRIBUTE_BEGIN && slot_id <= invslot::GUILD_TRIBUTE_END) {
-		p = m_worn[slot_id];
-		m_worn.erase(slot_id);
-	}
 	else if (slot_id >= invslot::BANK_BEGIN && slot_id <= invslot::BANK_END) {
 		p = m_bank[slot_id];
 		m_bank.erase(slot_id);
@@ -806,35 +801,34 @@ int16 EQ::InventoryProfile::HasItemByLoreGroup(uint32 loregroup, uint8 where)
 // Returns slot_id when there's one available, else SLOT_INVALID
 int16 EQ::InventoryProfile::FindFreeSlot(bool for_bag, bool try_cursor, uint8 min_size, bool is_arrow)
 {
-	const int16 last_bag_slot = (RuleI(World, ExpansionSettings) == -1 || RuleI(World, ExpansionSettings) & EQ::expansions::bitHoT) ? EQ::invslot::slotGeneral10 : EQ::invslot::slotGeneral8;
-
-	for (int16 i = invslot::GENERAL_BEGIN; i <= last_bag_slot; i++) { // Check basic inventory
-		if ((((uint64) 1 << i) & m_lookup->PossessionsBitmask) == 0) {
+	// Check basic inventory
+	for (int16 i = invslot::GENERAL_BEGIN; i <= invslot::GENERAL_END; i++) {
+		if ((((uint64)1 << i) & m_lookup->PossessionsBitmask) == 0)
 			continue;
-		}

-		if (!GetItem(i)) {
-			return i; // Found available slot in personal inventory
-		}
+		if (!GetItem(i))
+			// Found available slot in personal inventory
+			return i;
 	}

 	if (!for_bag) {
-		for (int16 i = invslot::GENERAL_BEGIN; i <= last_bag_slot; i++) {
-			if ((((uint64) 1 << i) & m_lookup->PossessionsBitmask) == 0) {
+		for (int16 i = invslot::GENERAL_BEGIN; i <= invslot::GENERAL_END; i++) {
+			if ((((uint64)1 << i) & m_lookup->PossessionsBitmask) == 0)
 				continue;
-			}

-			const auto *inst = GetItem(i);
-			if (inst && inst->IsClassBag() && inst->GetItem()->BagSize >= min_size) {
-				if (inst->GetItem()->BagType == item::BagTypeQuiver &&
-					inst->GetItem()->ItemType != item::ItemTypeArrow) {
+			const ItemInstance* inst = GetItem(i);
+			if (inst && inst->IsClassBag() && inst->GetItem()->BagSize >= min_size)
+			{
+				if (inst->GetItem()->BagType == item::BagTypeQuiver && inst->GetItem()->ItemType != item::ItemTypeArrow)
+				{
 					continue;
 				}

-				const int16 base_slot_id = InventoryProfile::CalcSlotId(i, invbag::SLOT_BEGIN);
+				int16 base_slot_id = InventoryProfile::CalcSlotId(i, invbag::SLOT_BEGIN);

-				const uint8 slots = inst->GetItem()->BagSlots;
-				for (uint8 j = invbag::SLOT_BEGIN; j < slots; j++) {
+				uint8 slots = inst->GetItem()->BagSlots;
+				uint8 j;
+				for (j = invbag::SLOT_BEGIN; j<slots; j++) {
 					if (!GetItem(base_slot_id + j)) {
 						// Found available slot within bag
 						return (base_slot_id + j);
@@ -1424,10 +1418,6 @@ int16 EQ::InventoryProfile::_PutItem(int16 slot_id, ItemInstance* inst)
 		m_worn[slot_id] = inst;
 		result = slot_id;
 	}
-	else if (slot_id >= invslot::GUILD_TRIBUTE_BEGIN && slot_id <= invslot::GUILD_TRIBUTE_END) {
-		m_worn[slot_id] = inst;
-		result = slot_id;
-	}
 	else if (slot_id >= invslot::BANK_BEGIN && slot_id <= invslot::BANK_END) {
 		if (slot_id - EQ::invslot::BANK_BEGIN < m_lookup->InventoryTypeSize.Bank) {
 			m_bank[slot_id] = inst;
@@ -132,7 +132,7 @@ namespace EQ

 		// Swap items in inventory
 		enum SwapItemFailState : int8 { swapInvalid = -1, swapPass = 0, swapNotAllowed, swapNullData, swapRaceClass, swapDeity, swapLevel };
-		bool SwapItem(int16 source_slot, int16 destination_slot, SwapItemFailState& fail_state, uint16 race_id = Race::Doug, uint8 class_id = Class::None, uint16 deity_id = deity::DeityType::DeityUnknown, uint8 level = 0);
+		bool SwapItem(int16 source_slot, int16 destination_slot, SwapItemFailState& fail_state, uint16 race_id = RACE_DOUG_0, uint8 class_id = Class::None, uint16 deity_id = deity::DeityType::DeityUnknown, uint8 level = 0);

 		// Remove item from inventory
 		bool DeleteItem(int16 slot_id, int16 quantity = 0);
@@ -19,7 +19,7 @@
 */

 #include <cstring>
-#include <fmt/format.h>
+#include <fmt/core.h>
 #include <csignal>
 #include <vector>
 #include "ip_util.h"
@@ -1273,7 +1273,7 @@ int EQ::ItemInstance::GetItemBaneDamageBody(bool augments) const

 int EQ::ItemInstance::GetItemBaneDamageRace(bool augments) const
 {
-	int race = Race::Doug;
+	int race = RACE_DOUG_0;
 	const auto item = GetItem();
 	if (item) {
 		race = item->BaneDmgRace;
@@ -1791,27 +1791,6 @@ int EQ::ItemInstance::RemoveTaskDeliveredItems()
 	return count;
 }

-uint32 EQ::ItemInstance::GetItemGuildFavor() const
-{
-	uint32 total = 0;
-	const auto item = GetItem();
-	if (item) {
-		return total = item->GuildFavor;
-	}
-	return 0;
-}
-
-std::vector<uint32> EQ::ItemInstance::GetAugmentIDs() const
-{
-	std::vector<uint32> augments;
-
-	for (uint8 slot_id = invaug::SOCKET_BEGIN; slot_id <= invaug::SOCKET_END; slot_id++) {
-		augments.push_back(GetAugment(slot_id) ? GetAugmentItemID(slot_id) : 0);
-	}
-
-	return augments;
-}
-
 //
 // class EvolveInfo
 //
@@ -299,8 +299,6 @@ namespace EQ
 		int GetItemHeroicDR(bool augments = false) const;
 		int GetItemHeroicCorrup(bool augments = false) const;
 		int GetItemHaste(bool augments = false) const;
-		uint32 GetItemGuildFavor() const;
-		std::vector<uint32> GetAugmentIDs() const;

 	protected:
 		//////////////////////////
@@ -0,0 +1,54 @@
+/*	EQEMu: Everquest Server Emulator
+	Copyright (C) 2001-2002 EQEMu Development Team (http://eqemulator.org)
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; version 2 of the License.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY except by those people which sell it, which
+	are required to give you total support for your newly bought product;
+	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+	A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
+#ifndef LANGUAGES_H
+#define LANGUAGES_H
+#include "../common/types.h"
+
+#define LANG_COMMON_TONGUE	0
+#define LANG_BARBARIAN		1
+#define LANG_ERUDIAN		2
+#define LANG_ELVISH			3
+#define LANG_DARK_ELVISH	4
+#define LANG_DWARVISH		5
+#define LANG_TROLL			6
+#define LANG_OGRE			7
+#define LANG_GNOMISH		8
+#define LANG_HALFLING		9
+#define LANG_THIEVES_CANT	10
+#define LANG_OLD_ERUDIAN	11
+#define LANG_ELDER_ELVISH	12
+#define LANG_FROGLOK		13
+#define LANG_GOBLIN			14
+#define LANG_GNOLL			15
+#define LANG_COMBINE_TONGUE	16
+#define LANG_ELDER_TEIRDAL	17
+#define LANG_LIZARDMAN		18
+#define LANG_ORCISH			19
+#define LANG_FAERIE			20
+#define LANG_DRAGON			21
+#define LANG_ELDER_DRAGON	22
+#define LANG_DARK_SPEECH	23
+#define LANG_VAH_SHIR		24
+#define LANG_ALARAN			25
+#define LANG_HADAL			26
+#define LANG_UNKNOWN	27
+
+#define MAX_LANGUAGE_SKILL 100
+
+#endif
+
@@ -1,33 +0,0 @@
-#ifndef CODE_LOOT_H
-#define CODE_LOOT_H
-
-#include <list>
-#include <string>
-#include "../common/types.h"
-
-struct LootItem {
-	uint32      item_id;
-	int16       equip_slot;
-	uint16      charges;
-	uint16      lootslot;
-	uint32      aug_1;
-	uint32      aug_2;
-	uint32      aug_3;
-	uint32      aug_4;
-	uint32      aug_5;
-	uint32      aug_6;
-	bool        attuned;
-	std::string custom_data;
-	uint32      ornamenticon{};
-	uint32      ornamentidfile{};
-	uint32      ornament_hero_model{};
-	uint16      trivial_min_level;
-	uint16      trivial_max_level;
-	uint16      npc_min_level;
-	uint16      npc_max_level;
-};
-
-typedef std::list<LootItem*> LootItems;
-
-
-#endif //CODE_LOOT_H
@@ -0,0 +1,68 @@
+/*	EQEMu: Everquest Server Emulator
+	Copyright (C) 2001-2013 EQEMu Development Team (http://eqemu.org)
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; version 2 of the License.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY except by those people which sell it, which
+	are required to give you total support for your newly bought product;
+	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+	A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
+
+#ifndef _EQEMU_LOOTTABLE_H
+#define _EQEMU_LOOTTABLE_H
+
+#include "types.h"
+
+#pragma pack(1)
+struct LootTableEntries_Struct {
+	uint32	lootdrop_id;
+	uint8	droplimit;
+	uint8	mindrop;
+	uint8	multiplier;
+	float	probability;
+};
+
+struct ContentFlags {
+	int16 min_expansion;
+	int16 max_expansion;
+	char  content_flags[100];
+	char  content_flags_disabled[100];
+};
+
+struct LootTable_Struct {
+	uint32                  mincash;
+	uint32                  maxcash;
+	uint32                  avgcoin;
+	uint32                  NumEntries;
+	ContentFlags            content_flags;
+	LootTableEntries_Struct Entries[0];
+};
+
+struct LootDropEntries_Struct {
+	uint32 item_id;
+	int8   item_charges;
+	uint8  equip_item;
+	float  chance;
+	uint16 trivial_min_level;
+	uint16 trivial_max_level;
+	uint16 npc_min_level;
+	uint16 npc_max_level;
+	uint8  multiplier;
+};
+
+struct LootDrop_Struct {
+	uint32                 NumEntries;
+	ContentFlags           content_flags;
+	LootDropEntries_Struct Entries[0];
+};
+#pragma pack()
+
+#endif
@@ -1,6 +1,6 @@
 #include "console_server.h"
 #include "../strings.h"
-#include <fmt/format.h>
+#include <fmt/core.h>

 EQ::Net::ConsoleServer::ConsoleServer(const std::string &addr, int port)
 {
@@ -4,7 +4,7 @@
 #include "../eqemu_logsys.h"
 #include "../servertalk.h"
 #include "../rulesys.h"
-#include <fmt/format.h>
+#include <fmt/core.h>

 EQ::Net::ConsoleServerConnection::ConsoleServerConnection(ConsoleServer *parent, std::shared_ptr<TCPConnection> connection)
 {
@@ -21,7 +21,7 @@ EQ::Net::ConsoleServerConnection::ConsoleServerConnection(ConsoleServer *parent,
 	m_connection->OnDisconnect(std::bind(&ConsoleServerConnection::OnDisconnect, this, std::placeholders::_1));
 	m_connection->Start();
 	ClearBuffer();
-	
+
 	auto addr = m_connection->RemoteIP();

 	SendLine(fmt::format("Establishing connection from: {0}:{1}", addr, m_connection->RemotePort()));
@@ -85,12 +85,12 @@ void EQ::Net::ConsoleServerConnection::QueueMessage(const std::string &msg)
 	}
 	else {
 		std::string cmd(m_line, m_line + m_cursor);
-		
+
 		size_t len = m_user.length() + 2 + cmd.length();
 		for (size_t i = 0; i < len; ++i) {
 			Send("\x08");
 		}
-		
+
 		if (msg.length() < cmd.length()) {
 			Send(msg);
 			size_t blank_spaces = 2 + cmd.length() - msg.length();
@@ -5,7 +5,7 @@
 #include "crc32.h"
 #include "../eqemu_logsys.h"
 #include <zlib.h>
-#include <fmt/format.h>
+#include <fmt/core.h>
 #include <sstream>

 EQ::Net::DaybreakConnectionManager::DaybreakConnectionManager()
@@ -1,7 +1,7 @@
 #include "packet.h"
 #include "endian.h"
 #include <cctype>
-#include <fmt/format.h>
+#include <fmt/core.h>

 void EQ::Net::Packet::PutInt8(size_t offset, int8_t value)
 {
@@ -1,7 +1,7 @@
 #include "websocket_server.h"
 #include "../event/event_loop.h"
 #include "../event/timer.h"
-#include <fmt/format.h>
+#include <fmt/core.h>
 #include <map>
 #include <unordered_set>
 #include <array>
@@ -50,7 +50,7 @@ EQ::Net::WebsocketServer::WebsocketServer(const std::string &addr, int port)
 		if (iter != _impl->connections.end()) {
 			iter->second->GetTCPConnection()->Write(data, size);
 		}
-		
+
 		return websocketpp::lib::error_code();
 	});

@@ -76,7 +76,7 @@ EQ::Net::WebsocketServer::WebsocketServer(const std::string &addr, int port)
 	_impl->login_handler = [](const WebsocketServerConnection* connection, const std::string& user, const std::string& pass) {
 		WebsocketLoginStatus ret;
 		ret.account_name = "admin";
-		
+
 		if (connection->RemoteIP() == "127.0.0.1" || connection->RemoteIP() == "::") {
 			ret.logged_in = true;
 			return ret;
@@ -125,8 +125,8 @@ Json::Value EQ::Net::WebsocketServer::HandleRequest(WebsocketServerConnection *c
 void EQ::Net::WebsocketServer::SetMethodHandler(const std::string &method, MethodHandler handler, int required_status)
 {
 	//Reserved method names
-	if (method == "subscribe" || 
-		method == "unsubscribe" || 
+	if (method == "subscribe" ||
+		method == "unsubscribe" ||
 		method == "login") {
 		return;
 	}
@@ -171,7 +171,7 @@ Json::Value EQ::Net::WebsocketServer::Login(WebsocketServerConnection *connectio

 		auto user = params[0].asString();
 		auto pass = params[1].asString();
-		
+
 		auto r = _impl->login_handler(connection, user, pass);

 		if (r.logged_in) {
@@ -3,7 +3,7 @@
 #include "../timer.h"
 #include "../util/uuid.h"
 #include <sstream>
-#include <fmt/format.h>
+#include <fmt/core.h>

 struct EQ::Net::WebsocketServerConnection::Impl {
 	WebsocketServer *parent;
@@ -16,7 +16,7 @@ struct EQ::Net::WebsocketServerConnection::Impl {
 	int status;
 };

-EQ::Net::WebsocketServerConnection::WebsocketServerConnection(WebsocketServer *parent, 
+EQ::Net::WebsocketServerConnection::WebsocketServerConnection(WebsocketServer *parent,
 	std::shared_ptr<TCPConnection> connection,
 	std::shared_ptr<websocket_connection> ws_connection)
 {
@@ -34,7 +34,7 @@ EQ::Net::WebsocketServerConnection::WebsocketServerConnection(WebsocketServer *p
 	connection->OnDisconnect([this](EQ::Net::TCPConnection *connection) {
 		_impl->parent->ReleaseConnection(this);
 	});
-	
+
 	connection->OnRead([this](EQ::Net::TCPConnection *c, const unsigned char *buffer, size_t buffer_size) {
 		_impl->ws_connection->read_all((const char*)buffer, buffer_size);
 	});
@@ -202,7 +202,7 @@ namespace RoF
 		unsigned char *emu_buffer = in->pBuffer;
 		uint32 opcode = *((uint32*)emu_buffer);

-		if (opcode == AlternateCurrencyMode::Populate) {
+		if (opcode == 8) {
 			AltCurrencyPopulate_Struct *populate = (AltCurrencyPopulate_Struct*)emu_buffer;

 			auto outapp = new EQApplicationPacket(
@@ -1308,13 +1308,13 @@ namespace RoF
 				PutFieldN(class_);

 				/* Translate older ranks to new values */
-				//switch (emu_e->rank) {
-				//case 0: { e->rank = htonl(5); break; }  // GUILD_MEMBER	0
-				//case 1: { e->rank = htonl(3); break; }  // GUILD_OFFICER 1
-				//case 2: { e->rank = htonl(1); break; }  // GUILD_LEADER	2
-				//default: { e->rank = htonl(emu_e->rank); break; } // GUILD_NONE
-				//}
-				PutFieldN(rank);
+				switch (emu_e->rank) {
+				case 0: { e->rank = htonl(5); break; }  // GUILD_MEMBER	0
+				case 1: { e->rank = htonl(3); break; }  // GUILD_OFFICER 1
+				case 2: { e->rank = htonl(1); break; }  // GUILD_LEADER	2
+				default: { e->rank = htonl(emu_e->rank); break; } // GUILD_NONE
+				}
+
 				PutFieldN(time_last_on);
 				PutFieldN(tribute_enable);
 				e->unknown01 = 0;
@@ -2621,7 +2621,7 @@ namespace RoF
 		general->parameter = RaidCommandAcceptInvite;
 		strn0cpy(general->leader_name, emu->leader_name, sizeof(emu->leader_name));
 		strn0cpy(general->player_name, emu->leader_name, sizeof(emu->leader_name));
-
+		
 		dest->FastQueuePacket(&outapp);

 		safe_delete(inapp);
@@ -3051,12 +3051,19 @@ namespace RoF
 		ENCODE_LENGTH_EXACT(GuildSetRank_Struct);
 		SETUP_DIRECT_ENCODE(GuildSetRank_Struct, structs::GuildSetRank_Struct);

-		eq->guild_id = emu->Unknown00;
-		eq->rank = emu->rank;
+		eq->GuildID = emu->Unknown00;

-		memcpy(eq->member_name, emu->member_name, sizeof(eq->member_name));
-		OUT(banker);
-		eq->unknown76 = 1;
+		/* Translate older ranks to new values */
+		switch (emu->Rank) {
+		case 0: { eq->Rank = 5; break; }  // GUILD_MEMBER	0
+		case 1: { eq->Rank = 3; break; }  // GUILD_OFFICER	1
+		case 2: { eq->Rank = 1; break; }  // GUILD_LEADER	2
+		default: { eq->Rank = emu->Rank; break; }
+		}
+
+		memcpy(eq->MemberName, emu->MemberName, sizeof(eq->MemberName));
+		OUT(Banker);
+		eq->Unknown76 = 1;

 		FINISH_ENCODE();
 	}
@@ -3089,6 +3096,21 @@ namespace RoF
 		FINISH_ENCODE();
 	}

+	ENCODE(OP_ShopRequest)
+	{
+		ENCODE_LENGTH_EXACT(Merchant_Click_Struct);
+		SETUP_DIRECT_ENCODE(Merchant_Click_Struct, structs::Merchant_Click_Struct);
+
+		OUT(npcid);
+		OUT(playerid);
+		OUT(command);
+		OUT(rate);
+		eq->unknown01 = 3;	// Not sure what these values do yet, but list won't display without them
+		eq->unknown02 = 2592000;
+
+		FINISH_ENCODE();
+	}
+
 	ENCODE(OP_SkillUpdate)
 	{
 		ENCODE_LENGTH_EXACT(SkillUpdate_Struct);
@@ -3143,7 +3165,7 @@ namespace RoF

 		SpawnAppearance_Struct *sas = (SpawnAppearance_Struct *)emu_buffer;

-		if (sas->type != AppearanceType::Size)
+		if (sas->type != AT_Size)
 		{
 			dest->FastQueuePacket(&in, ack_req);
 			return;
@@ -3846,8 +3868,8 @@ namespace RoF
 			}

 			float SpawnSize = emu->size;
-			if (!((emu->NPC == 0) || (emu->race <= Race::Gnome) || (emu->race == Race::Iksar) ||
-					(emu->race == Race::VahShir) || (emu->race == Race::Froglok2) || (emu->race == Race::Drakkin))
+			if (!((emu->NPC == 0) || (emu->race <= RACE_GNOME_12) || (emu->race == RACE_IKSAR_128) ||
+					(emu->race == RACE_VAH_SHIR_130) || (emu->race == RACE_FROGLOK_330) || (emu->race == RACE_DRAKKIN_522))
 				)
 			{
 				PacketSize += 60;
@@ -3951,22 +3973,10 @@ namespace RoF

 				/* Translate older ranks to new values */
 				switch (emu->guildrank) {
-					case 0: {
-						VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 5);
-						break;
-					}  // GUILD_MEMBER	0
-					case 1: {
-						VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 3);
-						break;
-					}  // GUILD_OFFICER	1
-					case 2: {
-						VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 1);
-						break;
-					}  // GUILD_LEADER	2
-					default: {
-						VARSTRUCT_ENCODE_TYPE(uint32, Buffer, emu->guildrank);
-						break;
-					}  //
+				case 0: { VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 5);  break; }  // GUILD_MEMBER	0
+				case 1: { VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 3);  break; }  // GUILD_OFFICER	1
+				case 2: { VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 1);  break; }  // GUILD_LEADER	2
+				default: { VARSTRUCT_ENCODE_TYPE(uint32, Buffer, emu->guildrank); break; }  //
 				}
 			}

@@ -3992,8 +4002,8 @@ namespace RoF
 			VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 0xffffffff); // unknown18
 			VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 0xffffffff); // unknown19

-			if ((emu->NPC == 0) || (emu->race <= Race::Gnome) || (emu->race == Race::Iksar) ||
-					(emu->race == Race::VahShir) || (emu->race == Race::Froglok2) || (emu->race == Race::Drakkin)
+			if ((emu->NPC == 0) || (emu->race <= RACE_GNOME_12) || (emu->race == RACE_IKSAR_128) ||
+					(emu->race == RACE_VAH_SHIR_130) || (emu->race == RACE_FROGLOK_330) || (emu->race == RACE_DRAKKIN_522)
 				)
 			{
 				for (k = EQ::textures::textureBegin; k < EQ::textures::materialCount; ++k)
@@ -5032,6 +5042,19 @@ namespace RoF
 		FINISH_DIRECT_DECODE();
 	}

+	DECODE(OP_ShopRequest)
+	{
+		DECODE_LENGTH_EXACT(structs::Merchant_Click_Struct);
+		SETUP_DIRECT_DECODE(Merchant_Click_Struct, structs::Merchant_Click_Struct);
+
+		IN(npcid);
+		IN(playerid);
+		IN(command);
+		IN(rate);
+
+		FINISH_DIRECT_DECODE();
+	}
+
 	DECODE(OP_Trader)
 	{
 		uint32 psize = __packet->size;
@@ -274,7 +274,7 @@ namespace RoF2
 		unsigned char *emu_buffer = in->pBuffer;
 		uint32 opcode = *((uint32*)emu_buffer);

-		if (opcode == AlternateCurrencyMode::Populate) {
+		if (opcode == 8) {
 			AltCurrencyPopulate_Struct *populate = (AltCurrencyPopulate_Struct*)emu_buffer;

 			auto outapp = new EQApplicationPacket(
@@ -1319,7 +1319,6 @@ namespace RoF2
 		buffer++;

 		// Guild ID
-		//*((uint32*)buffer) = htonl(2);
 		buffer += sizeof(uint32);

 		//add member count.
@@ -1358,7 +1357,15 @@ namespace RoF2
 				PutFieldN(level);
 				PutFieldN(banker);
 				PutFieldN(class_);
-				PutFieldN(rank);
+
+				/* Translate older ranks to new values */
+				switch (emu_e->rank) {
+				case 0: { e->rank = htonl(5); break; }  // GUILD_MEMBER	0
+				case 1: { e->rank = htonl(3); break; }  // GUILD_OFFICER 1
+				case 2: { e->rank = htonl(1); break; }  // GUILD_LEADER	2
+				default: { e->rank = htonl(emu_e->rank); break; } // GUILD_NONE
+				}
+
 				PutFieldN(time_last_on);
 				PutFieldN(tribute_enable);
 				e->unknown01 = 0;
@@ -1388,10 +1395,8 @@ namespace RoF2

 		OUT(GuildID);
 		memcpy(eq->MemberName, emu->MemberName, sizeof(eq->MemberName));
-		//OUT(ZoneID);
-		//OUT(InstanceID);
-		eq->InstanceID = emu->InstanceID;
-		eq->ZoneID = emu->ZoneID;
+		OUT(ZoneID);
+		OUT(InstanceID);
 		OUT(LastSeen);
 		eq->Unknown76 = 0;

@@ -1401,61 +1406,60 @@ namespace RoF2
 	ENCODE(OP_GuildsList)
 	{
 		EQApplicationPacket *in = *p;
-		*p                      = nullptr;
+		*p = nullptr;

-		GuildsListMessaging_Struct   glms{};
-		EQ::Util::MemoryStreamReader ss(reinterpret_cast<char *>(in->pBuffer), in->size);
-		cereal::BinaryInputArchive   ar(ss);
-		ar(glms);
+		uint32 NumberOfGuilds = in->size / 64;
+		uint32 PacketSize = 68;	// 64 x 0x00 + a uint32 that I am guessing is the highest guild ID in use.

-		auto packet_size = 64 + 4 + glms.guild_detail.size() * 4 + glms.string_length;
-		auto buffer      = new uchar[packet_size];
-		auto buf_pos     = buffer;
+		unsigned char *__emu_buffer = in->pBuffer;

-		memset(buf_pos, 0, 64);
-		buf_pos += 64;
+		char *InBuffer = (char *)__emu_buffer;

-		VARSTRUCT_ENCODE_TYPE(uint32, buf_pos, glms.no_of_guilds);
+		uint32 HighestGuildID = 0;

-		for (auto const &g: glms.guild_detail) {
-			if (g.guild_id < RoF2::constants::MAX_GUILD_ID) {
-				VARSTRUCT_ENCODE_TYPE(uint32, buf_pos, g.guild_id);
-				strn0cpy((char *) buf_pos, g.guild_name.c_str(), g.guild_name.length() + 1);
-				buf_pos += g.guild_name.length() + 1;
+		for (unsigned int i = 0; i < NumberOfGuilds; ++i)
+		{
+			if (InBuffer[0])
+			{
+				PacketSize += (5 + strlen(InBuffer));
+				HighestGuildID = i - 1;
 			}
+			InBuffer += 64;
 		}

-		auto outapp     = new EQApplicationPacket(OP_GuildsList);
-		outapp->size    = packet_size;
-		outapp->pBuffer = buffer;
+		PacketSize++;	// Appears to be an extra 0x00 at the very end.

-		dest->FastQueuePacket(&outapp);
+		in->size = PacketSize;
+		in->pBuffer = new unsigned char[in->size];
+
+		InBuffer = (char *)__emu_buffer;
+
+		char *OutBuffer = (char *)in->pBuffer;
+
+		// Init the first 64 bytes to zero, as per live.
+		//
+		memset(OutBuffer, 0, 64);
+
+		OutBuffer += 64;
+
+		VARSTRUCT_ENCODE_TYPE(uint32, OutBuffer, HighestGuildID);
+
+		for (unsigned int i = 0; i < NumberOfGuilds; ++i)
+		{
+			if (InBuffer[0])
+			{
+				VARSTRUCT_ENCODE_TYPE(uint32, OutBuffer, i - 1);
+				VARSTRUCT_ENCODE_STRING(OutBuffer, InBuffer);
+			}
+			InBuffer += 64;
+		}
+
+		VARSTRUCT_ENCODE_TYPE(uint8, OutBuffer, 0x00);
+
+		delete[] __emu_buffer;
+		dest->FastQueuePacket(&in, ack_req);
 	}

-	ENCODE(OP_GuildTributeDonateItem)
-	{
-		SETUP_DIRECT_ENCODE(GuildTributeDonateItemReply_Struct, structs::GuildTributeDonateItemReply_Struct);
-
-		Log(Logs::Detail, Logs::Netcode, "RoF2::ENCODE(OP_GuildTributeDonateItem)");
-
-		OUT(type);
-		OUT(sub_index);
-		OUT(aug_index);
-		OUT(quantity);
-		OUT(unknown10);
-		OUT(unknown20);
-		OUT(favor);
-
-		structs::InventorySlot_Struct iss;
-		iss = ServerToRoF2Slot(emu->slot);
-
-		eq->slot = iss.Slot;
-		eq->sub_index = iss.SubIndex;
-
-		FINISH_ENCODE();
-	}
-
-
 	ENCODE(OP_HPUpdate)
 	{
 		SETUP_DIRECT_ENCODE(SpawnHPUpdate_Struct, structs::SpawnHPUpdate_Struct);
@@ -1556,75 +1560,30 @@ namespace RoF2
 		*p = nullptr;

 		//store away the emu struct
-		uchar             *__emu_buffer = in->pBuffer;
-		ItemPacket_Struct *old_item_pkt = (ItemPacket_Struct *) __emu_buffer;
+		uchar* __emu_buffer = in->pBuffer;

-		switch(old_item_pkt->PacketType) 			
-		{
-			case ItemPacketParcel: {
-				ParcelMessaging_Struct       pms{};
-				EQ::Util::MemoryStreamReader ss(reinterpret_cast<char *>(in->pBuffer), in->size);
-				cereal::BinaryInputArchive   ar(ss);
-				ar(pms);
+		ItemPacket_Struct* old_item_pkt = (ItemPacket_Struct*)__emu_buffer;
+		EQ::InternalSerializedItem_Struct* int_struct = (EQ::InternalSerializedItem_Struct*)(&__emu_buffer[4]);

-				uint32 player_name_length = pms.player_name.length();
-				uint32 note_length        = pms.note.length();
+		EQ::OutBuffer ob;
+		EQ::OutBuffer::pos_type last_pos = ob.tellp();

-				auto *int_struct = (EQ::InternalSerializedItem_Struct *) pms.serialized_item.data();
+		ob.write((const char*)__emu_buffer, 4);

-				EQ::OutBuffer           ob;
-				EQ::OutBuffer::pos_type last_pos = ob.tellp();
-				ob.write(reinterpret_cast<const char *>(&pms.packet_type), 4);
+		SerializeItem(ob, (const EQ::ItemInstance*)int_struct->inst, int_struct->slot_id, 0, old_item_pkt->PacketType);
+		if (ob.tellp() == last_pos) {
+			LogNetcode("RoF2::ENCODE(OP_ItemPacket) Serialization failed on item slot [{}]", int_struct->slot_id);
+			delete in;
+			return;
+		}

-				SerializeItem(ob, (const EQ::ItemInstance *) int_struct->inst, pms.slot_id, 0, ItemPacketParcel);
+		in->size = ob.size();
+		in->pBuffer = ob.detach();

-				if (ob.tellp() == last_pos) {
-					LogNetcode("RoF2::ENCODE(OP_ItemPacket) Serialization failed on item slot [{}]", pms.slot_id);
-					safe_delete_array(__emu_buffer);
-					safe_delete(in);
-					return;
-				}
+		delete[] __emu_buffer;

-				ob.write((const char *) &pms.sent_time, 4);
-				ob.write((const char *) &player_name_length, 4);
-				ob.write(pms.player_name.c_str(), pms.player_name.length());
-				ob.write((const char *) &note_length, 4);
-				ob.write(pms.note.c_str(), pms.note.length());
-
-				in->size    = ob.size();
-				in->pBuffer = ob.detach();
-
-				safe_delete_array(__emu_buffer);
-				dest->FastQueuePacket(&in, ack_req);
-
-				break;
-			}
-            default: {
-                EQ::InternalSerializedItem_Struct *int_struct = (EQ::InternalSerializedItem_Struct *)(&__emu_buffer[4]);
-
-                EQ::OutBuffer           ob;
-                EQ::OutBuffer::pos_type last_pos = ob.tellp();
-
-                ob.write((const char *)__emu_buffer, 4);
-
-                SerializeItem(ob, (const EQ::ItemInstance *)int_struct->inst, int_struct->slot_id, 0,
-                              old_item_pkt->PacketType);
-                if (ob.tellp() == last_pos) {
-                    LogNetcode("RoF2::ENCODE(OP_ItemPacket) Serialization failed on item slot [{}]",
-                               int_struct->slot_id);
-					safe_delete_array(__emu_buffer);
-					safe_delete(in);
-                    return;
-                }
-
-                in->size    = ob.size();
-                in->pBuffer = ob.detach();
-
-                safe_delete_array(__emu_buffer);
-                dest->FastQueuePacket(&in, ack_req);
-            }
-        }
-    }
+		dest->FastQueuePacket(&in, ack_req);
+	}

 	ENCODE(OP_ItemVerifyReply)
 	{
@@ -2507,8 +2466,6 @@ namespace RoF2
 		{
 			outapp->WriteUInt32(0xffffffff);
 			outapp->WriteUInt32(0);
-//			outapp->WriteUInt32(60);
-//			outapp->WriteUInt32(1);
 		}

 		outapp->WriteUInt32(0);				// Unknown
@@ -3147,12 +3104,19 @@ namespace RoF2
 		ENCODE_LENGTH_EXACT(GuildSetRank_Struct);
 		SETUP_DIRECT_ENCODE(GuildSetRank_Struct, structs::GuildSetRank_Struct);

-		eq->guild_id= emu->Unknown00;
-		eq->rank = emu->rank;
+		eq->GuildID = emu->Unknown00;

-		memcpy(eq->member_name, emu->member_name, sizeof(eq->member_name));
-		OUT(banker);
-		eq->unknown76 = 1;
+		/* Translate older ranks to new values */
+		switch (emu->Rank) {
+		case 0: { eq->Rank = 5; break; }  // GUILD_MEMBER	0
+		case 1: { eq->Rank = 3; break; }  // GUILD_OFFICER	1
+		case 2: { eq->Rank = 1; break; }  // GUILD_LEADER	2
+		default: { eq->Rank = emu->Rank; break; }
+		}
+
+		memcpy(eq->MemberName, emu->MemberName, sizeof(eq->MemberName));
+		OUT(Banker);
+		eq->Unknown76 = 1;

 		FINISH_ENCODE();
 	}
@@ -3185,6 +3149,21 @@ namespace RoF2
 		FINISH_ENCODE();
 	}

+	ENCODE(OP_ShopRequest)
+	{
+		ENCODE_LENGTH_EXACT(Merchant_Click_Struct);
+		SETUP_DIRECT_ENCODE(Merchant_Click_Struct, structs::Merchant_Click_Struct);
+
+		OUT(npcid);
+		OUT(playerid);
+		OUT(command);
+		OUT(rate);
+		eq->unknown01 = 3;	// Not sure what these values do yet, but list won't display without them
+		eq->unknown02 = 2592000;
+
+		FINISH_ENCODE();
+	}
+
 	ENCODE(OP_SkillUpdate)
 	{
 		ENCODE_LENGTH_EXACT(SkillUpdate_Struct);
@@ -3239,7 +3218,7 @@ namespace RoF2

 		SpawnAppearance_Struct *sas = (SpawnAppearance_Struct *)emu_buffer;

-		if (sas->type != AppearanceType::Size)
+		if (sas->type != AT_Size)
 		{
 			dest->FastQueuePacket(&in, ack_req);
 			return;
@@ -4028,8 +4007,8 @@ namespace RoF2
 			}

 			float SpawnSize = emu->size;
-			if (!((emu->NPC == 0) || (emu->race <= Race::Gnome) || (emu->race == Race::Iksar) ||
-					(emu->race == Race::VahShir) || (emu->race == Race::Froglok2) || (emu->race == Race::Drakkin))
+			if (!((emu->NPC == 0) || (emu->race <= RACE_GNOME_12) || (emu->race == RACE_IKSAR_128) ||
+					(emu->race == RACE_VAH_SHIR_130) || (emu->race == RACE_FROGLOK_330) || (emu->race == RACE_DRAKKIN_522))
 				)
 			{
 				PacketSize += 60;
@@ -4199,13 +4178,12 @@ namespace RoF2
 				VARSTRUCT_ENCODE_TYPE(uint32, Buffer, emu->guildID);

 				/* Translate older ranks to new values */
-				//switch (emu->guildrank) {
-				//case 0: { VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 5);  break; }  // GUILD_MEMBER	0
-				//case 1: { VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 3);  break; }  // GUILD_OFFICER	1
-				//case 2: { VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 1);  break; }  // GUILD_LEADER	2
-				//default: { VARSTRUCT_ENCODE_TYPE(uint32, Buffer, emu->guildrank); break; }  //
-				//}
-				VARSTRUCT_ENCODE_TYPE(uint32, Buffer, emu->guildrank);
+				switch (emu->guildrank) {
+				case 0: { VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 5);  break; }  // GUILD_MEMBER	0
+				case 1: { VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 3);  break; }  // GUILD_OFFICER	1
+				case 2: { VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 1);  break; }  // GUILD_LEADER	2
+				default: { VARSTRUCT_ENCODE_TYPE(uint32, Buffer, emu->guildrank); break; }  //
+				}
 			}

 			VARSTRUCT_ENCODE_TYPE(uint8, Buffer, emu->class_);
@@ -4221,7 +4199,7 @@ namespace RoF2
 			VARSTRUCT_ENCODE_STRING(Buffer, emu->lastName);

 			VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 0);	// aatitle
-			VARSTRUCT_ENCODE_TYPE(uint8, Buffer, emu->guild_show); 
+			VARSTRUCT_ENCODE_TYPE(uint8, Buffer, emu->NPC ? 0 : 1); // unknown - Must be 1 for guild name to be shown abover players head.
 			VARSTRUCT_ENCODE_TYPE(uint8, Buffer, 0); // TempPet

 			VARSTRUCT_ENCODE_TYPE(uint32, Buffer, emu->petOwnerId);
@@ -4234,8 +4212,8 @@ namespace RoF2
 			VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 0xffffffff); // These do something with OP_WeaponEquip1
 			VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 0xffffffff); // ^

-			if ((emu->NPC == 0) || (emu->race <= Race::Gnome) || (emu->race == Race::Iksar) ||
-					(emu->race == Race::VahShir) || (emu->race == Race::Froglok2) || (emu->race == Race::Drakkin)
+			if ((emu->NPC == 0) || (emu->race <= RACE_GNOME_12) || (emu->race == RACE_IKSAR_128) ||
+					(emu->race == RACE_VAH_SHIR_130) || (emu->race == RACE_FROGLOK_330) || (emu->race == RACE_DRAKKIN_522)
 				)
 			{
 				for (k = EQ::textures::textureBegin; k < EQ::textures::materialCount; ++k)
@@ -4977,7 +4955,7 @@ namespace RoF2

 		strn0cpy(emu->target, eq->target, sizeof(emu->target));
 		strn0cpy(emu->name, eq->name, sizeof(emu->name));
-		IN(rank);
+		// IN(rank);

 		FINISH_DIRECT_DECODE();
 	}
@@ -5005,38 +4983,6 @@ namespace RoF2
 		FINISH_DIRECT_DECODE();
 	}

-	DECODE(OP_GuildTributeDonateItem)
-	{
-		DECODE_LENGTH_EXACT(structs::GuildTributeDonateItemRequest_Struct);
-		SETUP_DIRECT_DECODE(GuildTributeDonateItemRequest_Struct, structs::GuildTributeDonateItemRequest_Struct);
-
-		Log(Logs::Detail, Logs::Netcode, "RoF2::DECODE(OP_GuildTributeDonateItem)");
-
-		IN(type);
-		IN(slot);
-		IN(sub_index);
-		IN(aug_index);
-		IN(unknown10);
-		IN(quantity);
-		IN(tribute_master_id);
-		IN(unknown20);
-		IN(guild_id);
-		IN(unknown28);
-		IN(unknown32);
-
-		structs::InventorySlot_Struct iss;
-		iss.Slot = eq->slot;
-		iss.SubIndex = eq->sub_index;
-		iss.AugIndex = eq->aug_index;
-		iss.Type = eq->type;
-		iss.Unknown01 = 0;
-		iss.Unknown02 = 0;
-
-		emu->slot = RoF2ToServerSlot(iss);
-
-		FINISH_DIRECT_DECODE();
-	}
-
 	/*DECODE(OP_InspectAnswer)
 	{
 	DECODE_LENGTH_EXACT(structs::InspectResponse_Struct);
@@ -5314,17 +5260,15 @@ namespace RoF2
 		FINISH_DIRECT_DECODE();
 	}

-	DECODE(OP_ShopSendParcel)
+	DECODE(OP_ShopRequest)
 	{
-		DECODE_LENGTH_EXACT(structs::Parcel_Struct);
-		SETUP_DIRECT_DECODE(Parcel_Struct, structs::Parcel_Struct);
+		DECODE_LENGTH_EXACT(structs::Merchant_Click_Struct);
+		SETUP_DIRECT_DECODE(Merchant_Click_Struct, structs::Merchant_Click_Struct);

-		IN(npc_id);
-		IN(quantity);
-		IN(money_flag);
-		emu->item_slot = RoF2ToServerTypelessSlot(eq->inventory_slot, invtype::typePossessions);
-		strn0cpy(emu->send_to, eq->send_to, sizeof(emu->send_to));
-		strn0cpy(emu->note, eq->note, sizeof(emu->note));
+		IN(npcid);
+		IN(playerid);
+		IN(command);
+		IN(rate);

 		FINISH_DIRECT_DECODE();
 	}
@@ -5543,24 +5487,11 @@ namespace RoF2
 		//sprintf(hdr.unknown000, "06e0002Y1W00");

 		snprintf(hdr.unknown000, sizeof(hdr.unknown000), "%016d", item->ID);
-		if (packet_type == ItemPacketParcel) {
-			strn0cpy(
-				hdr.unknown000,
-				fmt::format(
-					"{:03}PAR{:010}\0",
-					inst->GetMerchantSlot(),
-					item->ID
-				).c_str(),
-				sizeof(hdr.unknown000)
-			);
-		}

-		hdr.stacksize =
-			item->ID == PARCEL_MONEY_ITEM_ID ? inst->GetPrice() : (inst->IsStackable() ? ((inst->GetCharges() > 1000)
-				? 0xFFFFFFFF : inst->GetCharges()) : 1);
+		hdr.stacksize = (inst->IsStackable() ? ((inst->GetCharges() > 1000) ? 0xFFFFFFFF : inst->GetCharges()) : 1);
 		hdr.unknown004 = 0;

-		structs::InventorySlot_Struct slot_id{};
+		structs::InventorySlot_Struct slot_id;
 		switch (packet_type) {
 		case ItemPacketLoot:
 			slot_id = ServerToRoF2CorpseSlot(slot_id_in);
@@ -5570,24 +5501,22 @@ namespace RoF2
 			break;
 		}

-		hdr.slot_type      = (inst->GetMerchantSlot() ? invtype::typeMerchant : slot_id.Type);
-		hdr.main_slot      = (inst->GetMerchantSlot() ? inst->GetMerchantSlot() : slot_id.Slot);
-		hdr.sub_slot       = (inst->GetMerchantSlot() ? 0xffff : slot_id.SubIndex);
-		hdr.aug_slot       = (inst->GetMerchantSlot() ? 0xffff : slot_id.AugIndex);
-		hdr.price          = inst->GetPrice();
-		hdr.merchant_slot  = ((inst->GetMerchantSlot() ? inst->GetMerchantCount() : 1));
-		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;
+		hdr.slot_type = (inst->GetMerchantSlot() ? invtype::typeMerchant : slot_id.Type);
+		hdr.main_slot = (inst->GetMerchantSlot() ? inst->GetMerchantSlot() : slot_id.Slot);
+		hdr.sub_slot = (inst->GetMerchantSlot() ? 0xffff : slot_id.SubIndex);
+		hdr.aug_slot = (inst->GetMerchantSlot() ? 0xffff : slot_id.AugIndex);
+		hdr.price = inst->GetPrice();
+		hdr.merchant_slot = (inst->GetMerchantSlot() ? inst->GetMerchantCount() : 1);
+		hdr.scaled_value = (inst->IsScaling() ? (inst->GetExp() / 100) : 0);
+		hdr.instance_id = (inst->GetMerchantSlot() ? inst->GetMerchantSlot() : inst->GetSerialNumber());
+		hdr.unknown028 = 0;
 		hdr.last_cast_time = inst->GetRecastTimestamp();
-		hdr.charges        = (inst->IsStackable() ? (item->MaxCharges ? 1 : 0) : ((inst->GetCharges() > 254)
-			? 0xFFFFFFFF
-			: inst->GetCharges()));
-		hdr.inst_nodrop    = (inst->IsAttuned() ? 1 : 0);
-		hdr.unknown044     = 0;
-		hdr.unknown048     = 0;
-		hdr.unknown052     = 0;
-		hdr.isEvolving     = item->EvolvingItem;
+		hdr.charges = (inst->IsStackable() ? (item->MaxCharges ? 1 : 0) : ((inst->GetCharges() > 254) ? 0xFFFFFFFF : inst->GetCharges()));
+		hdr.inst_nodrop = (inst->IsAttuned() ? 1 : 0);
+		hdr.unknown044 = 0;
+		hdr.unknown048 = 0;
+		hdr.unknown052 = 0;
+		hdr.isEvolving = item->EvolvingItem;

 		ob.write((const char*)&hdr, sizeof(RoF2::structs::ItemSerializationHeader));

@@ -5645,10 +5574,9 @@ namespace RoF2

 		ob.write((const char*)&hdrf, sizeof(RoF2::structs::ItemSerializationHeaderFinish));

-		if (strlen(item->Name) > 0) {
+		if (strlen(item->Name) > 0)
 			ob.write(item->Name, strlen(item->Name));
-			ob.write("\0", 1);
-		}
+		ob.write("\0", 1);

 		if (strlen(item->Lore) > 0)
 			ob.write(item->Lore, strlen(item->Lore));
@@ -5809,11 +5737,10 @@ namespace RoF2
 		itbs.unknown5 = 0;

 		itbs.potion_belt_enabled = item->PotionBelt;
-		itbs.potion_belt_slots   = item->PotionBeltSlots;
-		itbs.stacksize           =
-			item->ID == PARCEL_MONEY_ITEM_ID ? 0x7FFFFFFF : ((inst->IsStackable() ? item->StackSize : 0));
-		itbs.no_transfer         = item->NoTransfer;
-		itbs.expendablearrow     = item->ExpendableArrow;
+		itbs.potion_belt_slots = item->PotionBeltSlots;
+		itbs.stacksize = (inst->IsStackable() ? item->StackSize : 0);
+		itbs.no_transfer = item->NoTransfer;
+		itbs.expendablearrow = item->ExpendableArrow;

 		// Done to hack older clients to label expendable fishing poles as such
 		// July 28th, 2018 patch
@@ -158,7 +158,6 @@ namespace RoF2
 				slotCursor
 			};

-			constexpr int16 format_as(InventorySlots slot) { return static_cast<int16>(slot); }
 		} // namespace enum_
 		using namespace enum_;

@@ -271,7 +270,6 @@ namespace RoF2
 		const size_t CHARACTER_CREATION_LIMIT = 12;

 		const size_t SAY_LINK_BODY_SIZE = 56;
-		const uint32 MAX_GUILD_ID       = 50000;

 	} /*constants*/

@@ -82,7 +82,6 @@ E(OP_GuildBank)
 E(OP_GuildMemberList)
 E(OP_GuildMemberUpdate)
 E(OP_GuildsList)
-E(OP_GuildTributeDonateItem)
 E(OP_HPUpdate)
 E(OP_Illusion)
 E(OP_InspectBuffs)
@@ -116,6 +115,7 @@ E(OP_SendZonepoints)
 E(OP_SetGuildRank)
 E(OP_ShopPlayerBuy)
 E(OP_ShopPlayerSell)
+E(OP_ShopRequest)
 E(OP_SkillUpdate)
 E(OP_SomeItemPacketMaybe)
 E(OP_SpawnAppearance)
@@ -182,7 +182,6 @@ D(OP_GuildBank)
 D(OP_GuildDemote)
 D(OP_GuildRemove)
 D(OP_GuildStatus)
-D(OP_GuildTributeDonateItem)
 D(OP_InspectRequest)
 D(OP_ItemLinkClick)
 D(OP_ItemVerifyRequest)
@@ -199,7 +198,7 @@ D(OP_Save)
 D(OP_SetServerFilter)
 D(OP_ShopPlayerBuy)
 D(OP_ShopPlayerSell)
-D(OP_ShopSendParcel)
+D(OP_ShopRequest)
 D(OP_Trader)
 D(OP_TraderBuy)
 D(OP_TradeSkillCombine)
@@ -2011,31 +2011,6 @@ struct GuildBankClear_Struct
 /*16*/	uint32	MainAreaCount;
 };

-struct GuildTributeDonateItemRequest_Struct {
-	/*000*/	uint32	type;
-	/*004*/ uint16 	slot;
-	/*006*/ uint16 	sub_index;
-	/*008*/ uint16 	aug_index;
-	/*010*/ uint16 	unknown10;
-	/*012*/ uint32 	quantity;
-	/*016*/ uint32	tribute_master_id;
-	/*020*/ uint32 	unknown20;
-	/*024*/ uint32	guild_id;
-	/*028*/ uint32	unknown28;
-	/*032*/ uint32 	unknown32;
-};
-
-struct GuildTributeDonateItemReply_Struct {
-	/*000*/ uint32	type;
-	/*004*/ uint16	slot;
-	/*006*/ uint16 	sub_index;
-	/*008*/	uint16	aug_index;
-	/*010*/	uint16	unknown10;
-	/*012*/ uint32	quantity;
-	/*016*/ uint32	unknown20;
-	/*020*/	uint32	favor;
-};
-
 /*
 ** Money Loot
 ** Length: 22 Bytes
@@ -2247,17 +2222,15 @@ struct TimeOfDay_Struct {
 };

 // Darvik: shopkeeper structs
-struct MerchantClick_Struct
-{
-    /*000*/ uint32 npc_id;      // Merchant NPC's entity id
-    /*004*/ uint32 player_id;
-    /*008*/ uint32 command;     // 1=open, 0=cancel/close
-    /*012*/ float  rate;        // cost multiplier, dosent work anymore
-    /*016*/ int32  tab_display; // bitmask b000 none, b001 Purchase/Sell, b010 Recover, b100 Parcels
-    /*020*/ int32  unknown02;   // Seen 2592000 from Server or -1 from Client
-    /*024*/
+struct Merchant_Click_Struct {
+/*000*/ uint32	npcid;			// Merchant NPC's entity id
+/*004*/ uint32	playerid;
+/*008*/ uint32	command;		// 1=open, 0=cancel/close
+/*012*/ float	rate;			// cost multiplier, dosent work anymore
+/*016*/ int32	unknown01;		// Seen 3 from Server or -1 from Client
+/*020*/ int32	unknown02;		// Seen 2592000 from Server or -1 from Client
+/*024*/
 };
-
 /*
 Unknowns:
 0 is e7 from 01 to // MAYBE SLOT IN PURCHASE
@@ -3627,11 +3600,11 @@ struct GuildMakeLeader {
 // Update a guild members rank and banker status
 struct GuildSetRank_Struct
 {
-/*00*/	uint32	guild_id;	// Was Unknown00
-/*04*/	uint32	rank;
-/*08*/	char	member_name[64];
-/*72*/	uint32	banker;
-/*76*/	uint32	unknown76;	// Seen 1 - Maybe Banker?
+/*00*/	uint32	GuildID;	// Was Unknown00
+/*04*/	uint32	Rank;
+/*08*/	char	MemberName[64];
+/*72*/	uint32	Banker;
+/*76*/	uint32	Unknown76;	// Seen 1 - Maybe Banker?
 /*80*/
 };

@@ -3646,7 +3619,7 @@ struct Make_Pet_Struct { //Simple struct for getting pet info
 	uint32 min_dmg;
 	uint32 max_dmg;
 };
-struct GroundSpawn{
+struct Ground_Spawn{
 	float max_x;
 	float max_y;
 	float min_x;
@@ -3658,8 +3631,8 @@ struct GroundSpawn{
 	uint32 max_allowed;
 	uint32 respawntimer;
 };
-struct GroundSpawns {
-	struct GroundSpawn spawn[50]; //Assigned max number to allow
+struct Ground_Spawns {
+	struct Ground_Spawn spawn[50]; //Assigned max number to allow
 };

 //struct PetitionBug_Struct{
@@ -3749,15 +3722,15 @@ struct TributeItem_Struct

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

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


@@ -4574,25 +4547,25 @@ struct RoF2SlotStruct

 struct ItemSerializationHeader
 {
-    /*000*/ char   unknown000[17]; // New for HoT. Looks like a string.
-    /*017*/ uint32 stacksize;
-    /*021*/ uint32 unknown004;
-    /*025*/ uint8  slot_type;      // 0 = normal, 1 = bank, 2 = shared bank, 9 = merchant, 20 = ?
-    /*026*/ uint16 main_slot;
-    /*028*/ uint16 sub_slot;
-    /*030*/ uint16 aug_slot;       // 0xffff
-    /*032*/ uint32 price;
-    /*036*/ uint32 merchant_slot;  // 1 if not a merchant item
-    /*040*/ uint32 scaled_value;   // 0
-    /*044*/ uint32 instance_id;    // unique instance id if not merchant item, else is merchant slot
-    /*048*/ uint32 parcel_item_id; 
-    /*052*/ uint32 last_cast_time; // Unix Time from PP of last cast for this recast type if recast delay > 0
-    /*056*/ uint32 charges;        // Total Charges an item has (-1 for unlimited)
-    /*060*/ uint32 inst_nodrop;    // 1 if the item is no drop (attuned items)
-    /*064*/ uint32 unknown044;     // 0
-    /*068*/ uint32 unknown048;     // 0
-    /*072*/ uint32 unknown052;     // 0
-    uint8          isEvolving;
+/*000*/	char unknown000[17];	// New for HoT. Looks like a string.
+/*017*/	uint32 stacksize;
+/*021*/	uint32 unknown004;
+/*025*/	uint8  slot_type;	// 0 = normal, 1 = bank, 2 = shared bank, 9 = merchant, 20 = ?
+/*026*/	uint16 main_slot;
+/*028*/ uint16 sub_slot;
+/*030*/ uint16 aug_slot;	// 0xffff
+/*032*/	uint32 price;
+/*036*/	uint32 merchant_slot; //1 if not a merchant item
+/*040*/	uint32 scaled_value; //0
+/*044*/	uint32 instance_id; //unique instance id if not merchant item, else is merchant slot
+/*048*/	uint32 unknown028; //0
+/*052*/	uint32 last_cast_time;	// Unix Time from PP of last cast for this recast type if recast delay > 0
+/*056*/	uint32 charges; //Total Charges an item has (-1 for unlimited)
+/*060*/	uint32 inst_nodrop;	// 1 if the item is no drop (attuned items)
+/*064*/	uint32 unknown044;	// 0
+/*068*/	uint32 unknown048;	// 0
+/*072*/	uint32 unknown052;	// 0
+		uint8 isEvolving;
 };

 struct EvolvingItem {
@@ -5263,18 +5236,6 @@ struct Checksum_Struct {
    uint8_t  data[2048];
 };

-struct Parcel_Struct
-{
-    /*000*/ uint32                       npc_id;
-    /*004*/ TypelessInventorySlot_Struct inventory_slot;
-    /*012*/ uint32                       quantity;
-    /*016*/ uint32                       money_flag;
-    /*020*/ char                         send_to[64];
-    /*084*/ char                         note[128];
-    /*212*/ uint32                       unknown_212;
-    /*216*/ uint32                       unknown_216;
-    /*220*/ uint32                       unknown_220;
-};
 	}; /*structs*/

 }; /*RoF2*/
@@ -101,6 +101,7 @@ E(OP_SendZonepoints)
 E(OP_SetGuildRank)
 E(OP_ShopPlayerBuy)
 E(OP_ShopPlayerSell)
+E(OP_ShopRequest)
 E(OP_SkillUpdate)
 E(OP_SomeItemPacketMaybe)
 E(OP_SpawnAppearance)
@@ -182,6 +183,7 @@ D(OP_Save)
 D(OP_SetServerFilter)
 D(OP_ShopPlayerBuy)
 D(OP_ShopPlayerSell)
+D(OP_ShopRequest)
 D(OP_Trader)
 D(OP_TraderBuy)
 D(OP_TradeSkillCombine)
@@ -2200,17 +2200,15 @@ struct TimeOfDay_Struct {
 };

 // Darvik: shopkeeper structs
-struct MerchantClick_Struct
-{
-    /*000*/ uint32 npc_id;      // Merchant NPC's entity id
-    /*004*/ uint32 player_id;
-    /*008*/ uint32 command;     // 1=open, 0=cancel/close
-    /*012*/ float  rate;        // cost multiplier, dosent work anymore
-    /*016*/ int32  tab_display; // bitmask b000 none, b001 Purchase/Sell, b010 Recover, b100 Parcels
-    /*020*/ int32  unknown020;  // Seen 2592000 from Server or -1 from Client
-    /*024*/
+struct Merchant_Click_Struct {
+/*000*/ uint32	npcid;			// Merchant NPC's entity id
+/*004*/ uint32	playerid;
+/*008*/ uint32	command;		// 1=open, 0=cancel/close
+/*012*/ float	rate;			// cost multiplier, dosent work anymore
+/*016*/ int32	unknown01;		// Seen 3 from Server or -1 from Client
+/*020*/ int32	unknown02;		// Seen 2592000 from Server or -1 from Client
+/*024*/
 };
-
 /*
 Unknowns:
 0 is e7 from 01 to // MAYBE SLOT IN PURCHASE
@@ -3539,11 +3537,11 @@ struct GuildMakeLeader {
 // Update a guild members rank and banker status
 struct GuildSetRank_Struct
 {
-/*00*/	uint32	guild_id;	// Was Unknown00
-/*04*/	uint32	rank;
-/*08*/	char	member_name[64];
-/*72*/	uint32	banker;
-/*76*/	uint32	unknown76;	// Seen 1 - Maybe Banker?
+/*00*/	uint32	GuildID;	// Was Unknown00
+/*04*/	uint32	Rank;
+/*08*/	char	MemberName[64];
+/*72*/	uint32	Banker;
+/*76*/	uint32	Unknown76;	// Seen 1 - Maybe Banker?
 /*80*/
 };

@@ -3558,7 +3556,7 @@ struct Make_Pet_Struct { //Simple struct for getting pet info
 	uint32 min_dmg;
 	uint32 max_dmg;
 };
-struct GroundSpawn{
+struct Ground_Spawn{
 	float max_x;
 	float max_y;
 	float min_x;
@@ -3570,8 +3568,8 @@ struct GroundSpawn{
 	uint32 max_allowed;
 	uint32 respawntimer;
 };
-struct GroundSpawns {
-	struct GroundSpawn spawn[50]; //Assigned max number to allow
+struct Ground_Spawns {
+	struct Ground_Spawn spawn[50]; //Assigned max number to allow
 };

 //struct PetitionBug_Struct{
@@ -2026,19 +2026,6 @@ namespace SoD
 		FINISH_ENCODE();
 	}

-	ENCODE(OP_ShopRequest)
-	{
-		ENCODE_LENGTH_EXACT(MerchantClick_Struct);
-		SETUP_DIRECT_ENCODE(MerchantClick_Struct, structs::MerchantClick_Struct);
-
-		OUT(npc_id);
-		OUT(player_id);
-		OUT(command);
-		OUT(rate);
-
-		FINISH_ENCODE();
-	}
-
 	ENCODE(OP_SomeItemPacketMaybe)
 	{
 		// This Opcode is not named very well. It is used for the animation of arrows leaving the player's bow
@@ -2520,8 +2507,8 @@ namespace SoD
 			}

 			float SpawnSize = emu->size;
-			if (!((emu->NPC == 0) || (emu->race <= Race::Gnome) || (emu->race == Race::Iksar) ||
-					(emu->race == Race::VahShir) || (emu->race == Race::Froglok2) || (emu->race == Race::Drakkin))
+			if (!((emu->NPC == 0) || (emu->race <= RACE_GNOME_12) || (emu->race == RACE_IKSAR_128) ||
+					(emu->race == RACE_VAH_SHIR_130) || (emu->race == RACE_FROGLOK_330) || (emu->race == RACE_DRAKKIN_522))
 				)
 			{
 				PacketSize -= (sizeof(structs::Texture_Struct) * EQ::textures::materialCount);
@@ -2719,8 +2706,8 @@ namespace SoD

 			Buffer += sizeof(structs::Spawn_Struct_Position);

-			if ((emu->NPC == 0) || (emu->race <= Race::Gnome) || (emu->race == Race::Iksar) ||
-					(emu->race == Race::VahShir) || (emu->race == Race::Froglok2) || (emu->race == Race::Drakkin)
+			if ((emu->NPC == 0) || (emu->race <= RACE_GNOME_12) || (emu->race == RACE_IKSAR_128) ||
+					(emu->race == RACE_VAH_SHIR_130) || (emu->race == RACE_FROGLOK_330) || (emu->race == RACE_DRAKKIN_522)
 				)
 			{
 				for (k = EQ::textures::textureBegin; k < EQ::textures::materialCount; ++k)
@@ -2746,8 +2733,8 @@ namespace SoD
 			}


-			if ((emu->NPC == 0) || (emu->race <= Race::Gnome) || (emu->race == Race::Iksar) ||
-					(emu->race == Race::VahShir) || (emu->race == Race::Froglok2) || (emu->race == Race::Drakkin)
+			if ((emu->NPC == 0) || (emu->race <= RACE_GNOME_12) || (emu->race == RACE_IKSAR_128) ||
+					(emu->race == RACE_VAH_SHIR_130) || (emu->race == RACE_FROGLOK_330) || (emu->race == RACE_DRAKKIN_522)
 				)
 			{
 				structs::Texture_Struct *Equipment = (structs::Texture_Struct *)Buffer;
@@ -3496,21 +3483,6 @@ namespace SoD
 		FINISH_DIRECT_DECODE();
 	}

-	DECODE(OP_ShopRequest)
-	{
-		DECODE_LENGTH_EXACT(structs::MerchantClick_Struct);
-		SETUP_DIRECT_DECODE(MerchantClick_Struct, structs::MerchantClick_Struct);
-
-		IN(npc_id);
-		IN(player_id);
-		IN(command);
-		IN(rate);
-		emu->tab_display = 0;
-		emu->unknown020 = 0;
-
-		FINISH_DIRECT_DECODE();
-	}
-
 	DECODE(OP_TraderBuy)
 	{
 		DECODE_LENGTH_EXACT(structs::TraderBuy_Struct);
@@ -78,7 +78,6 @@ E(OP_SendCharInfo)
 E(OP_SendZonepoints)
 E(OP_ShopPlayerBuy)
 E(OP_ShopPlayerSell)
-E(OP_ShopRequest)
 E(OP_SomeItemPacketMaybe)
 E(OP_SpawnDoor)
 E(OP_SpecialMesg)
@@ -142,7 +141,6 @@ D(OP_Save)
 D(OP_SetServerFilter)
 D(OP_ShopPlayerBuy)
 D(OP_ShopPlayerSell)
-D(OP_ShopRequest)
 D(OP_TraderBuy)
 D(OP_TradeSkillCombine)
 D(OP_TributeItem)
@@ -1845,16 +1845,12 @@ struct TimeOfDay_Struct {
 };

 // Darvik: shopkeeper structs
-struct MerchantClick_Struct
-{
-    /*000*/ uint32 npc_id;       // Merchant NPC's entity id
-    /*004*/ uint32 player_id;
-    /*008*/ uint32 command;     // 1=open, 0=cancel/close
-    /*012*/ float  rate;        // cost multiplier, dosent work anymore
-    /*016*/ int32  tab_display; // bitmask b000 none, b001 Purchase/Sell, b010 Recover, b100 Parcels
-    /*020*/ int32  unknown020;  // Seen 2592000 from Server or -1 from Client
+struct Merchant_Click_Struct {
+/*000*/ uint32	npcid;			// Merchant NPC's entity id
+/*004*/ uint32	playerid;
+/*008*/ uint32	command;		//1=open, 0=cancel/close
+/*012*/ float	rate;			//cost multiplier, dosent work anymore
 };
-
 /*
 Unknowns:
 0 is e7 from 01 to // MAYBE SLOT IN PURCHASE
@@ -3030,7 +3026,7 @@ struct Make_Pet_Struct { //Simple struct for getting pet info
 	uint32 min_dmg;
 	uint32 max_dmg;
 };
-struct GroundSpawn{
+struct Ground_Spawn{
 	float max_x;
 	float max_y;
 	float min_x;
@@ -3042,8 +3038,8 @@ struct GroundSpawn{
 	uint32 max_allowed;
 	uint32 respawntimer;
 };
-struct GroundSpawns {
-	struct GroundSpawn spawn[50]; //Assigned max number to allow
+struct Ground_Spawns {
+	struct Ground_Spawn spawn[50]; //Assigned max number to allow
 };

 //struct PetitionBug_Struct{
@@ -1683,19 +1683,6 @@ namespace SoF
 		FINISH_ENCODE();
 	}

-	ENCODE(OP_ShopRequest)
-	{
-		ENCODE_LENGTH_EXACT(MerchantClick_Struct);
-		SETUP_DIRECT_ENCODE(MerchantClick_Struct, structs::MerchantClick_Struct);
-
-		OUT(npc_id);
-		OUT(player_id);
-		OUT(command);
-		OUT(rate);
-
-		FINISH_ENCODE();
-	}
-
 	ENCODE(OP_SomeItemPacketMaybe)
 	{
 		// This Opcode is not named very well. It is used for the animation of arrows leaving the player's bow
@@ -2887,21 +2874,6 @@ namespace SoF
 		FINISH_DIRECT_DECODE();
 	}

-	DECODE(OP_ShopRequest)
-	{
-		DECODE_LENGTH_EXACT(structs::MerchantClick_Struct);
-		SETUP_DIRECT_DECODE(MerchantClick_Struct, structs::MerchantClick_Struct);
-
-		IN(npc_id);
-		IN(player_id);
-		IN(command);
-		IN(rate);
-		emu->tab_display = 0;
-		emu->unknown020 = 0;
-
-		FINISH_DIRECT_DECODE();
-	}
-
 	DECODE(OP_TraderBuy)
 	{
 		DECODE_LENGTH_EXACT(structs::TraderBuy_Struct);
@@ -72,7 +72,6 @@ E(OP_SendAATable)
 E(OP_SendCharInfo)
 E(OP_SendZonepoints)
 E(OP_ShopPlayerSell)
-E(OP_ShopRequest)
 E(OP_SomeItemPacketMaybe)
 E(OP_SpawnDoor)
 E(OP_SpecialMesg)
@@ -129,7 +128,6 @@ D(OP_ReadBook)
 D(OP_Save)
 D(OP_SetServerFilter)
 D(OP_ShopPlayerSell)
-D(OP_ShopRequest)
 D(OP_TraderBuy)
 D(OP_TradeSkillCombine)
 D(OP_TributeItem)
@@ -1859,16 +1859,12 @@ struct TimeOfDay_Struct {
 };

 // Darvik: shopkeeper structs
-struct MerchantClick_Struct
-{
-    /*000*/ uint32 npc_id;      // Merchant NPC's entity id
-    /*004*/ uint32 player_id;
-    /*008*/ uint32 command;     // 1=open, 0=cancel/close
-    /*012*/ float  rate;        // cost multiplier, dosent work anymore
-    /*016*/ int32  tab_display; // bitmask b000 none, b001 Purchase/Sell, b010 Recover, b100 Parcels
-    /*020*/ int32  unknown020;  // Seen 2592000 from Server or -1 from Client
+struct Merchant_Click_Struct {
+/*000*/ uint32	npcid;			// Merchant NPC's entity id
+/*004*/ uint32	playerid;
+/*008*/ uint32	command;		//1=open, 0=cancel/close
+/*012*/ float	rate;			//cost multiplier, dosent work anymore
 };
-
 /*
 Unknowns:
 0 is e7 from 01 to // MAYBE SLOT IN PURCHASE
@@ -2955,7 +2951,7 @@ struct Make_Pet_Struct { //Simple struct for getting pet info
 	uint32 min_dmg;
 	uint32 max_dmg;
 };
-struct GroundSpawn{
+struct Ground_Spawn{
 	float max_x;
 	float max_y;
 	float min_x;
@@ -2967,8 +2963,8 @@ struct GroundSpawn{
 	uint32 max_allowed;
 	uint32 respawntimer;
 };
-struct GroundSpawns {
-	struct GroundSpawn spawn[50]; //Assigned max number to allow
+struct Ground_Spawns {
+	struct Ground_Spawn spawn[50]; //Assigned max number to allow
 };

 //struct PetitionBug_Struct{
@@ -34,7 +34,6 @@
 #include "titanium_structs.h"
 #include "../path_manager.h"
 #include "../raid.h"
-#include "../guilds.h"

 #include <sstream>

@@ -665,177 +664,6 @@ namespace Titanium
 		dest->FastQueuePacket(&in, ack_req);
 	}

-	ENCODE(OP_SetGuildRank)
-	{
-		ENCODE_LENGTH_EXACT(GuildSetRank_Struct);
-		SETUP_DIRECT_ENCODE(GuildSetRank_Struct, structs::GuildSetRank_Struct);
-
-		eq->unknown00 = 0;
-		eq->unknown04 = 0;
-
-		//Translate older ranks to new values* /
-		switch (emu->rank) {
-			case GUILD_SENIOR_MEMBER:
-			case GUILD_MEMBER:
-			case GUILD_JUNIOR_MEMBER:
-			case GUILD_INITIATE:
-			case GUILD_RECRUIT: {
-				eq->rank = GUILD_MEMBER_TI;
-				break;
-			}
-			case GUILD_OFFICER:
-			case GUILD_SENIOR_OFFICER: {
-				eq->rank = GUILD_OFFICER_TI;
-				break;
-			}
-			case GUILD_LEADER: {
-				eq->rank = GUILD_LEADER_TI;
-				break;
-			}
-			default: {
-				eq->rank = GUILD_RANK_NONE_TI;
-				break;
-			}
-		}
-
-		memcpy(eq->member_name, emu->member_name, sizeof(eq->member_name));
-		OUT(banker);
-
-		FINISH_ENCODE();
-	}
-
-	ENCODE(OP_SpawnAppearance)
-	{
-		ENCODE_LENGTH_EXACT(SpawnAppearance_Struct);
-		SETUP_DIRECT_ENCODE(SpawnAppearance_Struct, structs::SpawnAppearance_Struct);
-
-		OUT(spawn_id);
-		OUT(type);
-		OUT(parameter);
-		switch (emu->type) {
-			case AppearanceType::GuildRank: {
-				//Translate new ranks to old values* /
-				switch (emu->parameter) {
-					case GUILD_SENIOR_MEMBER:
-					case GUILD_MEMBER:
-					case GUILD_JUNIOR_MEMBER:
-					case GUILD_INITIATE:
-					case GUILD_RECRUIT: {
-						eq->parameter = GUILD_MEMBER_TI;
-						break;
-					}
-					case GUILD_OFFICER:
-					case GUILD_SENIOR_OFFICER: {
-						eq->parameter = GUILD_OFFICER_TI;
-						break;
-					}
-					case GUILD_LEADER: {
-						eq->parameter = GUILD_LEADER_TI;
-						break;
-					}
-				}
-				break; 
-			}
-			case AppearanceType::GuildShow: {
-				FAIL_ENCODE();
-				return;
-			}
-			default: {
-				break;
-			}
-		}
-
-		FINISH_ENCODE();
-	}
-
-	ENCODE(OP_GuildsList)
-	{
-		EQApplicationPacket* in = *p;
-		*p = nullptr;
-
-		GuildsListMessaging_Struct   glms{};
-		EQ::Util::MemoryStreamReader ss(reinterpret_cast<char *>(in->pBuffer), in->size);
-		cereal::BinaryInputArchive   ar(ss);
-		ar(glms);
-
-		auto outapp = new EQApplicationPacket(OP_GuildsList, sizeof(structs::GuildsList_Struct));
-		auto out    = (structs::GuildsList_Struct *) outapp->pBuffer;
-
-		for (auto const& g : glms.guild_detail) {
-			if (g.guild_id < Titanium::constants::MAX_GUILD_ID) {
-				strn0cpy(out->Guilds[g.guild_id].name, g.guild_name.c_str(), sizeof(out->Guilds[g.guild_id].name));
-			}
-		}
-
-		dest->FastQueuePacket(&outapp);
-	}
-
-	ENCODE(OP_GuildMemberAdd)
-	{
-		ENCODE_LENGTH_EXACT(GuildMemberAdd_Struct)
-		SETUP_DIRECT_ENCODE(GuildMemberAdd_Struct, structs::GuildMemberAdd_Struct)
-
-		OUT(guild_id)
-		OUT(level)
-		OUT(class_)
-		switch (emu->rank_) {
-			case GUILD_SENIOR_MEMBER:
-			case GUILD_MEMBER:
-			case GUILD_JUNIOR_MEMBER:
-			case GUILD_INITIATE:
-			case GUILD_RECRUIT: {
-				eq->rank_ = GUILD_MEMBER_TI;
-				break;
-			}
-			case GUILD_OFFICER:
-			case GUILD_SENIOR_OFFICER: {
-				eq->rank_ = GUILD_OFFICER_TI;
-				break;
-			}
-			case GUILD_LEADER: {
-				eq->rank_ = GUILD_LEADER_TI;
-				break;
-			}
-		}
-		OUT(zone_id)
-		OUT(last_on)
-		OUT_str(player_name)
-
-		FINISH_ENCODE()
-	}
-
-	ENCODE(OP_GuildMemberRankAltBanker)
-	{
-		ENCODE_LENGTH_EXACT(GuildMemberRank_Struct)
-		SETUP_DIRECT_ENCODE(GuildMemberRank_Struct, structs::GuildMemberRank_Struct)
-
-		OUT(guild_id)
-		OUT(alt_banker)
-		OUT_str(player_name)
-
-		switch (emu->rank_) {
-			case GUILD_SENIOR_MEMBER:
-			case GUILD_MEMBER:
-			case GUILD_JUNIOR_MEMBER:
-			case GUILD_INITIATE:
-			case GUILD_RECRUIT: {
-				eq->rank_ = GUILD_MEMBER_TI;
-				break;
-			}
-			case GUILD_OFFICER:
-			case GUILD_SENIOR_OFFICER: {
-				eq->rank_ = GUILD_OFFICER_TI;
-				break;
-			}
-			case GUILD_LEADER: {
-				eq->rank_ = GUILD_LEADER_TI;
-				break;
-			}
-		}
-
-		FINISH_ENCODE()
-	}
-
 	ENCODE(OP_GuildMemberList)
 	{
 		//consume the packet
@@ -899,34 +727,12 @@ namespace Titanium
 				str += sl + 1; \
 			}
 #define PutFieldN(field) e->field = htonl(emu_e->field)
-				/* Translate new ranks to older values */
+
 				SlideStructString(name, emu_name);
 				PutFieldN(level);
 				PutFieldN(banker);
 				PutFieldN(class_);
-				switch (emu_e->rank) {
-					case GUILD_SENIOR_MEMBER:
-					case GUILD_MEMBER:
-					case GUILD_JUNIOR_MEMBER:
-					case GUILD_INITIATE:
-					case GUILD_RECRUIT: {
-						e->rank = htonl(GUILD_MEMBER_TI);
-						break;
-					}
-					case GUILD_OFFICER:
-					case GUILD_SENIOR_OFFICER: {
-						e->rank = htonl(GUILD_OFFICER_TI);
-						break;
-					}
-					case GUILD_LEADER: {
-						e->rank = htonl(GUILD_LEADER_TI);
-						break;
-					}
-					default: {
-						e->rank = htonl(GUILD_MEMBER_TI);
-						break;
-					}
-				}
+				PutFieldN(rank);
 				PutFieldN(time_last_on);
 				PutFieldN(tribute_enable);
 				PutFieldN(total_tribute);
@@ -947,38 +753,6 @@ namespace Titanium
 		dest->FastQueuePacket(&in, ack_req);
 	}

-	ENCODE(OP_SendGuildTributes)
-	{
-		ENCODE_LENGTH_ATLEAST(structs::GuildTributeAbility_Struct);
-		SETUP_VAR_ENCODE(GuildTributeAbility_Struct);
-		ALLOC_VAR_ENCODE(structs::GuildTributeAbility_Struct, sizeof(GuildTributeAbility_Struct) + strlen(emu->ability.name));
-
-		eq->guild_id = emu->guild_id;;
-		strncpy(eq->ability.name, emu->ability.name, strlen(emu->ability.name));
-		eq->ability.tribute_id = emu->ability.tribute_id;
-		eq->ability.tier_count = emu->ability.tier_count;
-		for (int i = 0; i < ntohl(emu->ability.tier_count); i++) {
-			eq->ability.tiers[i].cost = emu->ability.tiers[i].cost;
-			eq->ability.tiers[i].level = emu->ability.tiers[i].level;
-			eq->ability.tiers[i].tribute_item_id = emu->ability.tiers[i].tribute_item_id;
-		}
-		FINISH_ENCODE();
-	}
-
-	ENCODE(OP_GuildTributeDonateItem)
-	{
-		SETUP_DIRECT_ENCODE(GuildTributeDonateItemReply_Struct, structs::GuildTributeDonateItemReply_Struct);
-
-		Log(Logs::Detail, Logs::Netcode, "UF::ENCODE(OP_GuildTributeDonateItem)");
-
-		OUT(quantity);
-		OUT(favor);
-		eq->unknown8 = 0;
-		eq->slot = ServerToTitaniumSlot(emu->slot);
-
-		FINISH_ENCODE();
-	}
-
 	ENCODE(OP_Illusion)
 	{
 		ENCODE_LENGTH_EXACT(Illusion_Struct);
@@ -1093,60 +867,11 @@ namespace Titanium

 	ENCODE(OP_LFGuild)
 	{
-		struct bit_mask_conversion {
-			uint32	titanium_mask;
-			uint32	rof2_mask;
-		};
-
-		std::vector<bit_mask_conversion> bit_mask = {
-			{.titanium_mask = 2, .rof2_mask = 256},
-			{.titanium_mask = 4, .rof2_mask = 32768},
-			{.titanium_mask = 8, .rof2_mask = 65536},
-			{.titanium_mask = 16, .rof2_mask = 4},
-			{.titanium_mask = 32, .rof2_mask = 64},
-			{.titanium_mask = 64, .rof2_mask = 16384},
-			{.titanium_mask = 128, .rof2_mask = 8192},
-			{.titanium_mask = 256, .rof2_mask = 128},
-			{.titanium_mask = 512, .rof2_mask = 2048},
-			{.titanium_mask = 1024, .rof2_mask = 8},
-			{.titanium_mask = 2048, .rof2_mask = 16},
-			{.titanium_mask = 4096, .rof2_mask = 512},
-			{.titanium_mask = 8192, .rof2_mask = 32},
-			{.titanium_mask = 16384, .rof2_mask = 1024},
-			{.titanium_mask = 32768, .rof2_mask = 2},
-			{.titanium_mask = 65536, .rof2_mask = 4096},
-		};
-
 		EQApplicationPacket *in = *p;
+		*p = nullptr;

 		uint32 Command = in->ReadUInt32();

-		if (Command == 1) {
-			ENCODE_LENGTH_EXACT(LFGuild_GuildToggle_Struct);
-			SETUP_DIRECT_ENCODE(LFGuild_GuildToggle_Struct, structs::LFGuild_GuildToggle_Struct);
-
-			OUT(Command);
-			OUT_str(Comment);
-			OUT(FromLevel);
-			OUT(ToLevel);
-			OUT(AACount);
-			OUT(TimeZone);
-			OUT(Toggle);
-			OUT(TimePosted);
-			OUT_str(Name);
-
-			uint32 emu_bitmask = emu->Classes;
-			uint32 ti_bitmask = 0;
-			for (auto const& b : bit_mask) {
-				(emu_bitmask & b.rof2_mask) != 0 ? ti_bitmask |= b.titanium_mask : ti_bitmask &= ~b.titanium_mask;
-			}
-			eq->Classes = ti_bitmask;
-
-			FINISH_ENCODE();
-			return;
-		}
-
-		*p = nullptr;
 		if (Command != 0)
 		{
 			dest->FastQueuePacket(&in, ack_req);
@@ -1424,29 +1149,7 @@ namespace Titanium
 		OUT(pvp);
 		OUT(anon);
 		OUT(gm);
-		switch (emu->guildrank) {
-			case GUILD_SENIOR_MEMBER:
-			case GUILD_MEMBER:
-			case GUILD_JUNIOR_MEMBER:
-			case GUILD_INITIATE:
-			case GUILD_RECRUIT: {
-				eq->guildrank = GUILD_MEMBER_TI;
-				break;
-			}
-			case GUILD_OFFICER:
-			case GUILD_SENIOR_OFFICER: {
-				eq->guildrank = GUILD_OFFICER_TI;
-				break;
-			}
-			case GUILD_LEADER: {
-				eq->guildrank = GUILD_LEADER_TI;
-				break;
-			}
-			default: {
-				eq->guildrank = GUILD_RANK_NONE_TI;
-				break;
-			}
-		}
+		OUT(guildrank);
 		OUT(guildbanker);
 		//	OUT(unknown13054[8]);
 		OUT(exp);
@@ -1547,7 +1250,7 @@ namespace Titanium
 	{
 		ENCODE_LENGTH_EXACT(MarkNPC_Struct);
 		SETUP_DIRECT_ENCODE(MarkNPC_Struct, MarkNPC_Struct);
-
+	
 		EQApplicationPacket* outapp = new EQApplicationPacket(OP_MarkNPC, sizeof(MarkNPC_Struct));
 		MarkNPC_Struct* mnpcs = (MarkNPC_Struct*)outapp->pBuffer;
 		mnpcs->TargetID = emu->TargetID;
@@ -1564,10 +1267,10 @@ namespace Titanium
 		*p = nullptr;
 		unsigned char* __emu_buffer = inapp->pBuffer;
 		RaidGeneral_Struct* raid_gen = (RaidGeneral_Struct*)__emu_buffer;
-
+		
 		switch (raid_gen->action)
 		{
-		case raidAdd:
+		case raidAdd: 
 		{
 			RaidAddMember_Struct* emu = (RaidAddMember_Struct*)__emu_buffer;

@@ -1637,7 +1340,7 @@ namespace Titanium
 			dest->QueuePacket(inapp);
 			break;
 		}
-		default:
+		default: 
 		{
 			RaidGeneral_Struct* emu = (RaidGeneral_Struct*)__emu_buffer;

@@ -1880,19 +1583,6 @@ namespace Titanium
 		FINISH_ENCODE();
 	}

-	ENCODE(OP_ShopRequest)
-	{
-		ENCODE_LENGTH_EXACT(MerchantClick_Struct);
-		SETUP_DIRECT_ENCODE(MerchantClick_Struct, structs::MerchantClick_Struct);
-
-		OUT(npc_id);
-		OUT(player_id);
-		OUT(command);
-		OUT(rate);
-
-		FINISH_ENCODE();
-	}
-
 	ENCODE(OP_SpecialMesg)
 	{
 		EQApplicationPacket *in = *p;
@@ -2174,28 +1864,7 @@ namespace Titanium
 			eq->beard = emu->beard;
 			strcpy(eq->suffix, emu->suffix);
 			eq->petOwnerId = emu->petOwnerId;
-			switch (emu->guildrank) {
-				case GUILD_SENIOR_MEMBER:
-				case GUILD_MEMBER:
-				case GUILD_JUNIOR_MEMBER:
-				case GUILD_INITIATE:
-				case GUILD_RECRUIT: {
-					eq->guildrank = GUILD_MEMBER_TI;
-					break;
-				}
-				case GUILD_OFFICER:
-				case GUILD_SENIOR_OFFICER: {
-					eq->guildrank = GUILD_OFFICER_TI;
-					break;
-				}
-				case GUILD_LEADER: {
-					eq->guildrank = GUILD_LEADER_TI;
-					break;
-				}
-				default: {
-					break;
-				}
-			}
+			eq->guildrank = emu->guildrank;
 			//		eq->unknown0194[3] = emu->unknown0194[3];
 			for (k = EQ::textures::textureBegin; k < EQ::textures::materialCount; k++) {
 				eq->equipment.Slot[k].Material = emu->equipment.Slot[k].Material;
@@ -2536,34 +2205,6 @@ namespace Titanium
 		FINISH_DIRECT_DECODE();
 	}

-	DECODE(OP_GuildDemote)
-	{
-		DECODE_LENGTH_EXACT(structs::GuildDemoteStruct);
-		SETUP_DIRECT_DECODE(GuildDemoteStruct, structs::GuildDemoteStruct);
-
-		memcpy(emu->name, eq->name, sizeof(emu->name));
-		memcpy(emu->target, eq->target, sizeof(emu->target));
-		emu->rank = GUILD_MEMBER;
-
-		FINISH_DIRECT_DECODE();
-	}
-
-	DECODE(OP_GuildTributeDonateItem)
-	{
-		DECODE_LENGTH_EXACT(structs::GuildTributeDonateItemRequest_Struct);
-		SETUP_DIRECT_DECODE(GuildTributeDonateItemRequest_Struct, structs::GuildTributeDonateItemRequest_Struct);
-
-		Log(Logs::Detail, Logs::Netcode, "UF::DECODE(OP_GuildTributeDonateItem)");
-
-		IN(quantity);
-		IN(tribute_master_id);
-		IN(guild_id);
-
-		emu->slot = TitaniumToServerSlot(eq->slot);
-
-		FINISH_DIRECT_DECODE();
-	}
-
 	DECODE(OP_InspectAnswer)
 	{
 		DECODE_LENGTH_EXACT(structs::InspectResponse_Struct);
@@ -2619,77 +2260,8 @@ namespace Titanium

 	DECODE(OP_LFGuild)
 	{
-		struct bit_mask_conversion {
-			uint32	titanium_mask;
-			uint32	rof2_mask;
-		};
-
-		std::vector<bit_mask_conversion> bit_mask = {
-			{.titanium_mask = 2, .rof2_mask = 256},
-			{.titanium_mask = 4, .rof2_mask = 32768},
-			{.titanium_mask = 8, .rof2_mask = 65536},
-			{.titanium_mask = 16, .rof2_mask = 4},
-			{.titanium_mask = 32, .rof2_mask = 64},
-			{.titanium_mask = 64, .rof2_mask = 16384},
-			{.titanium_mask = 128, .rof2_mask = 8192},
-			{.titanium_mask = 256, .rof2_mask = 128},
-			{.titanium_mask = 512, .rof2_mask = 2048},
-			{.titanium_mask = 1024, .rof2_mask = 8},
-			{.titanium_mask = 2048, .rof2_mask = 16},
-			{.titanium_mask = 4096, .rof2_mask = 512},
-			{.titanium_mask = 8192, .rof2_mask = 32},
-			{.titanium_mask = 16384, .rof2_mask = 1024},
-			{.titanium_mask = 32768, .rof2_mask = 2},
-			{.titanium_mask = 65536, .rof2_mask = 4096},
-		};
-
 		uint32 Command = __packet->ReadUInt32();

-		if (Command == 3) {
-			DECODE_LENGTH_EXACT(structs::LFGuild_SearchPlayer_Struct);
-			SETUP_DIRECT_DECODE(LFGuild_SearchPlayer_Struct, structs::LFGuild_SearchPlayer_Struct);
-
-			IN(Command);
-			IN(Unknown04);
-			IN(FromLevel);
-			IN(ToLevel);
-			IN(MinAA);
-			IN(TimeZone);
-
-			uint32 new_bitmask = 0;
-			uint32 ti_bitmask = eq->Classes;
-			for (auto const& b : bit_mask) {
-				(ti_bitmask & b.titanium_mask) != 0 ? new_bitmask |= b.rof2_mask : new_bitmask &= ~b.rof2_mask;
-			}
-			emu->Classes = new_bitmask;
-			FINISH_DIRECT_DECODE();
-			return;
-		}
-
-		if (Command == 1) {
-			DECODE_LENGTH_EXACT(structs::LFGuild_GuildToggle_Struct);
-			SETUP_DIRECT_DECODE(LFGuild_GuildToggle_Struct, structs::LFGuild_GuildToggle_Struct);
-
-			IN(Command);
-			IN_str(Comment);
-			IN(FromLevel);
-			IN(ToLevel);
-			IN(AACount);
-			IN(TimeZone);
-			IN(Toggle);
-			IN(TimePosted);
-			IN_str(Name);
-
-			uint32 new_bitmask = 0;
-			uint32 ti_bitmask = eq->Classes;
-			for (auto const& b : bit_mask) {
-				(ti_bitmask & b.titanium_mask) != 0 ? new_bitmask |= b.rof2_mask : new_bitmask &= ~b.rof2_mask;
-			}
-			emu->Classes = new_bitmask;
-			FINISH_DIRECT_DECODE();
-			return;
-		}
-
 		if (Command != 0)
 			return;

@@ -2829,7 +2401,7 @@ namespace Titanium
 			IN(general.parameter);
 			IN_str(general.leader_name);
 			IN_str(general.player_name);
-
+			
 			auto len = 0;
 			if (__packet->size < sizeof(structs::RaidMOTD_Struct)) {
 				len = __packet->size - sizeof(structs::RaidGeneral_Struct);
@@ -2837,8 +2409,8 @@ namespace Titanium
 			else {
 				len = sizeof(eq->motd);
 			}
-
-			strn0cpy(emu->motd, eq->motd, len > 1024 ? 1024 : len);
+			
+			strn0cpy(emu->motd, eq->motd, len > 1024 ? 1024 : len); 
 			emu->motd[len - 1] = '\0';

 			FINISH_VAR_DECODE();
@@ -2856,7 +2428,7 @@ namespace Titanium

 			FINISH_VAR_DECODE();
 			break;
-		}
+		}		
 		default:
 		{
 			SETUP_DIRECT_DECODE(RaidGeneral_Struct, structs::RaidGeneral_Struct);
@@ -2910,21 +2482,6 @@ namespace Titanium
 		FINISH_DIRECT_DECODE();
 	}

-	DECODE(OP_ShopRequest)
-	{
-		DECODE_LENGTH_EXACT(structs::MerchantClick_Struct);
-		SETUP_DIRECT_DECODE(MerchantClick_Struct, structs::MerchantClick_Struct);
-
-		IN(npc_id);
-		IN(player_id);
-		IN(command);
-		IN(rate);
-		emu->tab_display = 0;
-		emu->unknown020 = 0;
-
-		FINISH_DIRECT_DECODE();
-	}
-
 	DECODE(OP_TraderBuy)
 	{
 		DECODE_LENGTH_EXACT(structs::TraderBuy_Struct);
@@ -287,7 +287,6 @@ namespace Titanium
 		const size_t CHARACTER_CREATION_LIMIT = 8; // Hard-coded in client - DO NOT ALTER

 		const size_t SAY_LINK_BODY_SIZE = 45;
-		const uint32 MAX_GUILD_ID       = 1500;

 	} /*constants*/

@@ -44,14 +44,8 @@ E(OP_DzSetLeaderName)
 E(OP_Emote)
 E(OP_FormattedMessage)
 E(OP_GroundSpawn)
-E(OP_SetGuildRank)
-E(OP_GuildsList)
 E(OP_GuildMemberLevelUpdate)
 E(OP_GuildMemberList)
-E(OP_GuildMemberAdd)
-E(OP_GuildMemberRankAltBanker)
-E(OP_SendGuildTributes)
-E(OP_GuildTributeDonateItem)
 E(OP_Illusion)
 E(OP_InspectAnswer)
 E(OP_InspectRequest)
@@ -75,8 +69,6 @@ E(OP_SendCharInfo)
 E(OP_SendAATable)
 E(OP_SetFace)
 E(OP_ShopPlayerSell)
-E(OP_ShopRequest)
-E(OP_SpawnAppearance)
 E(OP_SpecialMesg)
 E(OP_TaskDescription)
 E(OP_Track)
@@ -108,11 +100,9 @@ D(OP_DzRemovePlayer)
 D(OP_DzSwapPlayer)
 D(OP_Emote)
 D(OP_FaceChange)
-D(OP_GuildDemote)
 D(OP_InspectAnswer)
 D(OP_InspectRequest)
 D(OP_ItemLinkClick)
-D(OP_GuildTributeDonateItem)
 D(OP_LFGuild)
 D(OP_LoadSpellSet)
 D(OP_LootItem)
@@ -122,7 +112,6 @@ D(OP_RaidInvite)
 D(OP_ReadBook)
 D(OP_SetServerFilter)
 D(OP_ShopPlayerSell)
-D(OP_ShopRequest)
 D(OP_TraderBuy)
 D(OP_TradeSkillCombine)
 D(OP_TributeItem)
@@ -1,5 +1,5 @@
 /*	EQEMu: Everquest Server Emulator
-
+	
 	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)

 	This program is free software; you can redistribute it and/or modify
@@ -1423,23 +1423,6 @@ struct GuildUpdate_Struct {
 	GuildsListEntry_Struct entry;
 };

-struct GuildTributeDonateItemRequest_Struct {
-	/*000*/ uint32 	slot;
-	/*004*/ uint32 	quantity;
-	/*008*/ uint32	tribute_master_id;
-	/*012*/ uint32 	unknown12;
-	/*016*/ uint32	guild_id;
-	/*020*/ uint32 	unknown20;
-	/*024*/ uint32	unknown24;
-};
-
-struct GuildTributeDonateItemReply_Struct {
-	/*000*/ uint32	slot;
-	/*004*/ uint32	quantity;
-	/*008*/ uint32	unknown8;
-	/*012*/	uint32	favor;
-};
-
 /*
 ** Money Loot
 ** Length: 22 Bytes
@@ -1669,9 +1652,9 @@ struct TimeOfDay_Struct {
 };

 // Darvik: shopkeeper structs
-struct MerchantClick_Struct {
-/*000*/ uint32	npc_id;			// Merchant NPC's entity id
-/*004*/ uint32	player_id;
+struct Merchant_Click_Struct {
+/*000*/ uint32	npcid;			// Merchant NPC's entity id
+/*004*/ uint32	playerid;
 /*008*/ uint32	command;		//1=open, 0=cancel/close
 /*012*/ float	rate;			//cost multiplier, dosent work anymore
 };
@@ -2621,7 +2604,7 @@ struct Make_Pet_Struct { //Simple struct for getting pet info
 	uint32 min_dmg;
 	uint32 max_dmg;
 };
-struct GroundSpawn{
+struct Ground_Spawn{
 	float max_x;
 	float max_y;
 	float min_x;
@@ -2633,8 +2616,8 @@ struct GroundSpawn{
 	uint32 max_allowed;
 	uint32 respawntimer;
 };
-struct GroundSpawns {
-	struct GroundSpawn spawn[50]; //Assigned max number to allow
+struct Ground_Spawns {
+	struct Ground_Spawn spawn[50]; //Assigned max number to allow
 };

 //struct PetitionBug_Struct{
@@ -3525,7 +3508,7 @@ struct LFGuild_GuildToggle_Struct
 /*540*/ uint32	TimeZone;
 /*544*/ uint8	Toggle;
 /*545*/ uint8	Unknown545[3];
-/*548*/ uint32	TimePosted;
+/*548*/ uint32	Expires;
 /*552*/ char	Name[64];
 /*616*/
 };
@@ -3716,34 +3699,6 @@ struct SayLinkBodyFrame_Struct {
 /*045*/
 };

-struct GuildSetRank_Struct
-{
-	/*00*/	uint32	unknown00;
-	/*04*/	uint32	unknown04;
-	/*08*/	uint32	rank;
-	/*72*/	char	member_name[64];
-	/*76*/	uint32	banker;
-};
-
-struct GuildMemberAdd_Struct {
-	/*000*/ uint32 guild_id;
-	/*004*/ uint32 unknown04;
-	/*008*/ uint32 level;
-	/*012*/ uint32 class_;
-	/*016*/ uint32 rank_;
-	/*020*/ uint32 zone_id;
-	/*024*/ uint32 last_on;
-	/*028*/ char   player_name[64];
-};
-
-struct GuildMemberRank_Struct {
-	/*000*/ uint32 guild_id;
-	/*004*/ uint32 unknown_004;
-	/*008*/ uint32 rank_;
-	/*012*/ char   player_name[64];
-	/*076*/ uint32 alt_banker; //Banker/Alt bit 00 - none 10 - Alt 11 - Alt and Banker 01 - Banker.  Banker not functional for RoF2+
-};
-
 	}; /*structs*/

 }; /*Titanium*/
@@ -36,7 +36,6 @@
 #include "../classes.h"
 #include "../races.h"
 #include "../raid.h"
-#include "../guilds.h"

 #include <iostream>
 #include <sstream>
@@ -196,7 +195,7 @@ namespace UF
 		unsigned char *emu_buffer = in->pBuffer;
 		uint32 opcode = *((uint32*)emu_buffer);

-		if (opcode == AlternateCurrencyMode::Populate) {
+		if (opcode == 8) {
 			AltCurrencyPopulate_Struct *populate = (AltCurrencyPopulate_Struct*)emu_buffer;

 			auto outapp = new EQApplicationPacket(
@@ -1135,30 +1134,6 @@ namespace UF
 				PutFieldN(level);
 				PutFieldN(banker);
 				PutFieldN(class_);
-				//Translate older ranks to new values* /
-				switch (emu_e->rank) {
-					case GUILD_SENIOR_MEMBER:
-					case GUILD_MEMBER:
-					case GUILD_JUNIOR_MEMBER:
-					case GUILD_INITIATE:
-					case GUILD_RECRUIT: {
-						emu_e->rank = GUILD_MEMBER_TI;
-						break;
-					}
-					case GUILD_OFFICER:
-					case GUILD_SENIOR_OFFICER: {
-						emu_e->rank = GUILD_OFFICER_TI;
-						break;
-					}
-					case GUILD_LEADER: {
-						emu_e->rank = GUILD_LEADER_TI;
-						break;
-					}
-					default: {
-						emu_e->rank = GUILD_RANK_NONE_TI;
-						break;
-					}
-				}
 				PutFieldN(rank);
 				PutFieldN(time_last_on);
 				PutFieldN(tribute_enable);
@@ -1182,142 +1157,53 @@ namespace UF

 	ENCODE(OP_GuildsList)
 	{
-		EQApplicationPacket* in = *p;
+		EQApplicationPacket *in = *p;
 		*p = nullptr;

-		GuildsListMessaging_Struct   glms{};
-		EQ::Util::MemoryStreamReader ss(reinterpret_cast<char *>(in->pBuffer), in->size);
-		cereal::BinaryInputArchive   ar(ss);
-		ar(glms);
+		uint32 NumberOfGuilds = in->size / 64;
+		uint32 PacketSize = 68;	// 64 x 0x00 + a uint32 that I am guessing is the highest guild ID in use.

-		auto packet_size = 64 + 4 + glms.guild_detail.size() * 4 + glms.string_length;
-		auto buffer      = new uchar[packet_size];
-		auto buf_pos     = buffer;
+		unsigned char *__emu_buffer = in->pBuffer;
+		char *InBuffer = (char *)__emu_buffer;
+		uint32 HighestGuildID = 0;

-		memset(buf_pos, 0, 64);
-		buf_pos += 64;
-
-		VARSTRUCT_ENCODE_TYPE(uint32, buf_pos, glms.no_of_guilds);
-
-		for (auto const& g : glms.guild_detail) {
-			if (g.guild_id < UF::constants::MAX_GUILD_ID) {
-				VARSTRUCT_ENCODE_TYPE(uint32, buf_pos, g.guild_id);
-				strn0cpy((char *) buf_pos, g.guild_name.c_str(), g.guild_name.length() + 1);
-				buf_pos += g.guild_name.length() + 1;
+		for (unsigned int i = 0; i < NumberOfGuilds; ++i)
+		{
+			if (InBuffer[0])
+			{
+				PacketSize += (5 + strlen(InBuffer));
+				HighestGuildID = i - 1;
 			}
+			InBuffer += 64;
 		}

-		auto outapp = new EQApplicationPacket(OP_GuildsList);
+		PacketSize++;	// Appears to be an extra 0x00 at the very end.
+		in->size = PacketSize;
+		in->pBuffer = new unsigned char[in->size];
+		InBuffer = (char *)__emu_buffer;
+		char *OutBuffer = (char *)in->pBuffer;

-		outapp->size    = packet_size;
-		outapp->pBuffer = buffer;
+		// Init the first 64 bytes to zero, as per live.
+		//
+		memset(OutBuffer, 0, 64);
+		OutBuffer += 64;

-		dest->FastQueuePacket(&outapp);
-	}
+		VARSTRUCT_ENCODE_TYPE(uint32, OutBuffer, HighestGuildID);

-	ENCODE(OP_GuildMemberAdd)
-	{
-		ENCODE_LENGTH_EXACT(GuildMemberAdd_Struct)
-		SETUP_DIRECT_ENCODE(GuildMemberAdd_Struct, structs::GuildMemberAdd_Struct)
-
-		OUT(guild_id)
-		OUT(level)
-		OUT(class_)
-		switch (emu->rank_) {
-			case GUILD_SENIOR_MEMBER:
-			case GUILD_MEMBER:
-			case GUILD_JUNIOR_MEMBER:
-			case GUILD_INITIATE:
-			case GUILD_RECRUIT: {
-				eq->rank_ = GUILD_MEMBER_TI;
-				break;
-			}
-			case GUILD_OFFICER:
-			case GUILD_SENIOR_OFFICER: {
-				eq->rank_ = GUILD_OFFICER_TI;
-				break;
-			}
-			case GUILD_LEADER: {
-				eq->rank_ = GUILD_LEADER_TI;
-				break;
-			}
-			default: {
-				eq->rank_ = GUILD_RANK_NONE_TI;
-				break;
+		for (unsigned int i = 0; i < NumberOfGuilds; ++i)
+		{
+			if (InBuffer[0])
+			{
+				VARSTRUCT_ENCODE_TYPE(uint32, OutBuffer, i - 1);
+				VARSTRUCT_ENCODE_STRING(OutBuffer, InBuffer);
 			}
+			InBuffer += 64;
 		}
-		OUT(zone_id)
-		OUT(last_on)
-		OUT_str(player_name)

-		FINISH_ENCODE()
-	}
+		VARSTRUCT_ENCODE_TYPE(uint8, OutBuffer, 0x00);

-	ENCODE(OP_GuildMemberRankAltBanker)
-	{
-		ENCODE_LENGTH_EXACT(GuildMemberRank_Struct)
-		SETUP_DIRECT_ENCODE(GuildMemberRank_Struct, structs::GuildMemberRank_Struct)
-
-		OUT(guild_id)
-		OUT(alt_banker)
-		OUT_str(player_name)
-
-		switch (emu->rank_) {
-			case GUILD_SENIOR_MEMBER:
-			case GUILD_MEMBER:
-			case GUILD_JUNIOR_MEMBER:
-			case GUILD_INITIATE:
-			case GUILD_RECRUIT: {
-				eq->rank_ = GUILD_MEMBER_TI;
-				break;
-			}
-			case GUILD_OFFICER:
-			case GUILD_SENIOR_OFFICER: {
-				eq->rank_ = GUILD_OFFICER_TI;
-				break;
-			}
-			case GUILD_LEADER: {
-				eq->rank_ = GUILD_LEADER_TI;
-				break;
-			}
-			default: {
-				eq->rank_ = GUILD_RANK_NONE_TI;
-				break;
-			}
-		}
-		FINISH_ENCODE()
-	}
-
-	ENCODE(OP_SendGuildTributes)
-	{
-		ENCODE_LENGTH_ATLEAST(structs::GuildTributeAbility_Struct)
-		SETUP_VAR_ENCODE(GuildTributeAbility_Struct)
-		ALLOC_VAR_ENCODE(structs::GuildTributeAbility_Struct, sizeof(GuildTributeAbility_Struct) + strlen(emu->ability.name))
-
-		eq->guild_id           = emu->guild_id;
-		eq->ability.tribute_id = emu->ability.tribute_id;
-		eq->ability.tier_count = emu->ability.tier_count;
-		strncpy(eq->ability.name, emu->ability.name, strlen(emu->ability.name));
-		for (int i = 0; i < ntohl(emu->ability.tier_count); i++) {
-			eq->ability.tiers[i].cost            = emu->ability.tiers[i].cost;
-			eq->ability.tiers[i].level           = emu->ability.tiers[i].level;
-			eq->ability.tiers[i].tribute_item_id = emu->ability.tiers[i].tribute_item_id;
-		}
-		FINISH_ENCODE()
-	}
-
-	ENCODE(OP_GuildTributeDonateItem)
-	{
-		SETUP_DIRECT_ENCODE(GuildTributeDonateItemReply_Struct, structs::GuildTributeDonateItemReply_Struct);
-
-		Log(Logs::Detail, Logs::Netcode, "UF::ENCODE(OP_GuildTributeDonateItem)");
-
-		OUT(quantity)
-		OUT(favor)
-		eq->unknown8 = 0;
-		eq->slot     = ServerToUFSlot(emu->slot);
-
-		FINISH_ENCODE()
+		delete[] __emu_buffer;
+		dest->FastQueuePacket(&in, ack_req);
 	}

 	ENCODE(OP_Illusion)
@@ -1943,30 +1829,6 @@ namespace UF
 		OUT(pvp);
 		OUT(anon);
 		OUT(gm);
-		//Translate older ranks to new values* /
-		switch (emu->guildrank) {
-			case GUILD_SENIOR_MEMBER:
-			case GUILD_MEMBER:
-			case GUILD_JUNIOR_MEMBER:
-			case GUILD_INITIATE:
-			case GUILD_RECRUIT: {
-				emu->guildrank = GUILD_MEMBER_TI;
-				break;
-			}
-			case GUILD_OFFICER:
-			case GUILD_SENIOR_OFFICER: {
-				emu->guildrank = GUILD_OFFICER_TI;
-				break;
-			}
-			case GUILD_LEADER: {
-				emu->guildrank = GUILD_LEADER_TI;
-				break;
-			}
-			default: {
-				emu->guildrank = GUILD_RANK_NONE_TI;
-				break;
-			}
-		}
 		OUT(guildrank);
 		OUT(guildbanker);
 		//	OUT(unknown13054[12]);
@@ -2438,19 +2300,6 @@ namespace UF
 		FINISH_ENCODE();
 	}

-	ENCODE(OP_ShopRequest)
-	{
-		ENCODE_LENGTH_EXACT(MerchantClick_Struct);
-		SETUP_DIRECT_ENCODE(MerchantClick_Struct, structs::MerchantClick_Struct);
-
-		OUT(npc_id);
-		OUT(player_id);
-		OUT(command);
-		OUT(rate);
-
-		FINISH_ENCODE();
-	}
-
 	ENCODE(OP_SomeItemPacketMaybe)
 	{
 		// This Opcode is not named very well. It is used for the animation of arrows leaving the player's bow
@@ -2483,88 +2332,29 @@ namespace UF

 	ENCODE(OP_SpawnAppearance)
 	{
-		ENCODE_LENGTH_EXACT(SpawnAppearance_Struct);
-		SETUP_DIRECT_ENCODE(SpawnAppearance_Struct, structs::SpawnAppearance_Struct);
+		EQApplicationPacket *in = *p;
+		*p = nullptr;

-		OUT(spawn_id);
-		OUT(type);
-		OUT(parameter);
-		switch (emu->type) {
-			case AppearanceType::GuildRank: {
-				//Translate new ranks to old values* /
-				switch (emu->parameter) {
-					case GUILD_SENIOR_MEMBER:
-					case GUILD_MEMBER:
-					case GUILD_JUNIOR_MEMBER:
-					case GUILD_INITIATE:
-					case GUILD_RECRUIT: {
-						eq->parameter = GUILD_MEMBER_TI;
-						break;
-					}
-					case GUILD_OFFICER:
-					case GUILD_SENIOR_OFFICER: {
-						eq->parameter = GUILD_OFFICER_TI;
-						break;
-					}
-					case GUILD_LEADER: {
-						eq->parameter = GUILD_LEADER_TI;
-						break;
-					}
-					default: {
-						eq->parameter = GUILD_RANK_NONE_TI;
-						break;
-					}
-				}
-				break;
-			}
-			case AppearanceType::GuildShow: {
-				FAIL_ENCODE();
-				return;
-			}
-			default: {
-				break;
-			}
+		unsigned char *emu_buffer = in->pBuffer;
+
+		SpawnAppearance_Struct *sas = (SpawnAppearance_Struct *)emu_buffer;
+
+		if (sas->type != AT_Size)
+		{
+			dest->FastQueuePacket(&in, ack_req);
+			return;
 		}

-		FINISH_ENCODE();
-	}
+		auto outapp = new EQApplicationPacket(OP_ChangeSize, sizeof(ChangeSize_Struct));
+		ChangeSize_Struct *css = (ChangeSize_Struct *)outapp->pBuffer;

-	ENCODE(OP_SetGuildRank)
-	{
-		ENCODE_LENGTH_EXACT(GuildSetRank_Struct);
-		SETUP_DIRECT_ENCODE(GuildSetRank_Struct, structs::GuildSetRank_Struct);
+		css->EntityID = sas->spawn_id;
+		css->Size = (float)sas->parameter;
+		css->Unknown08 = 0;
+		css->Unknown12 = 1.0f;

-		eq->unknown00 = 0;
-		eq->unknown04 = 0;
-
-		switch (emu->rank) {
-			case GUILD_SENIOR_MEMBER:
-			case GUILD_MEMBER:
-			case GUILD_JUNIOR_MEMBER:
-			case GUILD_INITIATE:
-			case GUILD_RECRUIT: {
-				emu->rank = GUILD_MEMBER_TI;
-				break;
-			}
-			case GUILD_OFFICER:
-			case GUILD_SENIOR_OFFICER: {
-				emu->rank = GUILD_OFFICER_TI;
-				break;
-			}
-			case GUILD_LEADER: {
-				emu->rank = GUILD_LEADER_TI;
-				break;
-			}
-			default: {
-				emu->rank = GUILD_RANK_NONE_TI;
-				break;
-			}
-		}
-
-		memcpy(eq->member_name, emu->member_name, sizeof(eq->member_name));
-		OUT(banker);
-
-		FINISH_ENCODE();
+		dest->FastQueuePacket(&outapp, ack_req);
+		delete in;
 	}

 	ENCODE(OP_SpawnDoor)
@@ -2989,8 +2779,8 @@ namespace UF
 			}

 			float SpawnSize = emu->size;
-			if (!((emu->NPC == 0) || (emu->race <= Race::Gnome) || (emu->race == Race::Iksar) ||
-					(emu->race == Race::VahShir) || (emu->race == Race::Froglok2) || (emu->race == Race::Drakkin))
+			if (!((emu->NPC == 0) || (emu->race <= RACE_GNOME_12) || (emu->race == RACE_IKSAR_128) ||
+					(emu->race == RACE_VAH_SHIR_130) || (emu->race == RACE_FROGLOK_330) || (emu->race == RACE_DRAKKIN_522))
 				)
 			{
 				PacketSize -= (sizeof(structs::Texture_Struct) * EQ::textures::materialCount);
@@ -3155,30 +2945,6 @@ namespace UF
 			else
 			{
 				VARSTRUCT_ENCODE_TYPE(uint32, Buffer, emu->guildID);
-				//Translate older ranks to new values* /
-				switch (emu->guildrank) {
-					case GUILD_SENIOR_MEMBER:
-					case GUILD_MEMBER:
-					case GUILD_JUNIOR_MEMBER:
-					case GUILD_INITIATE:
-					case GUILD_RECRUIT: {
-						emu->guildrank = GUILD_MEMBER_TI;
-						break;
-					}
-					case GUILD_OFFICER:
-					case GUILD_SENIOR_OFFICER: {
-						emu->guildrank = GUILD_OFFICER_TI;
-						break;
-					}
-					case GUILD_LEADER: {
-						emu->guildrank = GUILD_LEADER_TI;
-						break;
-					}
-					default: {
-						emu->guildrank = GUILD_RANK_NONE_TI;
-						break;
-					}
-				}
 				VARSTRUCT_ENCODE_TYPE(uint32, Buffer, emu->guildrank);
 			}
 			VARSTRUCT_ENCODE_TYPE(uint8, Buffer, emu->class_);
@@ -3216,8 +2982,8 @@ namespace UF

 			Buffer += sizeof(structs::Spawn_Struct_Position);

-			if ((emu->NPC == 0) || (emu->race <= Race::Gnome) || (emu->race == Race::Iksar) ||
-					(emu->race == Race::VahShir) || (emu->race == Race::Froglok2) || (emu->race == Race::Drakkin)
+			if ((emu->NPC == 0) || (emu->race <= RACE_GNOME_12) || (emu->race == RACE_IKSAR_128) ||
+					(emu->race == RACE_VAH_SHIR_130) || (emu->race == RACE_FROGLOK_330) || (emu->race == RACE_DRAKKIN_522)
 				)
 			{
 				for (k = EQ::textures::textureBegin; k < EQ::textures::materialCount; ++k)
@@ -3252,8 +3018,8 @@ namespace UF
 				VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 0);
 			}

-			if ((emu->NPC == 0) || (emu->race <= Race::Gnome) || (emu->race == Race::Iksar) ||
-					(emu->race == Race::VahShir) || (emu->race == Race::Froglok2) || (emu->race == Race::Drakkin)
+			if ((emu->NPC == 0) || (emu->race <= RACE_GNOME_12) || (emu->race == RACE_IKSAR_128) ||
+					(emu->race == RACE_VAH_SHIR_130) || (emu->race == RACE_FROGLOK_330) || (emu->race == RACE_DRAKKIN_522)
 				)
 			{
 				structs::Texture_Struct *Equipment = (structs::Texture_Struct *)Buffer;
@@ -3811,34 +3577,6 @@ namespace UF
 		DECODE_FORWARD(OP_GroupInvite);
 	}

-	DECODE(OP_GuildDemote)
-	{
-		DECODE_LENGTH_EXACT(structs::GuildDemoteStruct);
-		SETUP_DIRECT_DECODE(GuildDemoteStruct, structs::GuildDemoteStruct);
-
-		memcpy(emu->name, eq->name, sizeof(emu->name));
-		memcpy(emu->target, eq->target, sizeof(emu->target));
-		emu->rank = GUILD_MEMBER;
-
-		FINISH_DIRECT_DECODE();
-	}
-
-	DECODE(OP_GuildTributeDonateItem)
-	{
-		DECODE_LENGTH_EXACT(structs::GuildTributeDonateItemRequest_Struct);
-		SETUP_DIRECT_DECODE(GuildTributeDonateItemRequest_Struct, structs::GuildTributeDonateItemRequest_Struct);
-
-		Log(Logs::Detail, Logs::Netcode, "UF::DECODE(OP_GuildTributeDonateItem)");
-
-		IN(quantity);
-		IN(tribute_master_id);
-		IN(guild_id);
-
-		emu->slot = UFToServerSlot(eq->slot);
-
-		FINISH_DIRECT_DECODE();
-	}
-
 	DECODE(OP_InspectRequest)
 	{
 		DECODE_LENGTH_EXACT(structs::Inspect_Struct);
@@ -4044,21 +3782,6 @@ namespace UF
 		FINISH_DIRECT_DECODE();
 	}

-	DECODE(OP_ShopRequest)
-	{
-		DECODE_LENGTH_EXACT(structs::MerchantClick_Struct);
-		SETUP_DIRECT_DECODE(MerchantClick_Struct, structs::MerchantClick_Struct);
-
-		IN(npc_id);
-		IN(player_id);
-		IN(command);
-		IN(rate);
-		emu->tab_display = 0;
-		emu->unknown020 = 0;
-
-		FINISH_DIRECT_DECODE();
-	}
-
 	DECODE(OP_TraderBuy)
 	{
 		DECODE_LENGTH_EXACT(structs::TraderBuy_Struct);
@@ -289,7 +289,6 @@ namespace UF
 		const size_t CHARACTER_CREATION_LIMIT = 12;

 		const size_t SAY_LINK_BODY_SIZE = 50;
-		const uint32 MAX_GUILD_ID       = 50000;

 	} /*constants*/

@@ -58,10 +58,6 @@ E(OP_GroupInvite)
 E(OP_GroupUpdate)
 E(OP_GuildMemberList)
 E(OP_GuildsList)
-E(OP_GuildMemberAdd)
-E(OP_SendGuildTributes)
-E(OP_GuildMemberRankAltBanker)
-E(OP_GuildTributeDonateItem)
 E(OP_Illusion)
 E(OP_InspectBuffs)
 E(OP_InspectRequest)
@@ -86,10 +82,8 @@ E(OP_RespondAA)
 E(OP_SendAATable)
 E(OP_SendCharInfo)
 E(OP_SendZonepoints)
-E(OP_SetGuildRank)
 E(OP_ShopPlayerBuy)
 E(OP_ShopPlayerSell)
-E(OP_ShopRequest)
 E(OP_SomeItemPacketMaybe)
 E(OP_SpawnAppearance)
 E(OP_SpawnDoor)
@@ -144,8 +138,6 @@ D(OP_GroupFollow)
 D(OP_GroupFollow2)
 D(OP_GroupInvite)
 D(OP_GroupInvite2)
-D(OP_GuildDemote)
-D(OP_GuildTributeDonateItem)
 D(OP_InspectRequest)
 D(OP_ItemLinkClick)
 D(OP_ItemVerifyRequest)
@@ -159,7 +151,6 @@ D(OP_Save)
 D(OP_SetServerFilter)
 D(OP_ShopPlayerBuy)
 D(OP_ShopPlayerSell)
-D(OP_ShopRequest)
 D(OP_TraderBuy)
 D(OP_TradeSkillCombine)
 D(OP_TributeItem)
@@ -1670,15 +1670,6 @@ struct Surname_Struct
 /*0100*/
 };

-struct GuildSetRank_Struct
-{
-	/*00*/	uint32	unknown00;
-	/*04*/	uint32	unknown04;
-	/*08*/	uint32	rank;
-	/*72*/	char	member_name[64];
-	/*76*/	uint32	banker;
-};
-
 struct GuildsListEntry_Struct {
 	char name[64];
 };
@@ -1694,27 +1685,6 @@ struct GuildUpdate_Struct {
 	GuildsListEntry_Struct entry;
 };

-struct GuildMemberAdd_Struct {
-	/*000*/ uint32 guild_id;
-	/*004*/ uint32 unknown04;
-	/*008*/ uint32 unknown08;
-	/*012*/ uint32 unknown12;
-	/*016*/ uint32 level;
-	/*020*/ uint32 class_;
-	/*024*/ uint32 rank_;
-	/*028*/ uint32 zone_id;
-	/*032*/ uint32 last_on;
-	/*036*/ char   player_name[64];
-};
-
-struct GuildMemberRank_Struct {
-	/*000*/ uint32 guild_id;
-	/*004*/ uint32 unknown_004;
-	/*008*/ uint32 rank_;
-	/*012*/ char   player_name[64];
-	/*076*/ uint32 alt_banker; //Banker/Alt bit 00 - none 10 - Alt 11 - Alt and Banker 01 - Banker.  Banker not functional for RoF2+
-};
-
 /*
 ** Money Loot
 ** Length: 22 Bytes
@@ -1916,9 +1886,9 @@ struct TimeOfDay_Struct {
 };

 // Darvik: shopkeeper structs
-struct MerchantClick_Struct {
-/*000*/ uint32	npc_id;			// Merchant NPC's entity id
-/*004*/ uint32	player_id;
+struct Merchant_Click_Struct {
+/*000*/ uint32	npcid;			// Merchant NPC's entity id
+/*004*/ uint32	playerid;
 /*008*/ uint32	command;		//1=open, 0=cancel/close
 /*012*/ float	rate;			//cost multiplier, dosent work anymore
 };
@@ -3097,23 +3067,6 @@ struct GuildMakeLeader{
 	char	target[64];
 };

-struct GuildTributeDonateItemRequest_Struct {
-/*000*/ uint32 	slot;
-/*004*/ uint32 	quantity;
-/*008*/ uint32	tribute_master_id;
-/*012*/ uint32 	unknown12;
-/*016*/ uint32	guild_id;
-/*020*/ uint32 	unknown20;
-/*024*/ uint32	unknown24;
-};
-
-struct GuildTributeDonateItemReply_Struct {
-/*000*/ uint32	slot;
-/*004*/ uint32	quantity;
-/*008*/ uint32	unknown8;
-/*012*/	uint32	favor;
-};
-
 struct Make_Pet_Struct { //Simple struct for getting pet info
 	uint8 level;
 	uint8 class_;
@@ -3125,7 +3078,7 @@ struct Make_Pet_Struct { //Simple struct for getting pet info
 	uint32 min_dmg;
 	uint32 max_dmg;
 };
-struct GroundSpawn{
+struct Ground_Spawn{
 	float max_x;
 	float max_y;
 	float min_x;
@@ -3137,8 +3090,8 @@ struct GroundSpawn{
 	uint32 max_allowed;
 	uint32 respawntimer;
 };
-struct GroundSpawns {
-	struct GroundSpawn spawn[50]; //Assigned max number to allow
+struct Ground_Spawns {
+	struct Ground_Spawn spawn[50]; //Assigned max number to allow
 };

 //struct PetitionBug_Struct{
@@ -27,8 +27,3 @@

 // fmt
 #include <fmt/format.h>
-
-// lua
-#include "lua.hpp"
-#include <luabind/luabind.hpp>
-#include <luabind/object.hpp>
@@ -1,17 +1,17 @@
 /*	EQEMu: Everquest Server Emulator
-	
+
 	Copyright (C) 2001-2019 EQEMu Development Team (http://eqemulator.net)

 	This program is free software; you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
 	the Free Software Foundation; version 2 of the License.
-	
+
 	This program is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY except by those people which sell it, which
 	are required to give you total support for your newly bought product;
 	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
 	A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-	
+
 	You should have received a copy of the GNU General Public License
 	along with this program; if not, write to the Free Software
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
@@ -22,7 +22,7 @@

 #include <string>
 #include <list>
-#include <fmt/format.h>
+#include <fmt/core.h>


 class DBcore;
@@ -37,7 +37,7 @@ namespace EQ

 		static bool AddProfanity(DBcore *db, std::string profanity);
 		static bool RemoveProfanity(DBcore *db, std::string profanity);
-		
+
 		static void RedactMessage(char *message);
 		static void RedactMessage(std::string &message);

@@ -54,7 +54,7 @@ namespace EQ
 		static bool load_database_entries(DBcore *db);
 		static bool clear_database_entries(DBcore *db);
 		static bool check_for_existing_entry(const std::string& profanity);
-		
+
 	};

 } /*EQEmu*/
@@ -44,10 +44,9 @@ enum : int {	//values for pTimerType
 	pTimerBeggingPickPocket = 27,
 	pTimerLinkedSpellReuseStart = 28,
 	pTimerLinkedSpellReuseEnd = 48,
-	pTimerClearXTarget = 50,
-
-	pTimerShieldAbility = 86,

+	pTimerShieldAbility = 86,	
+	
 	pTimerLayHands = 87,		//these IDs are used by client too
 	pTimerHarmTouch = 89,		//so dont change them

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Akkadius	c0a88de4fb	pch	2023-12-16 21:03:58 -06:00
Akkadius	5117843089	Incremental	2023-12-16 19:44:33 -06:00
Akkadius	77c7ea191a	Win gate	2023-12-16 19:36:42 -06:00
Akkadius	527798db92	Pull out includes in common	2023-12-16 19:28:55 -06:00
Akkadius	3ea644b732	Remove header only	2023-12-16 19:23:08 -06:00
Akkadius	3850343254	Update eqemu_logsys.h	2023-12-16 19:15:06 -06:00
Akkadius	77597c7868	!!!!!	2023-12-16 19:03:39 -06:00
Akkadius	8a0ef65373	WHAT	2023-12-16 18:59:11 -06:00
Akkadius	75d9e6ffaf	FMT test	2023-12-16 18:54:25 -06:00
Akkadius	e9ca2b4202	Without lua ?	2023-12-16 18:42:11 -06:00
Akkadius	a29a2321f1	Without fmt ?	2023-12-16 18:33:15 -06:00
Akkadius	5ff9407e26	Test	2023-12-16 18:13:43 -06:00
Akkadius	20e135fbc4	PCH main zone primitives	2023-12-16 18:05:20 -06:00
Akkadius	e21c386bda	Lua headers	2023-12-16 18:00:04 -06:00
Akkadius	73a85135b2	Another one	2023-12-16 17:55:02 -06:00
Akkadius	87b1dc4b03	Another one	2023-12-16 17:48:22 -06:00
Akkadius	b2bf1d2b6f	Different test	2023-12-16 17:37:58 -06:00
Akkadius	4a8b89f93a	GCC test	2023-12-16 17:28:31 -06:00
Akkadius	1cccca45a0	Another run	2023-12-16 17:18:54 -06:00
Akkadius	8af4fb2330	Experiment with PCH	2023-12-16 17:11:23 -06:00