[Hotfix] Adjust return for perl release check

* Add RoF2 Bazaar Support

Enable RoF2 bazaar features

* Add augments to Trader Items

* Cleanup

Cleanup of formatting and unused functions

* Update PlayerProfile for correct char_id in trader transactions.  Further cleanup.

* Add parcel delivery price functionality

Add parcel delivery price functionality via rules and new delivery cost struct.

* Add RoF support for bazaar window outside of bazaar with parcel delivery

* Further Testing and ActiveTransaction added

Further testing and a few fixes and messages added.  Add active transaction check to ensure two clients cannot purchase from the bazaar window at the same time

* Cleanup and Formatting updates

Cleanup and Formatting updates

* Update database manifest for the trader table against default peq trader table

* Logs and formatting

* Update bazaarsearch to be content_db aware

* Fix crash

* Simplify search

* Search fixes

* Push up more search logging

* More search fixes

* Formatting

* Update trader_repository.h

* Add Rule for Bazaar Parcel Delivery

Add a rule Bazaar:EnableParcelDelivery to enable/disable bazaar parcel delivery.  Default is True.

* Fix crash

* Update Bazaar Search

Adds/Tested bazaar search with move to content_db
- race, class, money, number of returned items, stats, name, slot, level, traders, local traders, specific trader.
Outstanding
- type, more stats to add (heroic, etc)

* Formatting

* Push

* Update bazaarsearch to include all stats that are available in RoF2

* Update BazaarSearch

Updates the bazaar search for item types.  They should be working as per RoF2+ types.

* Formatting

* Final updates to BazaarSearch

Add search by augmentation slots available on the item.
This enables all but Prestige, which I believe are not implemented yet.

* Add Titanium functionality correct ItemType Search

Add Titanium /trader /bazaar functionality.
Added itemtype=armor bazaar search.  It was missed in the search work

* Close off for loops

---------

Co-authored-by: Akkadius <akkadius1@gmail.com>

.devcontainer/.gitignore

@@ -0,0 +1,6 @@
+!Makefile
+base/*.sql
+base/*.zip
+base/db/
+base/maps/
+!base/expansion/Makefile

.devcontainer/Dockerfile.debian.arm64.dev

@@ -0,0 +1,9 @@
+# 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

.devcontainer/Dockerfile.debian.dev

@@ -0,0 +1,9 @@
+# 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

.devcontainer/Makefile

@@ -0,0 +1,284 @@
+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

.devcontainer/base/eqemu_config.json

@@ -0,0 +1,73 @@
+{
+	"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/"
+		}
+	}
+}

.devcontainer/base/login.json

@@ -0,0 +1,37 @@
+{
+	"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"
+	}
+}

.devcontainer/devcontainer.json

@@ -0,0 +1,49 @@
+// 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"
+}

.gitignore

@@ -61,9 +61,6 @@ bin/
 compile_flags.txt
 .cache/
 
-# vscode generated settings
-.vscode/
-
 # Build pipeline
 !utils/scripts/build/
 !utils/scripts/build/should-release/should-release

.vscode/c_cpp_properties.json

@@ -0,0 +1,23 @@
+{
+    "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
+}

.vscode/launch.json

@@ -0,0 +1,173 @@
+{
+	// 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
+				}
+			]
+		}
+	]
+}

.vscode/settings.json

@@ -0,0 +1,136 @@
+{
+	"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",
+		}
+	}
+}

CHANGELOG.md

@@ -1,3 +1,672 @@
+## [22.51.0] 5/26/2024
+
+### Commands
+
+* #npcspawn Changes ([#4311](https://github.com/EQEmu/Server/pull/4311)) @twincannon 2024-05-16
+* Cleanup #resetaa Command ([#4310](https://github.com/EQEmu/Server/pull/4310)) @Kinglykrab 2024-05-22
+
+### Crash
+
+* Add validation to RemoveXTarget ([#4324](https://github.com/EQEmu/Server/pull/4324)) @Akkadius 2024-05-25
+* Fix Zone deconstructor crashes ([#4325](https://github.com/EQEmu/Server/pull/4325)) @Akkadius 2024-05-25
+* Fix crash issue when dividing by zero in CalcHPRegen ([#4320](https://github.com/EQEmu/Server/pull/4320)) @Akkadius 2024-05-25
+* Fix crash when map name is null ([#4322](https://github.com/EQEmu/Server/pull/4322)) @Akkadius 2024-05-25
+* Fix player event crash in ITEM_DESTROY ([#4326](https://github.com/EQEmu/Server/pull/4326)) @Akkadius 2024-05-25
+* Fix player events reload when out of bounds ([#4321](https://github.com/EQEmu/Server/pull/4321)) @Akkadius 2024-05-25
+* Fix rarer crash in EntityList::MobProcess ([#4319](https://github.com/EQEmu/Server/pull/4319)) @Akkadius 2024-05-25
+
+### Feature
+
+* Add RoF2 Bazaar Support ([#4315](https://github.com/EQEmu/Server/pull/4315)) @neckkola 2024-05-26
+* Add SE_IncreaseArchery and rules to tune archery ([#4335](https://github.com/EQEmu/Server/pull/4335)) @fryguy503 2024-05-26
+* Add parcel container support ([#4305](https://github.com/EQEmu/Server/pull/4305)) @neckkola 2024-05-17
+
+### Fixes
+
+* Accuracy, Avoidance and Atk adjustments ([#4336](https://github.com/EQEmu/Server/pull/4336)) @fryguy503 2024-05-26
+* Fix Crash with null Argument in #modifynpcstat ([#4318](https://github.com/EQEmu/Server/pull/4318)) @Kinglykrab 2024-05-24
+* Fix RemoveAlternateCurrencyValue not updating Client ([#4317](https://github.com/EQEmu/Server/pull/4317)) @Kinglykrab 2024-05-23
+* Fix Using Bind Wound Above 70% Health ([#4340](https://github.com/EQEmu/Server/pull/4340)) @Kinglykrab 2024-05-26
+* Fix issue with #hotfix ([#4316](https://github.com/EQEmu/Server/pull/4316)) @Kinglykrab 2024-05-22
+* Fix issue with #suspend ([#4314](https://github.com/EQEmu/Server/pull/4314)) @Kinglykrab 2024-05-23
+* Fix issue with KeepOneRecordPerCompletedTask ([#4313](https://github.com/EQEmu/Server/pull/4313)) @Kinglykrab 2024-05-23
+* Fix mistaken removed RULE_CATEGORY_END() ([#4341](https://github.com/EQEmu/Server/pull/4341)) @fryguy503 2024-05-26
+* Missed a mob offense section for PR #4328 ([#4331](https://github.com/EQEmu/Server/pull/4331)) @fryguy503 2024-05-26
+* Raid Targets should not be Blindable as this will break all spell casting AI. ([#4334](https://github.com/EQEmu/Server/pull/4334)) @fryguy503 2024-05-26
+* When Mounts are allowed to zone, block them from zoning to disallowed zones. ([#4330](https://github.com/EQEmu/Server/pull/4330)) @fryguy503 2024-05-25
+* When refreshing buffs, attempt to use the same buffslot if the buff still exists. ([#4338](https://github.com/EQEmu/Server/pull/4338)) @fryguy503 2024-05-26
+
+### Lua Mod
+
+* Fix issue with SetAAEXP and SetEXP firing when uninitialized ([#4345](https://github.com/EQEmu/Server/pull/4345)) @Akkadius 2024-05-26
+
+### Merchants
+
+* Add New Classic Greed/Faction/Charisma Prices Rule ([#4301](https://github.com/EQEmu/Server/pull/4301)) @noudess 2024-05-17
+
+### Mobs
+
+* Remove entity type checks from ScanCloseMobs ([#4323](https://github.com/EQEmu/Server/pull/4323)) @Akkadius 2024-05-25
+
+### NPC Spells
+
+* Fix an issue where procs wouldn't fire if no spell entries in list ([#4344](https://github.com/EQEmu/Server/pull/4344)) @Akkadius 2024-05-26
+
+### Perl
+
+* Linux /opt/eqemu-perl checks when using release binaries ([#4346](https://github.com/EQEmu/Server/pull/4346)) @Akkadius 2024-05-26
+
+### Quest API
+
+* Add Zone Uptime Exports to Perl/Lua ([#4339](https://github.com/EQEmu/Server/pull/4339)) @Kinglykrab 2024-05-26
+
+### Rules
+
+* Added MeleeMitigation Level Difference Roll Adjusted for level diffs ([#4332](https://github.com/EQEmu/Server/pull/4332)) @fryguy503 2024-05-26
+* Allow maximum per kill AA amount ([#4329](https://github.com/EQEmu/Server/pull/4329)) @fryguy503 2024-05-25
+* Allow servers to adjust the filtering threshold for heals from damage (e.g. Mark of Kings). ([#4327](https://github.com/EQEmu/Server/pull/4327)) @fryguy503 2024-05-25
+* Backstab Haste Correction ([#4337](https://github.com/EQEmu/Server/pull/4337)) @fryguy503 2024-05-26
+* Mob Offensive and Weapon Skill static tables ([#4328](https://github.com/EQEmu/Server/pull/4328)) @fryguy503 2024-05-25
+* Remove hard coded initial aggro in favor or an adjustable Rule ([#4333](https://github.com/EQEmu/Server/pull/4333)) @fryguy503 2024-05-26
+
+### Scripts
+
+* Fix zone data load ordering issue ([#4343](https://github.com/EQEmu/Server/pull/4343)) @Akkadius 2024-05-26
+
+### Spells
+
+* Add content filtering to NPC spells ([#4309](https://github.com/EQEmu/Server/pull/4309)) @Akkadius 2024-05-17
+
+## [22.50.1] 5/12/2024
+
+### Fixes
+
+* Clear GuildOnlineStatus on world boot ([#4306](https://github.com/EQEmu/Server/pull/4306)) @neckkola 2024-05-12
+
+## [22.50.0] 5/9/2024
+
+### Code
+
+* Fix Message in #find task ([#4270](https://github.com/EQEmu/Server/pull/4270)) @Kinglykrab 2024-04-19
+
+### Combat
+
+* Add rule to set stun duration.  Add rule to add stun messages. ([#4284](https://github.com/EQEmu/Server/pull/4284)) @noudess 2024-04-25
+
+### Commands
+
+* Adjust #kill and #list Commands ([#4271](https://github.com/EQEmu/Server/pull/4271)) @Kinglykrab 2024-05-04
+
+### Compiling
+
+* Add profiler flag ([#4293](https://github.com/EQEmu/Server/pull/4293)) @xackery 2024-05-04
+
+### Corpses
+
+* Corpse searches for items did not search augs ([#4289](https://github.com/EQEmu/Server/pull/4289)) @noudess 2024-04-27
+
+### Database
+
+* Add Extra Haste to Bots/Character Tables ([#4286](https://github.com/EQEmu/Server/pull/4286)) @Kinglykrab 2024-05-04
+* Break out changes to `npc_types` from parcels ([#4295](https://github.com/EQEmu/Server/pull/4295)) @joligario 2024-05-03
+* Move pets query to content database ([#4296](https://github.com/EQEmu/Server/pull/4296)) @joligario 2024-05-04
+
+### Doors
+
+* Replace magic # in code with a field in doors table for when door closes. ([#4288](https://github.com/EQEmu/Server/pull/4288)) @noudess 2024-04-25
+
+### Experience
+
+* Add SetExp/SetAAExp lua mods ([#4292](https://github.com/EQEmu/Server/pull/4292)) @xackery 2024-05-04
+
+### Feature
+
+* Add Augmentation Support for Parcels ([#4285](https://github.com/EQEmu/Server/pull/4285)) @neckkola 2024-04-24
+* Add Character Auto Login ([#4216](https://github.com/EQEmu/Server/pull/4216)) @Kinglykrab 2024-04-15
+* Add Parcel Feature for RoF2 Clients ([#4198](https://github.com/EQEmu/Server/pull/4198)) @neckkola 2024-04-21
+* Add `is_parcel_merchant` to #npcedit ([#4290](https://github.com/EQEmu/Server/pull/4290)) @Kinglykrab 2024-05-04
+* Add devcontainer support ([#4294](https://github.com/EQEmu/Server/pull/4294)) @xackery 2024-05-09
+* Fix ignore_default on lua mod damage ([#4228](https://github.com/EQEmu/Server/pull/4228)) @xackery 2024-04-15
+
+### Fixes
+
+* "GM flag" vs "GM Flag"  @Akkadius 2024-05-04
+* All NPC classes could stun with kick/only warriors could be stunned ([#4273](https://github.com/EQEmu/Server/pull/4273)) @noudess 2024-04-24
+* Fix Account Flags Loading ([#4243](https://github.com/EQEmu/Server/pull/4243)) @Kinglykrab 2024-04-15
+* Fix Corpses "Disappearing" ([#4275](https://github.com/EQEmu/Server/pull/4275)) @joligario 2024-04-21
+* Fix Issue With Auto Login ([#4267](https://github.com/EQEmu/Server/pull/4267)) @Kinglykrab 2024-04-21
+* Fix crash from #4266  @Akkadius 2024-05-05
+* Fixes Issue 4257 - Double Taunt Message ([#4258](https://github.com/EQEmu/Server/pull/4258)) @fryguy503 2024-04-18
+* GLAA fix after database.cpp updates ([#4277](https://github.com/EQEmu/Server/pull/4277)) @neckkola 2024-04-21
+* GetSkill default return 0  @Akkadius 2024-05-05
+* Hero forge armor bug on login and show helm toggle. ([#4246](https://github.com/EQEmu/Server/pull/4246)) @noudess 2024-04-15
+* Perl__send_parcel GCC compile error  @Akkadius 2024-05-05
+* Remove food or water GM message  @Akkadius 2024-05-05
+* Revert GetSkill from #4234  @Akkadius 2024-05-05
+* Fix for world crash with over 1500 guilds ([#4299](https://github.com/EQEmu/Server/pull/4299)) @neckkola 2024-05-09
+
+### Hot Fix
+
+* Update database_update_manifest.cpp ([#4291](https://github.com/EQEmu/Server/pull/4291)) @noudess 2024-04-29
+
+### Loot
+
+* Add content filtering to lootdrop_entries ([#4229](https://github.com/EQEmu/Server/pull/4229)) @Akkadius 2024-04-15
+* Consolidate filtering logic ([#4280](https://github.com/EQEmu/Server/pull/4280)) @Akkadius 2024-04-21
+
+### Lua
+
+* Add IsImmuneToSpell Lua Mod ([#4278](https://github.com/EQEmu/Server/pull/4278)) @xackery 2024-04-28
+* Add UpdatePersonalFaction Lua Mod ([#4279](https://github.com/EQEmu/Server/pull/4279)) @xackery 2024-05-04
+
+### Messages
+
+* Add GM Status and Invulnerability Messages ([#4266](https://github.com/EQEmu/Server/pull/4266)) @Kinglykrab 2024-05-04
+* Fix bug where DoT messages stop coming out when mob dies. ([#4249](https://github.com/EQEmu/Server/pull/4249)) @noudess 2024-04-15
+* Fix multiple errors in spell damage at death. ([#4264](https://github.com/EQEmu/Server/pull/4264)) @noudess 2024-04-28
+
+### Performance
+
+* Change skill_cap from vector to map ([#4252](https://github.com/EQEmu/Server/pull/4252)) @xackery 2024-04-15
+
+### Pets
+
+* Fix errors in sync with client of sit/stand ([#4245](https://github.com/EQEmu/Server/pull/4245)) @noudess 2024-04-15
+
+### Quest API
+
+* Add DescribeSpecialAbilities() to Perl/Lua ([#4269](https://github.com/EQEmu/Server/pull/4269)) @Kinglykrab 2024-04-21
+* Add GetConsiderColor() to Perl/Lua ([#4253](https://github.com/EQEmu/Server/pull/4253)) @Kinglykrab 2024-04-15
+* Add Parcel Sending to Perl/Lua ([#4287](https://github.com/EQEmu/Server/pull/4287)) @Kinglykrab 2024-05-04
+* Add Zone Methods to Perl/Lua ([#4268](https://github.com/EQEmu/Server/pull/4268)) @Kinglykrab 2024-04-21
+
+### Quests
+
+* Hot Reload Changes ([#4302](https://github.com/EQEmu/Server/pull/4302)) @Akkadius 2024-05-09
+* Reload Quests on Bootup, Init earlier ([#4298](https://github.com/EQEmu/Server/pull/4298)) @Akkadius 2024-05-05
+
+### Spells
+
+* Implemented SPA 122 SE_ReduceSkill ([#4234](https://github.com/EQEmu/Server/pull/4234)) @KayenEQ 2024-05-04
+* Normal Group Spells (non-raid) landed twice on caster ([#4240](https://github.com/EQEmu/Server/pull/4240)) @noudess 2024-04-15
+* SPA69 TotalHP can be used in Worn Slot, Fixes/Updates to Max HP related variables. ([#4244](https://github.com/EQEmu/Server/pull/4244)) @KayenEQ 2024-04-15
+
+### Zone Instances
+
+* Handle routing to instances when using evac/succor ([#4297](https://github.com/EQEmu/Server/pull/4297)) @joligario 2024-05-04
+
+## [22.49.1] 4/15/2024
+
+### Zoning
+
+* Fix zone routing edge case ([#4255](https://github.com/EQEmu/Server/pull/4255)) @Akkadius 2024-04-15
+
+## [22.49.0] 4/15/2024
+
+### Code
+
+* Avoid unnecessary copies in database functions ([#4220](https://github.com/EQEmu/Server/pull/4220)) @joligario 2024-03-29
+* Reference type in `GetRaidLeaderName` ([#4218](https://github.com/EQEmu/Server/pull/4218)) @joligario 2024-03-28
+* Remove unnecessary reference types ([#4212](https://github.com/EQEmu/Server/pull/4212)) @joligario 2024-03-28
+
+### Crash
+
+* Check mob pointer before trying to remove it ([#4230](https://github.com/EQEmu/Server/pull/4230)) @Akkadius 2024-04-01
+
+### Feature
+
+* Add Character Auto Login ([#4216](https://github.com/EQEmu/Server/pull/4216)) @Kinglykrab 2024-04-15
+* Add LuaMod functions for CommonDamage and HealDamage ([#4227](https://github.com/EQEmu/Server/pull/4227)) @xackery 2024-03-31
+* Add RegisterBug LuaMod ([#4209](https://github.com/EQEmu/Server/pull/4209)) @xackery 2024-03-30
+* Additive Spell Focus from Worn slot with Limit Checks ([#4208](https://github.com/EQEmu/Server/pull/4208)) @KayenEQ 2024-03-30
+* Fix ignore_default on lua mod damage ([#4228](https://github.com/EQEmu/Server/pull/4228)) @xackery 2024-04-15
+
+### Fixes
+
+* Client not updating HP bar when an HP Buff with a Heal is applied. ([#4237](https://github.com/EQEmu/Server/pull/4237)) @KayenEQ 2024-04-02
+* Fix Account Flags Loading ([#4243](https://github.com/EQEmu/Server/pull/4243)) @Kinglykrab 2024-04-15
+* Fix Auto Login Issue ([#4213](https://github.com/EQEmu/Server/pull/4213)) @Kinglykrab 2024-03-28
+* Fix Bot Creation Issue ([#4235](https://github.com/EQEmu/Server/pull/4235)) @Kinglykrab 2024-04-02
+* Fix Bot/Character ID Overlap in Groups ([#4093](https://github.com/EQEmu/Server/pull/4093)) @Kinglykrab 2024-03-23
+* Fix Group Leadership ([#4214](https://github.com/EQEmu/Server/pull/4214)) @Kinglykrab 2024-03-28
+* Fix Issue With Bot Raid Aggro ([#4222](https://github.com/EQEmu/Server/pull/4222)) @Kinglykrab 2024-03-31
+* Fix Lua Crash with Spell Blocked Event ([#4236](https://github.com/EQEmu/Server/pull/4236)) @Kinglykrab 2024-04-01
+* Fix Luabind Double Class Register ([#4219](https://github.com/EQEmu/Server/pull/4219)) @Kinglykrab 2024-03-29
+* Fix crash in SendEnterWorld ([#4204](https://github.com/EQEmu/Server/pull/4204)) @Akkadius 2024-03-24
+* Fix event_consider any_cast error ([#4210](https://github.com/EQEmu/Server/pull/4210)) @xackery 2024-03-27
+* Fix fishing chances ([#4203](https://github.com/EQEmu/Server/pull/4203)) @joligario 2024-03-24
+* Fix manifest for skill caps schema type ([#4231](https://github.com/EQEmu/Server/pull/4231)) @Akkadius 2024-04-02
+* Hero forge armor bug on login and show helm toggle. ([#4246](https://github.com/EQEmu/Server/pull/4246)) @noudess 2024-04-15
+* Radiant/Ebon Crystals should only extract to 1000 ([#4195](https://github.com/EQEmu/Server/pull/4195)) @fryguy503 2024-03-23
+* SPA214 SE_MaxHPChange calculation errors corrected. ([#4238](https://github.com/EQEmu/Server/pull/4238)) @KayenEQ 2024-04-02
+* Shared Tasks - charid is now character_id ([#4233](https://github.com/EQEmu/Server/pull/4233)) @fryguy503 2024-04-01
+* Using %T in channel messages on fresh corpse yields mob, not corpse name. ([#4168](https://github.com/EQEmu/Server/pull/4168)) @noudess 2024-04-05
+
+### Hot Fix
+
+* Fix Group::AddToGroup ([#4201](https://github.com/EQEmu/Server/pull/4201)) @Kinglykrab 2024-03-23
+* Hot Fix for Group::AddToGroup Hot Fix ([#4202](https://github.com/EQEmu/Server/pull/4202)) @Kinglykrab 2024-03-23
+
+### Loot
+
+* Add content filtering to lootdrop_entries ([#4229](https://github.com/EQEmu/Server/pull/4229)) @Akkadius 2024-04-15
+
+### Lua
+
+* Add Zone and Language Constants ([#4211](https://github.com/EQEmu/Server/pull/4211)) @fryguy503 2024-03-28
+
+### Messages
+
+* Fix bug where DoT messages stop coming out when mob dies. ([#4249](https://github.com/EQEmu/Server/pull/4249)) @noudess 2024-04-15
+
+### Performance
+
+* Change skill_cap from vector to map ([#4252](https://github.com/EQEmu/Server/pull/4252)) @xackery 2024-04-15
+
+### Pets
+
+* Fix errors in sync with client of sit/stand ([#4245](https://github.com/EQEmu/Server/pull/4245)) @noudess 2024-04-15
+
+### Quest API
+
+* Add Archetype Methods to Perl/Lua ([#4181](https://github.com/EQEmu/Server/pull/4181)) @Kinglykrab 2024-03-23
+* Add Class/Deity/Race Methods to Perl/Lua ([#4215](https://github.com/EQEmu/Server/pull/4215)) @Kinglykrab 2024-03-28
+* Add GetConsiderColor() to Perl/Lua ([#4253](https://github.com/EQEmu/Server/pull/4253)) @Kinglykrab 2024-04-15
+* Add Spell Blocked Event to Perl/Lua ([#4217](https://github.com/EQEmu/Server/pull/4217)) @Kinglykrab 2024-04-01
+
+### Quests
+
+* Avoid Player and Bot quests in unloaded zone ([#4232](https://github.com/EQEmu/Server/pull/4232)) @hgtw 2024-04-01
+
+### Repositories
+
+* Convert database.cpp to Repositories ([#4054](https://github.com/EQEmu/Server/pull/4054)) @Kinglykrab 2024-03-24
+
+### Skill Caps
+
+* Further improvements ([#4205](https://github.com/EQEmu/Server/pull/4205)) @Akkadius 2024-03-24
+* Remove from shared memory and simplify ([#4069](https://github.com/EQEmu/Server/pull/4069)) @Kinglykrab 2024-03-23
+
+### Spells
+
+* Implemented SPA 463 SE_SHIELD_TARGET ([#4224](https://github.com/EQEmu/Server/pull/4224)) @KayenEQ 2024-03-30
+* Normal Group Spells (non-raid) landed twice on caster ([#4240](https://github.com/EQEmu/Server/pull/4240)) @noudess 2024-04-15
+* SPA148 Stacking Fix ([#4206](https://github.com/EQEmu/Server/pull/4206)) @KayenEQ 2024-03-27
+* SPA69 TotalHP can be used in Worn Slot, Fixes/Updates to Max HP related variables. ([#4244](https://github.com/EQEmu/Server/pull/4244)) @KayenEQ 2024-04-15
+
+## [22.48.0] 3/23/2024
+
+### Bots
+
+* IsValidTarget Crash Fix ([#4187](https://github.com/EQEmu/Server/pull/4187)) @nytmyr 2024-03-12
+* Move BotGroupSay to Pet Response ([#4171](https://github.com/EQEmu/Server/pull/4171)) @nytmyr 2024-03-08
+
+### Code
+
+* Cleanup Zone Get Methods ([#4169](https://github.com/EQEmu/Server/pull/4169)) @Kinglykrab 2024-03-09
+
+### Fixes
+
+* An Update to Xtarget to exclude Bot owned Temp/Swarm Pets ([#4172](https://github.com/EQEmu/Server/pull/4172)) @MortimerGreenwald 2024-03-08
+* Fix #serverrules Command ([#4193](https://github.com/EQEmu/Server/pull/4193)) @Kinglykrab 2024-03-20
+* Fix Bot Cloning ([#4186](https://github.com/EQEmu/Server/pull/4186)) @Kinglykrab 2024-03-17
+* Fix Crash in ClientList::GetCLEIP ([#4173](https://github.com/EQEmu/Server/pull/4173)) @Kinglykrab 2024-03-10
+* Fix Default Value in `rule_values` table ([#4166](https://github.com/EQEmu/Server/pull/4166)) @Kinglykrab 2024-03-07
+* Fix EVENT_KILLED_MERIT firing before NPC removal ([#4185](https://github.com/EQEmu/Server/pull/4185)) @Kinglykrab 2024-03-17
+* Fix Empty Groups When Removing Bots ([#4178](https://github.com/EQEmu/Server/pull/4178)) @Kinglykrab 2024-03-14
+* Fix GetLeaderName() for Groups ([#4184](https://github.com/EQEmu/Server/pull/4184)) @Kinglykrab 2024-03-14
+* Fix Mob::CalculateDistance(mob) Typo ([#4183](https://github.com/EQEmu/Server/pull/4183)) @Kinglykrab 2024-03-10
+* Fix Proximity Say ([#4189](https://github.com/EQEmu/Server/pull/4189)) @Kinglykrab 2024-03-15
+* Fix ScaleNPC() in Perl ([#4196](https://github.com/EQEmu/Server/pull/4196)) @Kinglykrab 2024-03-23
+* Fix range_percent ([#4197](https://github.com/EQEmu/Server/pull/4197)) @Kinglykrab 2024-03-22
+* Fix reusing timers ([#4199](https://github.com/EQEmu/Server/pull/4199)) @joligario 2024-03-23
+
+### Hot Fix
+
+* Add bool return to fix Client::RemoveAAPoints ([#4176](https://github.com/EQEmu/Server/pull/4176)) @Kinglykrab 2024-03-09
+
+### Loot
+
+* Fix issue with nested data being loaded multiple times ([#4192](https://github.com/EQEmu/Server/pull/4192)) @Akkadius 2024-03-23
+
+### Misc
+
+* Windows preprocessor define in crash.cpp ([#4191](https://github.com/EQEmu/Server/pull/4191)) @joligario 2024-03-23
+
+### Quest API
+
+* Add Buff Support to Perl/Lua ([#4182](https://github.com/EQEmu/Server/pull/4182)) @Kinglykrab 2024-03-14
+* Add DeleteBot() to Perl/Lua ([#4167](https://github.com/EQEmu/Server/pull/4167)) @nytmyr 2024-03-07
+* Add GetDeityName() to Perl/Lua ([#4180](https://github.com/EQEmu/Server/pull/4180)) @Kinglykrab 2024-03-14
+* Add RemoveAAPoints() and AA Loss Event to Perl/Lua ([#4174](https://github.com/EQEmu/Server/pull/4174)) @Kinglykrab 2024-03-09
+* Add RemoveAlternateCurrencyValue() to Perl/Lua ([#4190](https://github.com/EQEmu/Server/pull/4190)) @Kinglykrab 2024-03-17
+* Add Restore Methods for Health, Mana, and Endurance to Perl/Lua ([#4179](https://github.com/EQEmu/Server/pull/4179)) @Kinglykrab 2024-03-23
+* Add Silent Saylink Methods to Perl/Lua ([#4177](https://github.com/EQEmu/Server/pull/4177)) @Kinglykrab 2024-03-14
+
+### Rules
+
+* Add World:Rules Rule ([#4194](https://github.com/EQEmu/Server/pull/4194)) @Kinglykrab 2024-03-23
+
+### Tradeskills
+
+* Implement learning recipes from books ([#4170](https://github.com/EQEmu/Server/pull/4170)) @hgtw 2024-03-23
+
+## [22.47.0] 3/5/2024
+
+### Crash Fix
+
+* Added a guild_mgr check ([#4163](https://github.com/EQEmu/Server/pull/4163)) @neckkola 2024-03-06
+* Goto Command could crash using Developer Tools ([#4158](https://github.com/EQEmu/Server/pull/4158)) @neckkola 2024-03-04
+* Groundspawn Memory Corruption ([#4157](https://github.com/EQEmu/Server/pull/4157)) @neckkola 2024-03-04
+* Update to location of qGlobals initialization ([#4144](https://github.com/EQEmu/Server/pull/4144)) @neckkola 2024-03-02
+
+### Feature
+
+* Adds rules to control level requirements for Double Backstab, Assassinate, and Double Bowshot  (#4159) ([#29](https://github.com/EQEmu/Server/pull/29)) @catapultam-habeo 2024-03-04
+* Adjust String-based Rules Length ([#4138](https://github.com/EQEmu/Server/pull/4138)) @Kinglykrab 2024-03-06
+* Exempt a zone from IP-limit checks. ([#4137](https://github.com/EQEmu/Server/pull/4137)) @catapultam-habeo 2024-03-02
+
+### Fixes
+
+* Add id to the guild_bank table ([#4155](https://github.com/EQEmu/Server/pull/4155)) @neckkola 2024-03-05
+* Fix Bots/Bot Pets ending up on XTargets ([#4132](https://github.com/EQEmu/Server/pull/4132)) @Kinglykrab 2024-03-02
+* Fix Character EXP Modifiers default ([#4161](https://github.com/EQEmu/Server/pull/4161)) @Kinglykrab 2024-03-06
+* Fix Spawns Not Parsing Quest on Zone Bootup ([#4149](https://github.com/EQEmu/Server/pull/4149)) @Kinglykrab 2024-03-05
+* Fix typo when updating spawn events in spawn condition manager ([#4160](https://github.com/EQEmu/Server/pull/4160)) @joligario 2024-03-05
+* GetBotNameByID Temporary Reference Warning ([#4145](https://github.com/EQEmu/Server/pull/4145)) @Kinglykrab 2024-03-02
+* Prevent NPE when creating DZ using ad-hoc version IDs ([#4141](https://github.com/EQEmu/Server/pull/4141)) @catapultam-habeo 2024-03-05
+* Update FreeGuildID Routine ([#4143](https://github.com/EQEmu/Server/pull/4143)) @neckkola 2024-03-02
+
+### Quest API
+
+* Add Bot Special Attacks for Immune Aggro/Damage ([#4108](https://github.com/EQEmu/Server/pull/4108)) @Kinglykrab 2024-03-02
+* Add GetHeroicStrikethrough() to Perl/Lua ([#4150](https://github.com/EQEmu/Server/pull/4150)) @Kinglykrab 2024-03-03
+* Add IsAlwaysAggro() to Perl/Lua ([#4152](https://github.com/EQEmu/Server/pull/4152)) @Kinglykrab 2024-03-04
+* Add IsBoat()/IsControllableBoat() to Perl/Lua ([#4151](https://github.com/EQEmu/Server/pull/4151)) @Kinglykrab 2024-03-03
+* Add IsDestructibleObject() to Perl/Lua ([#4153](https://github.com/EQEmu/Server/pull/4153)) @Kinglykrab 2024-03-03
+
+### Zone
+
+* Zone Routing Improvements ([#4142](https://github.com/EQEmu/Server/pull/4142)) @Akkadius 2024-03-02
+
+### Zoning
+
+* Zone routing adjustment ([#4162](https://github.com/EQEmu/Server/pull/4162)) @Akkadius 2024-03-06
+
+## [22.46.1] 3/2/2024
+
+### Fixes
+
+* Change `UnburyCorpse` to use repository methods ([#4147](https://github.com/EQEmu/Server/pull/4147)) @joligario 2024-03-03
+
+## [22.46.0] 3/2/2024
+
+### Commands
+
+* Add #fish Command ([#4136](https://github.com/EQEmu/Server/pull/4136)) @Kinglykrab 2024-03-01
+
+### Crash Fix
+
+* Raid::UpdateGroupAAs ([#4139](https://github.com/EQEmu/Server/pull/4139)) @neckkola 2024-03-02
+* Update to location of qGlobals initialization ([#4144](https://github.com/EQEmu/Server/pull/4144)) @neckkola 2024-03-02
+
+### Feature
+
+* Exempt a zone from IP-limit checks. ([#4137](https://github.com/EQEmu/Server/pull/4137)) @catapultam-habeo 2024-03-02
+
+### Fixes
+
+* Cleanup NPC Mana Tap Logic ([#4134](https://github.com/EQEmu/Server/pull/4134)) @noudess 2024-03-02
+* Fix Bots/Bot Pets ending up on XTargets ([#4132](https://github.com/EQEmu/Server/pull/4132)) @Kinglykrab 2024-03-02
+* Fix issue with NPC Secondary Textures ([#4129](https://github.com/EQEmu/Server/pull/4129)) @Kinglykrab 2024-03-01
+* GetBotNameByID Temporary Reference Warning ([#4145](https://github.com/EQEmu/Server/pull/4145)) @Kinglykrab 2024-03-02
+* Update FreeGuildID Routine ([#4143](https://github.com/EQEmu/Server/pull/4143)) @neckkola 2024-03-02
+* Use std::clamp for Mob::ChangeSize ([#4140](https://github.com/EQEmu/Server/pull/4140)) @joligario 2024-03-02
+
+### Quest API
+
+* Add Bot Special Attacks for Immune Aggro/Damage ([#4108](https://github.com/EQEmu/Server/pull/4108)) @Kinglykrab 2024-03-02
+
+### Zone
+
+* Zone Routing Improvements ([#4142](https://github.com/EQEmu/Server/pull/4142)) @Akkadius 2024-03-02
+
+## [22.45.1] 2/29/2024
+
+### Character Creation
+
+* Improved Random Name Generator ([#4081](https://github.com/EQEmu/Server/pull/4081)) @catapultam-habeo 2024-02-27
+
+### Code
+
+* Fix Server Rules Documentation Generation ([#4125](https://github.com/EQEmu/Server/pull/4125)) @Kinglykrab 2024-02-26
+* Remove unnecessary stoptimer logs ([#4128](https://github.com/EQEmu/Server/pull/4128)) @Kinglykrab 2024-02-28
+
+### Commands
+
+* Add `#forage` command ([#4133](https://github.com/EQEmu/Server/pull/4133)) @joligario 2024-02-29
+
+### Crash
+
+* Fix crash issue during database dump ([#4127](https://github.com/EQEmu/Server/pull/4127)) @Akkadius 2024-02-29
+
+### Crash Fix
+
+* D20 crash if mitigation average resulted in 0 ([#4131](https://github.com/EQEmu/Server/pull/4131)) @nytmyr 2024-02-29
+
+### Fixes
+
+* Fix forage returning first result from table ([#4130](https://github.com/EQEmu/Server/pull/4130)) @nytmyr 2024-02-29
+* Who /all displays incorrect guild name ([#4123](https://github.com/EQEmu/Server/pull/4123)) @neckkola 2024-02-25
+
+### Quest API
+
+* Add Pet Owner Methods to Perl/Lua ([#4115](https://github.com/EQEmu/Server/pull/4115)) @Kinglykrab 2024-02-25
+
+## [22.45.0] 2/24/2024
+
+### Beacon
+
+* Revert a few lines of PR #4024 that broke beacons ([#4118](https://github.com/EQEmu/Server/pull/4118)) @noudess 2024-02-24
+
+### Bots
+
+* Cleanup empty `bot_commands` files ([#4095](https://github.com/EQEmu/Server/pull/4095)) @Kinglykrab 2024-02-19
+* Remove Alt Combat Functionality ([#4067](https://github.com/EQEmu/Server/pull/4067)) @Kinglykrab 2024-02-12
+
+### Code
+
+* Update fmt to 10.2.1 ([#4071](https://github.com/EQEmu/Server/pull/4071)) @hgtw 2024-02-16
+* Use explicit conversions for enum formatting ([#4064](https://github.com/EQEmu/Server/pull/4064)) @hgtw 2024-02-12
+
+### Database
+
+* Add content_database flag for zone changes ([#4104](https://github.com/EQEmu/Server/pull/4104)) @joligario 2024-02-20
+* Remove "item_tick" from database schema per https://github.com/EQEmu/Server/pull/3985 ([#4083](https://github.com/EQEmu/Server/pull/4083)) @Akkadius 2024-02-16
+
+### Expansions
+
+* Zone Expansion Version Routing ([#4084](https://github.com/EQEmu/Server/pull/4084)) @Akkadius 2024-02-20
+
+### Factions
+
+* Fix issue with npcedit and cached factions ([#4103](https://github.com/EQEmu/Server/pull/4103)) @noudess 2024-02-20
+
+### Feature
+
+* Add Augments to Starting Items for Bots/Players ([#4100](https://github.com/EQEmu/Server/pull/4100)) @Kinglykrab 2024-02-21
+* Hot Zone Bonus XP Notice ([#4091](https://github.com/EQEmu/Server/pull/4091)) @fryguy503 2024-02-18
+
+### Fixes
+
+* Add safety check to SummonAllCharacterCorpses. ([#4107](https://github.com/EQEmu/Server/pull/4107)) @fryguy503 2024-02-21
+* Added additional Guild-related crash checks ([#4105](https://github.com/EQEmu/Server/pull/4105)) @neckkola 2024-02-22
+* Aura effect spell id from #3964 ([#4094](https://github.com/EQEmu/Server/pull/4094)) @joligario 2024-02-18
+* Crash on Ubuntu 22.04 ([#4119](https://github.com/EQEmu/Server/pull/4119)) @neckkola 2024-02-25
+* Fix #wpadd Query ([#4078](https://github.com/EQEmu/Server/pull/4078)) @Kinglykrab 2024-02-14
+* Fix Bot Weapons with No Races ([#4110](https://github.com/EQEmu/Server/pull/4110)) @Kinglykrab 2024-02-25
+* Fix ClearSpawnTimers() ([#4073](https://github.com/EQEmu/Server/pull/4073)) @Kinglykrab 2024-02-13
+* Fix Issue with ClearSpawnTimers() ([#4070](https://github.com/EQEmu/Server/pull/4070)) @Kinglykrab 2024-02-13
+* Fix ObjectContentsRepository using content_db ([#4076](https://github.com/EQEmu/Server/pull/4076)) @Kinglykrab 2024-02-14
+* Fix Sympathetic Procs for Bots/Mercenariess ([#4086](https://github.com/EQEmu/Server/pull/4086)) @Kinglykrab 2024-02-19
+* Fix fix_z Query ([#4080](https://github.com/EQEmu/Server/pull/4080)) @Kinglykrab 2024-02-15
+* Fix hotzone string error ([#4109](https://github.com/EQEmu/Server/pull/4109)) @fryguy503 2024-02-22
+* Fix issue with IsEntOnHateList ([#4097](https://github.com/EQEmu/Server/pull/4097)) @Kinglykrab 2024-02-19
+* Fix manifest check on `base_data` change ([#4082](https://github.com/EQEmu/Server/pull/4082)) @joligario 2024-02-16
+* Revert 2df7d19 ([#4101](https://github.com/EQEmu/Server/pull/4101)) @joligario 2024-02-20
+* Update database_schema to add guild_permissions ([#4085](https://github.com/EQEmu/Server/pull/4085)) @neckkola 2024-02-16
+
+### Guilds
+
+* Fixes for Guild Bank ([#4120](https://github.com/EQEmu/Server/pull/4120)) @neckkola 2024-02-25
+
+### Logs
+
+* Fix log in BaseGuildManager::IsGuildLeader() ([#4102](https://github.com/EQEmu/Server/pull/4102)) @joligario 2024-02-20
+
+### Opcodes
+
+* Fix opcode reloading ([#4075](https://github.com/EQEmu/Server/pull/4075)) @Akkadius 2024-02-14
+
+### Quest API
+
+* Add Bot Methods to Perl/Lua ([#4113](https://github.com/EQEmu/Server/pull/4113)) @Kinglykrab 2024-02-25
+* Add Entity Variable Events to Perl/Lua ([#4092](https://github.com/EQEmu/Server/pull/4092)) @Kinglykrab 2024-02-20
+* Add GetAugmentIDs() to Perl/Lua ([#4114](https://github.com/EQEmu/Server/pull/4114)) @Kinglykrab 2024-02-25
+* Add GetNPCSpellsEffectsID() to Perl/Lua ([#4117](https://github.com/EQEmu/Server/pull/4117)) @Kinglykrab 2024-02-25
+* Add Hatelist Count Methods to Perl/Lua ([#4106](https://github.com/EQEmu/Server/pull/4106)) @Kinglykrab 2024-02-21
+* Add IsInAGuild() to Perl/Lua ([#4066](https://github.com/EQEmu/Server/pull/4066)) @Kinglykrab 2024-02-14
+* Add Pet Methods to Perl/Lua ([#4116](https://github.com/EQEmu/Server/pull/4116)) @Kinglykrab 2024-02-25
+* Add Timer Events to Perl/Lua ([#4099](https://github.com/EQEmu/Server/pull/4099)) @Kinglykrab 2024-02-19
+* Add spell cast methods to Lua ([#4096](https://github.com/EQEmu/Server/pull/4096)) @Kinglykrab 2024-02-19
+* Add tracebacks to Lua error messages ([#4079](https://github.com/EQEmu/Server/pull/4079)) @hgtw 2024-02-16
+* Export Combat Record to Death Events ([#4112](https://github.com/EQEmu/Server/pull/4112)) @Kinglykrab 2024-02-25
+
+### Repositories
+
+* Cleanup and Convert Character Creation to Repositories ([#4053](https://github.com/EQEmu/Server/pull/4053)) @Kinglykrab 2024-02-20
+* Convert Zone Flags to Repositories ([#4077](https://github.com/EQEmu/Server/pull/4077)) @Kinglykrab 2024-02-16
+* Update `zone` base repository from #4084 ([#4111](https://github.com/EQEmu/Server/pull/4111)) @joligario 2024-02-23
+
+## [22.44.5] - 2/12/2024
+
+### Fixes
+
+* [Hotfix] Fix issues where we're using the wrong database pointers @Akkadius
+
+## [22.44.4] - 2/12/2024
+
+### Fixes
+
+* Fix ClearSpawnTimers() ([#4073](https://github.com/EQEmu/Server/pull/4073)) @Kinglykrab 2024-02-13
+
+## [22.44.3] - 2/12/2024
+
+### Fixes
+
+* Fix Issue with ClearSpawnTimers() ([#4070](https://github.com/EQEmu/Server/pull/4070)) @Kinglykrab 2024-02-13
+
+## [22.44.2] - 2/12/2024
+
+### Bots
+
+* Remove Alt Combat Functionality ([#4067](https://github.com/EQEmu/Server/pull/4067)) @Kinglykrab 2024-02-12
+
+### Code
+
+* Use explicit conversions for enum formatting ([#4064](https://github.com/EQEmu/Server/pull/4064)) @hgtw 2024-02-12
+
+### Database
+
+* Fix default value for `time_of_death` in `character_corpses` ([#4060](https://github.com/EQEmu/Server/pull/4060)) @joligario 2024-02-11
+* Fix table name in manifest ([#4063](https://github.com/EQEmu/Server/pull/4063)) @joligario 2024-02-11
+* Proper default for `droptime` from `object_contents` ([#4061](https://github.com/EQEmu/Server/pull/4061)) @joligario 2024-02-11
+
+### Fixes
+
+* Guard against crash condition ([#4062](https://github.com/EQEmu/Server/pull/4062)) @neckkola 2024-02-11
+
+### Guilds
+
+* Clean up `GUILD_RANK_NONE` references ([#4059](https://github.com/EQEmu/Server/pull/4059)) @joligario 2024-02-11
+
+## [22.44.1] - 2/11/2024
+
+### Fixes
+
+* Fix File::Exists(file_name) to be resilient to Chinese characters ([#4058](https://github.com/EQEmu/Server/pull/4058)) @Akkadius 2024-02-11
+
+## [22.44.0] - 2/10/2024
+
+### Base Data
+
+* Remove from shared memory and simplify ([#4045](https://github.com/EQEmu/Server/pull/4045)) @Kinglykrab 2024-02-05
+
+### Bot Commands
+
+* Separate Bot Commands into Individual Files ([#4035](https://github.com/EQEmu/Server/pull/4035)) @Kinglykrab 2024-02-01
+
+### Code
+
+* Convert Quest Ornament Methods to Repositories ([#4048](https://github.com/EQEmu/Server/pull/4048)) @Kinglykrab 2024-02-10
+* Remove redundant check in Object::HandleCombine ([#4041](https://github.com/EQEmu/Server/pull/4041)) @joligario 2024-02-03
+
+### Commands
+
+* Add #show special_abilities ([#4043](https://github.com/EQEmu/Server/pull/4043)) @Kinglykrab 2024-02-05
+
+### Crash Reporting
+
+* Update Spire to use SSL ([#4055](https://github.com/EQEmu/Server/pull/4055)) @Akkadius 2024-02-10
+
+### Database
+
+* Correct manifest migration entries that should be content ([#4047](https://github.com/EQEmu/Server/pull/4047)) @Akkadius 2024-02-05
+
+### Deprecation
+
+* Remove eqemu_server.pl script and ties to server ([#4049](https://github.com/EQEmu/Server/pull/4049)) @Akkadius 2024-02-10
+
+### Feature
+
+* Add RoF2 Guild features ([#3699](https://github.com/EQEmu/Server/pull/3699)) @neckkola 2024-02-10
+* Add optional `is_forced` parameter to Zone::Repop ([#4046](https://github.com/EQEmu/Server/pull/4046)) @Kinglykrab 2024-02-05
+* Add support to crosszone/worldwide spells to affect bot pets ([#4036](https://github.com/EQEmu/Server/pull/4036)) @Kinglykrab 2024-02-01
+* Classic Taunt (Pre 2006) style of taunt ([#3942](https://github.com/EQEmu/Server/pull/3942)) @fryguy503 2024-02-10
+* Corpse Overhaul ([#3938](https://github.com/EQEmu/Server/pull/3938)) @fryguy503 2024-02-08
+
+### Fixes
+
+* Fix Bot Non-Melee Damage Messages ([#4038](https://github.com/EQEmu/Server/pull/4038)) @Kinglykrab 2024-02-01
+* Fix Froglok Starting Languages ([#4050](https://github.com/EQEmu/Server/pull/4050)) @Kinglykrab 2024-02-09
+* Fix Issue with Bot Dual wield ([#4037](https://github.com/EQEmu/Server/pull/4037)) @Kinglykrab 2024-02-01
+* Fix for potential crash of DS damage on death ([#4040](https://github.com/EQEmu/Server/pull/4040)) @nytmyr 2024-02-03
+
+### GM Commands
+
+* Fix typo in #rules help. ([#4042](https://github.com/EQEmu/Server/pull/4042)) @noudess 2024-02-04
+
+### Loot
+
+* Remove from shared memory, simplification ([#3988](https://github.com/EQEmu/Server/pull/3988)) @Akkadius 2024-02-05
+
+### Objects
+
+* Add `fix_z` column to ground spawns ([#3992](https://github.com/EQEmu/Server/pull/3992)) @Kinglykrab 2024-02-01
+
+### Quest API
+
+* Add GetAAEXPPercentage() and GetEXPPercentage() to Perl/Lua ([#4044](https://github.com/EQEmu/Server/pull/4044)) @Kinglykrab 2024-02-04
+
+### Quests
+
+* Cleanup Quest Parser Logic ([#4025](https://github.com/EQEmu/Server/pull/4025)) @Kinglykrab 2024-02-06
+
+### Tasks
+
+* Avoid removing client tasks from memory on load ([#4052](https://github.com/EQEmu/Server/pull/4052)) @hgtw 2024-02-10
+* Send active elements in task select packet ([#4051](https://github.com/EQEmu/Server/pull/4051)) @hgtw 2024-02-10
+
 ## [22.43.3] - 1/30/2024
 
 ### API

CMakeLists.txt

@@ -31,6 +31,13 @@ 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)

client_files/export/main.cpp

@@ -29,11 +29,15 @@
 #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;
+ZoneStore           zone_store;
+PathManager         path;
+PlayerEventLogs     player_event_logs;
 
 void ExportSpells(SharedDatabase *db);
 void ExportSkillCaps(SharedDatabase *db);
@@ -164,81 +168,76 @@ 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)
 {
-
-	bool res = false;
-
-	std::string query   = StringFormat(
-		"SELECT max(cap) FROM skill_caps WHERE class=%d AND skillID=%d",
-		class_id, skill_id
+	const auto& l = SkillCapsRepository::GetWhere(
+		*db,
+		fmt::format(
+			"`class_id` = {} AND `skill_id` = {} ORDER BY `cap` DESC LIMIT 1",
+			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;
+	return !l.empty();
 }
 
-int GetSkill(SharedDatabase *db, int skill_id, int class_id, int level)
+uint32 GetSkill(SharedDatabase* db, int skill_id, int class_id, int level)
 {
-
-	std::string query   = StringFormat(
-		"SELECT cap FROM skill_caps WHERE class=%d AND skillID=%d AND level=%d",
-		class_id, skill_id, level
+	const auto& l = SkillCapsRepository::GetWhere(
+		*db,
+		fmt::format(
+			"`class_id` = {} AND `skill_id` = {} AND `level` = {}",
+			class_id,
+			skill_id,
+			level
+		)
 	);
-	auto        results = db->QueryDatabase(query);
-	if (!results.Success()) {
+
+	if (l.empty()) {
 		return 0;
 	}
 
-	if (results.RowCount() == 0) {
-		return 0;
-	}
+	auto e = l.front();
 
-	auto row = results.begin();
-	return Strings::ToInt(row[0]);
+	return e.cap;
 }
 
-void ExportSkillCaps(SharedDatabase *db)
+void ExportSkillCaps(SharedDatabase* db)
 {
 	LogInfo("Exporting Skill Caps");
 
-	std::string file = fmt::format("{}/export/SkillCaps.txt", path.GetServerPath());
-	FILE *f = fopen(file.c_str(), "w");
-	if (!f) {
+	std::ofstream file(fmt::format("{}/export/SkillCaps.txt", path.GetServerPath()));
+	if (!file || !file.is_open()) {
 		LogError("Unable to open export/SkillCaps.txt to write, skipping.");
 		return;
 	}
 
-	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);
+	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);
 					if (cap < previous_cap) {
 						cap = previous_cap;
 					}
 
-					fprintf(f, "%d^%d^%d^%d^0\n", cl, skill, level, cap);
+					file << fmt::format("{}^{}^{}^{}^0", class_id, skill_id, level, cap) << std::endl;
+
 					previous_cap = cap;
 				}
 			}
 		}
 	}
 
-	fclose(f);
+	file.close();
 }
 
 void ExportBaseData(SharedDatabase *db)

client_files/import/main.cpp

@@ -27,11 +27,15 @@
 #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;
+ZoneStore           zone_store;
+PathManager         path;
+PlayerEventLogs     player_event_logs;
 
 void ImportSpells(SharedDatabase *db);
 void ImportSkillCaps(SharedDatabase *db);
@@ -255,50 +259,45 @@ void ImportSkillCaps(SharedDatabase *db) {
 	fclose(f);
 }
 
-void ImportBaseData(SharedDatabase *db) {
+void ImportBaseData(SharedDatabase *db)
+{
 	LogInfo("Importing Base Data");
 
-	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;
+	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 delete_sql = "DELETE FROM base_data";
-	db->QueryDatabase(delete_sql);
+	db->QueryDatabase("DELETE FROM base_data");
 
-	char buffer[2048];
-	while(fgets(buffer, 2048, f)) {
-		auto split = Strings::Split(buffer, '^');
+	std::vector<BaseDataRepository::BaseData> v;
 
-		if(split.size() < 10) {
+	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) {
 			continue;
 		}
 
-		std::string sql;
-		int level, class_id;
-		double hp, mana, end, unk1, unk2, hp_fac, mana_fac, end_fac;
+		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]);
 
-		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);
+		v.emplace_back(e);
 	}
 
-	fclose(f);
+	BaseDataRepository::InsertMany(*db, v);
 }
 
 void ImportDBStrings(SharedDatabase *db) {

common/CMakeLists.txt

@@ -2,6 +2,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.12)
 
 SET(common_sources
     base_packet.cpp
+    bazaar.cpp
     classes.cpp
     cli/eqemu_command_handler.cpp
     compression.cpp
@@ -83,6 +84,7 @@ SET(common_sources
     shared_tasks.cpp
     shareddb.cpp
     skills.cpp
+    skill_caps.cpp
     spdat.cpp
     strings.cpp
     struct_strategy.cpp
@@ -176,6 +178,8 @@ 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_parcels_containers_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
@@ -222,6 +226,9 @@ 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
@@ -353,6 +360,8 @@ 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_parcels_containers_repository.h
     repositories/character_peqzone_flags_repository.h
     repositories/character_pet_buffs_repository.h
     repositories/character_pet_info_repository.h
@@ -399,6 +408,9 @@ 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
@@ -486,12 +498,12 @@ SET(repositories
     repositories/zone_repository.h
     repositories/zone_points_repository.h
 
-    )
+)
 
 SET(common_headers
     additive_lagged_fibonacci_engine.h
+    bazaar.h
     base_packet.h
-    base_data.h
     bodytypes.h
     classes.h
     compression.h
@@ -561,7 +573,7 @@ SET(common_headers
     json_config.h
     light_source.h
     linked_list.h
-    loottable.h
+    loot.h
     mail_oplist.h
     md5.h
     memory_buffer.h
@@ -587,7 +599,7 @@ SET(common_headers
     ptimer.h
     queue.h
     races.h
-	raid.h
+    raid.h
     random.h
     rdtsc.h
     rulesys.h
@@ -601,6 +613,7 @@ SET(common_headers
     shared_tasks.h
     shareddb.h
     skills.h
+    skill_caps.h
     spdat.h
     strings.h
     struct_strategy.h
@@ -676,13 +689,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
@@ -719,7 +732,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
@@ -763,12 +776,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
@@ -776,7 +789,7 @@ SOURCE_GROUP(Util FILES
     util/directory.h
     util/uuid.cpp
     util/uuid.h
-    )
+)
 
 INCLUDE_DIRECTORIES(Patches SocketLib StackWalker)
 
@@ -789,6 +802,6 @@ ENDIF (UNIX)
 
 IF (WIN32 AND EQEMU_BUILD_PCH)
     TARGET_PRECOMPILE_HEADERS(common PRIVATE pch/pch.h)
-ENDIF()
+ENDIF ()
 
 SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)

common/base_data.h

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

common/bazaar.cpp

@@ -0,0 +1,359 @@
+#include "bazaar.h"
+
+#include "../../common/item_instance.h"
+#include "repositories/trader_repository.h"
+#include <memory>
+
+std::vector<BazaarSearchResultsFromDB_Struct>
+Bazaar::GetSearchResults(
+	SharedDatabase &db,
+	BazaarSearchCriteria_Struct search,
+	uint32 char_zone_id
+)
+{
+	LogTrading(
+		"Searching for items with search criteria - item_name [{}] min_cost [{}] max_cost [{}] min_level [{}] "
+		"max_level [{}] max_results [{}] prestige [{}] augment [{}] trader_entity_id [{}] trader_id [{}] "
+		"search_scope [{}] char_zone_id [{}]",
+		search.item_name,
+		search.min_cost,
+		search.max_cost,
+		search.min_level,
+		search.max_level,
+		search.max_results,
+		search.prestige,
+		search.augment,
+		search.trader_entity_id,
+		search.trader_id,
+		search.search_scope,
+		char_zone_id
+	);
+
+	std::string search_criteria_trader("TRUE ");
+
+	if (search.search_scope == NonRoFBazaarSearchScope) {
+		search_criteria_trader.append(
+			fmt::format(
+				" AND trader.char_entity_id = {} AND trader.char_zone_id = {}",
+				search.trader_entity_id,
+				Zones::BAZAAR
+			)
+		);
+	}
+	else if (search.search_scope == Local_Scope) {
+		search_criteria_trader.append(fmt::format(" AND trader.char_zone_id = {}", char_zone_id));
+	}
+	else if (search.trader_id > 0) {
+		search_criteria_trader.append(fmt::format(" AND trader.char_id = {}", search.trader_id));
+	}
+	if (search.min_cost != 0) {
+		search_criteria_trader.append(fmt::format(" AND trader.item_cost >= {}", search.min_cost));
+	}
+	if (search.max_cost != 0) {
+		search_criteria_trader.append(fmt::format(" AND trader.item_cost <= {}", (uint64) search.max_cost * 1000));
+	}
+
+	// not yet implemented
+	//	if (search.prestige != 0) {
+	// 	   0xffffffff prestige only, 0xfffffffe non-prestige, 0 all
+	//		search_criteria.append(fmt::format(" AND items.type = {} ", search.prestige));
+	//	}
+
+	std::string query = fmt::format(
+		"SELECT COUNT(item_id), trader.char_id, trader.item_id, trader.item_sn, trader.item_charges, trader.item_cost, "
+		"trader.slot_id, SUM(trader.item_charges), trader.char_zone_id, trader.char_entity_id, character_data.name, "
+		"aug_slot_1, aug_slot_2, aug_slot_3, aug_slot_4, aug_slot_5, aug_slot_6 "
+		"FROM trader, character_data "
+		"WHERE {} AND trader.char_id = character_data.id "
+		"GROUP BY trader.item_sn, trader.item_charges, trader.char_id",
+		search_criteria_trader.c_str()
+	);
+
+	std::vector<BazaarSearchResultsFromDB_Struct> all_entries;
+
+	auto results = db.QueryDatabase(query);
+
+	if (!results.Success()) {
+		return all_entries;
+	}
+
+	struct ItemSearchType {
+		EQ::item::ItemType type;
+		bool               condition;
+	};
+
+	struct AddititiveSearchCriteria {
+		bool should_check;
+		bool condition;
+	};
+
+	for (auto row: results) {
+		BazaarSearchResultsFromDB_Struct r{};
+
+		r.item_id = Strings::ToInt(row[2]);
+		r.charges = Strings::ToInt(row[4]);
+
+		auto item = db.GetItem(r.item_id);
+		if (!item) {
+			continue;
+		}
+
+		uint32 aug_slot_1 = Strings::ToUnsignedInt(row[11]);
+		uint32 aug_slot_2 = Strings::ToUnsignedInt(row[12]);
+		uint32 aug_slot_3 = Strings::ToUnsignedInt(row[13]);
+		uint32 aug_slot_4 = Strings::ToUnsignedInt(row[14]);
+		uint32 aug_slot_5 = Strings::ToUnsignedInt(row[15]);
+		uint32 aug_slot_6 = Strings::ToUnsignedInt(row[16]);
+
+		std::unique_ptr<EQ::ItemInstance> inst(
+			db.CreateItem(
+				item,
+				r.charges,
+				aug_slot_1,
+				aug_slot_2,
+				aug_slot_3,
+				aug_slot_4,
+				aug_slot_5,
+				aug_slot_6
+			)
+		);
+
+		if (!inst->GetItem()) {
+			continue;
+		}
+
+		r.count             = Strings::ToInt(row[0]);
+		r.trader_id         = Strings::ToInt(row[1]);
+		r.serial_number     = Strings::ToInt(row[3]);
+		r.cost              = Strings::ToInt(row[5]);
+		r.slot_id           = Strings::ToInt(row[6]);
+		r.sum_charges       = Strings::ToInt(row[7]);
+		r.stackable         = item->Stackable;
+		r.icon_id           = item->Icon;
+		r.trader_zone_id    = Strings::ToInt(row[8]);
+		r.trader_entity_id  = Strings::ToInt(row[9]);
+		r.serial_number_RoF = fmt::format("{:016}\0", Strings::ToInt(row[3]));
+		r.item_name         = fmt::format("{:.63}\0", item->Name);
+		r.trader_name       = fmt::format("{:.63}\0", std::string(row[10]).c_str());
+
+		LogTradingDetail(
+			"Searching against item [{}] ({}) for trader [{}]",
+			item->Name,
+			item->ID,
+			r.trader_name
+		);
+
+		// item stat searches
+		std::map<uint32, uint32> item_stat_searches = {
+
+			{STAT_AC,                  inst->GetItemArmorClass(true)},
+			{STAT_AGI,                 static_cast<uint32>(inst->GetItemAgi(true))},
+			{STAT_CHA,                 static_cast<uint32>(inst->GetItemCha(true))},
+			{STAT_DEX,                 static_cast<uint32>(inst->GetItemDex(true))},
+			{STAT_INT,                 static_cast<uint32>(inst->GetItemInt(true))},
+			{STAT_STA,                 static_cast<uint32>(inst->GetItemSta(true))},
+			{STAT_STR,                 static_cast<uint32>(inst->GetItemStr(true))},
+			{STAT_WIS,                 static_cast<uint32>(inst->GetItemWis(true))},
+			{STAT_COLD,                static_cast<uint32>(inst->GetItemCR(true))},
+			{STAT_DISEASE,             static_cast<uint32>(inst->GetItemDR(true))},
+			{STAT_FIRE,                static_cast<uint32>(inst->GetItemFR(true))},
+			{STAT_MAGIC,               static_cast<uint32>(inst->GetItemMR(true))},
+			{STAT_POISON,              static_cast<uint32>(inst->GetItemPR(true))},
+			{STAT_HP,                  static_cast<uint32>(inst->GetItemHP(true))},
+			{STAT_MANA,                static_cast<uint32>(inst->GetItemMana(true))},
+			{STAT_ENDURANCE,           static_cast<uint32>(inst->GetItemEndur(true))},
+			{STAT_ATTACK,              static_cast<uint32>(inst->GetItemAttack(true))},
+			{STAT_HP_REGEN,            static_cast<uint32>(inst->GetItemRegen(true))},
+			{STAT_MANA_REGEN,          static_cast<uint32>(inst->GetItemManaRegen(true))},
+			{STAT_HASTE,               static_cast<uint32>(inst->GetItemHaste(true))},
+			{STAT_DAMAGE_SHIELD,       static_cast<uint32>(inst->GetItemDamageShield(true))},
+			{STAT_DS_MITIGATION,       static_cast<uint32>(inst->GetItemDSMitigation(true))},
+			{STAT_HEAL_AMOUNT,         static_cast<uint32>(inst->GetItemHealAmt(true))},
+			{STAT_SPELL_DAMAGE,        static_cast<uint32>(inst->GetItemSpellDamage(true))},
+			{STAT_CLAIRVOYANCE,        static_cast<uint32>(inst->GetItemClairvoyance(true))},
+			{STAT_HEROIC_AGILITY,      static_cast<uint32>(inst->GetItemHeroicAgi(true))},
+			{STAT_HEROIC_CHARISMA,     static_cast<uint32>(inst->GetItemHeroicCha(true))},
+			{STAT_HEROIC_DEXTERITY,    static_cast<uint32>(inst->GetItemHeroicDex(true))},
+			{STAT_HEROIC_INTELLIGENCE, static_cast<uint32>(inst->GetItemHeroicInt(true))},
+			{STAT_HEROIC_STAMINA,      static_cast<uint32>(inst->GetItemHeroicSta(true))},
+			{STAT_HEROIC_STRENGTH,     static_cast<uint32>(inst->GetItemHeroicStr(true))},
+			{STAT_HEROIC_WISDOM,       static_cast<uint32>(inst->GetItemHeroicWis(true))},
+			{STAT_BASH,                static_cast<uint32>(inst->GetItemSkillsStat(EQ::skills::SkillBash, true))},
+			{STAT_BACKSTAB,            static_cast<uint32>(inst->GetItemBackstabDamage(true))},
+			{STAT_DRAGON_PUNCH,        static_cast<uint32>(inst->GetItemSkillsStat(EQ::skills::SkillDragonPunch, true))},
+			{STAT_EAGLE_STRIKE,        static_cast<uint32>(inst->GetItemSkillsStat(EQ::skills::SkillEagleStrike, true))},
+			{STAT_FLYING_KICK,         static_cast<uint32>(inst->GetItemSkillsStat(EQ::skills::SkillFlyingKick, true))},
+			{STAT_KICK,                static_cast<uint32>(inst->GetItemSkillsStat(EQ::skills::SkillKick, true))},
+			{STAT_ROUND_KICK,          static_cast<uint32>(inst->GetItemSkillsStat(EQ::skills::SkillRoundKick, true))},
+			{STAT_TIGER_CLAW,          static_cast<uint32>(inst->GetItemSkillsStat(EQ::skills::SkillTigerClaw, true))},
+			{STAT_FRENZY,              static_cast<uint32>(inst->GetItemSkillsStat(EQ::skills::SkillFrenzy, true))},
+		};
+
+		r.item_stat = item_stat_searches.contains(search.item_stat) ? item_stat_searches[search.item_stat] : 0;
+		if (item_stat_searches.contains(search.item_stat) && item_stat_searches[search.item_stat] <= 0) {
+			continue;
+		}
+
+		static std::map<uint8, uint32> item_slot_searches = {
+			{EQ::invslot::slotCharm,       1},
+			{EQ::invslot::slotEar1,        2},
+			{EQ::invslot::slotHead,        4},
+			{EQ::invslot::slotFace,        8},
+			{EQ::invslot::slotEar2,        16},
+			{EQ::invslot::slotNeck,        32},
+			{EQ::invslot::slotShoulders,   64},
+			{EQ::invslot::slotArms,        128},
+			{EQ::invslot::slotBack,        256},
+			{EQ::invslot::slotWrist1,      512},
+			{EQ::invslot::slotWrist2,      1024},
+			{EQ::invslot::slotRange,       2048},
+			{EQ::invslot::slotHands,       4096},
+			{EQ::invslot::slotPrimary,     8192},
+			{EQ::invslot::slotSecondary,   16384},
+			{EQ::invslot::slotFinger1,     32768},
+			{EQ::invslot::slotFinger2,     65536},
+			{EQ::invslot::slotChest,       131072},
+			{EQ::invslot::slotLegs,        262144},
+			{EQ::invslot::slotFeet,        524288},
+			{EQ::invslot::slotWaist,       1048576},
+			{EQ::invslot::slotPowerSource, 2097152},
+			{EQ::invslot::slotAmmo,        4194304},
+		};
+
+		auto GetEquipmentSlotBit = [&](uint32 slot) -> uint32 {
+			return item_slot_searches.contains(slot) ? item_slot_searches[slot] : 0;
+		};
+
+		auto FindItemAugSlot = [&]() -> bool {
+			for (auto const &s: inst->GetItem()->AugSlotType) {
+				return s == search.augment;
+			}
+			return false;
+		};
+
+		// item type searches
+		std::vector<ItemSearchType> item_search_types = {
+			{EQ::item::ItemType::ItemTypeAll,                  true},
+			{EQ::item::ItemType::ItemTypeBook,                 item->ItemClass == EQ::item::ItemType::ItemTypeBook},
+			{EQ::item::ItemType::ItemTypeContainer,            item->ItemClass == EQ::item::ItemType::ItemTypeContainer},
+			{EQ::item::ItemType::ItemTypeAllEffects,           item->Scroll.Effect > 0 && item->Scroll.Effect < 65000},
+			{EQ::item::ItemType::ItemTypeUnknown9,             item->Worn.Effect == 998},
+			{EQ::item::ItemType::ItemTypeUnknown10,            item->Worn.Effect >= 1298 && item->Worn.Effect <= 1307},
+			{EQ::item::ItemType::ItemTypeFocusEffect,          item->Focus.Effect > 0},
+			{EQ::item::ItemType::ItemTypeArmor,                item->ItemType == EQ::item::ItemType::ItemTypeArmor},
+			{EQ::item::ItemType::ItemType1HBlunt,              item->ItemType == EQ::item::ItemType::ItemType1HBlunt},
+			{EQ::item::ItemType::ItemType1HPiercing,           item->ItemType == EQ::item::ItemType::ItemType1HPiercing},
+			{EQ::item::ItemType::ItemType1HSlash,              item->ItemType == EQ::item::ItemType::ItemType1HSlash},
+			{EQ::item::ItemType::ItemType2HBlunt,              item->ItemType == EQ::item::ItemType::ItemType2HBlunt},
+			{EQ::item::ItemType::ItemType2HSlash,              item->ItemType == EQ::item::ItemType::ItemType2HSlash},
+			{EQ::item::ItemType::ItemTypeBow,                  item->ItemType == EQ::item::ItemType::ItemTypeBow},
+			{EQ::item::ItemType::ItemTypeShield,               item->ItemType == EQ::item::ItemType::ItemTypeShield},
+			{EQ::item::ItemType::ItemTypeMisc,                 item->ItemType == EQ::item::ItemType::ItemTypeMisc},
+			{EQ::item::ItemType::ItemTypeFood,                 item->ItemType == EQ::item::ItemType::ItemTypeFood},
+			{EQ::item::ItemType::ItemTypeDrink,                item->ItemType == EQ::item::ItemType::ItemTypeDrink},
+			{EQ::item::ItemType::ItemTypeLight,                item->ItemType == EQ::item::ItemType::ItemTypeLight},
+			{EQ::item::ItemType::ItemTypeCombinable,           item->ItemType == EQ::item::ItemType::ItemTypeCombinable},
+			{EQ::item::ItemType::ItemTypeBandage,              item->ItemType == EQ::item::ItemType::ItemTypeBandage},
+			{EQ::item::ItemType::ItemTypeSmallThrowing,        item->ItemType == EQ::item::ItemType::ItemTypeSmallThrowing ||
+			                                                   item->ItemType == EQ::item::ItemType::ItemTypeLargeThrowing},
+			{EQ::item::ItemType::ItemTypeSpell,                item->ItemType == EQ::item::ItemType::ItemTypeSpell},
+			{EQ::item::ItemType::ItemTypePotion,               item->ItemType == EQ::item::ItemType::ItemTypePotion},
+			{EQ::item::ItemType::ItemTypeBrassInstrument,      item->ItemType == EQ::item::ItemType::ItemTypeBrassInstrument},
+			{EQ::item::ItemType::ItemTypeWindInstrument,       item->ItemType == EQ::item::ItemType::ItemTypeWindInstrument},
+			{EQ::item::ItemType::ItemTypeStringedInstrument,   item->ItemType == EQ::item::ItemType::ItemTypeStringedInstrument},
+			{EQ::item::ItemType::ItemTypePercussionInstrument, item->ItemType == EQ::item::ItemType::ItemTypePercussionInstrument},
+			{EQ::item::ItemType::ItemTypeArrow,                item->ItemType == EQ::item::ItemType::ItemTypeArrow},
+			{EQ::item::ItemType::ItemTypeJewelry,              item->ItemType == EQ::item::ItemType::ItemTypeJewelry},
+			{EQ::item::ItemType::ItemTypeNote,                 item->ItemType == EQ::item::ItemType::ItemTypeNote},
+			{EQ::item::ItemType::ItemTypeKey,                  item->ItemType == EQ::item::ItemType::ItemTypeKey},
+			{EQ::item::ItemType::ItemType2HPiercing,           item->ItemType == EQ::item::ItemType::ItemType2HPiercing},
+			{EQ::item::ItemType::ItemTypeAlcohol,              item->ItemType == EQ::item::ItemType::ItemTypeAlcohol},
+			{EQ::item::ItemType::ItemTypeMartial,              item->ItemType == EQ::item::ItemType::ItemTypeMartial},
+			{EQ::item::ItemType::ItemTypeAugmentation,         item->ItemType == EQ::item::ItemType::ItemTypeAugmentation},
+			{EQ::item::ItemType::ItemTypeAlternateAbility,     item->ItemType == EQ::item::ItemType::ItemTypeAlternateAbility},
+			{EQ::item::ItemType::ItemTypeCount,                item->ItemType == EQ::item::ItemType::ItemTypeCount},
+			{EQ::item::ItemType::ItemTypeCollectible,          item->ItemType == EQ::item::ItemType::ItemTypeCollectible}
+			};
+
+		bool met_filter = false;
+		bool has_filter = false;
+
+		for (auto &i: item_search_types) {
+			if (i.type == search.type) {
+				has_filter = true;
+				if (i.condition) {
+					LogTradingDetail("Item [{}] met search criteria for type [{}]", item->Name, uint8(i.type));
+					met_filter = true;
+					break;
+				}
+			}
+		}
+		if (has_filter && !met_filter) {
+			continue;
+		}
+
+		// TODO: Add catch-all item type filter for specific item types
+
+		// item additive searches
+		std::vector<AddititiveSearchCriteria> item_additive_searches = {
+			{
+				.should_check = search.min_level != 1 && inst->GetItemRequiredLevel(true) > 0,
+				.condition = inst->GetItemRequiredLevel(true) >= search.min_level
+			},
+			{
+				.should_check = search.max_level != 1 && inst->GetItemRequiredLevel(true) > 0,
+				.condition = inst->GetItemRequiredLevel(true) <= search.max_level
+			},
+			{
+				.should_check = !std::string(search.item_name).empty(),
+				.condition = Strings::ContainsLower(item->Name, search.item_name)
+			},
+			{
+				.should_check = search._class != 0xFFFFFFFF,
+				.condition = static_cast<bool>(item->Classes & GetPlayerClassBit(search._class))
+			},
+			{
+				.should_check = search.race != 0xFFFFFFFF,
+				.condition = static_cast<bool>(item->Races & GetPlayerRaceBit(search.race))
+			},
+			{
+				.should_check = search.augment != 0,
+				.condition = FindItemAugSlot()
+			},
+			{
+				.should_check = search.slot != 0xFFFFFFFF,
+				.condition = static_cast<bool>(item->Slots & GetEquipmentSlotBit(search.slot))
+			},
+		};
+
+		bool should_add = true;
+
+		for (auto &i: item_additive_searches) {
+			LogTradingDetail(
+				"Checking item [{}] for search criteria - should_check [{}] condition [{}]",
+				item->Name,
+				i.should_check,
+				i.condition
+			);
+			if (i.should_check && !i.condition) {
+				should_add = false;
+				continue;
+			}
+		}
+
+		if (!should_add) {
+			continue;
+		}
+
+		LogTradingDetail("Found item [{}] meeting search criteria.", r.item_name);
+		all_entries.push_back(r);
+	}
+
+	if (all_entries.size() > search.max_results) {
+		all_entries.resize(search.max_results);
+	}
+
+	LogTrading("Returning [{}] items from search results", all_entries.size());
+
+	return all_entries;
+}

common/bazaar.h

@@ -0,0 +1,14 @@
+#ifndef EQEMU_BAZAAR_H
+#define EQEMU_BAZAAR_H
+
+#include <vector>
+#include "shareddb.h"
+
+class Bazaar {
+public:
+	static std::vector<BazaarSearchResultsFromDB_Struct>
+	GetSearchResults(SharedDatabase &db, BazaarSearchCriteria_Struct search, unsigned int char_zone_id);
+};
+
+
+#endif //EQEMU_BAZAAR_H

common/bodytypes.h

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

common/content/world_content_service.cpp

@@ -1,29 +1,11 @@
-/**
- * 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 "world_content_service.h"
+
+#include <utility>
+#include <glm/vec3.hpp>
 #include "../database.h"
 #include "../rulesys.h"
 #include "../eqemu_logsys.h"
-#include "../loottable.h"
-#include "../repositories/content_flags_repository.h"
+#include "../repositories/instance_list_repository.h"
 
 
 WorldContentService::WorldContentService()
@@ -120,7 +102,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;
 }
@@ -168,14 +150,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;
 		}
@@ -196,11 +178,13 @@ 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
@@ -215,6 +199,18 @@ 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(
@@ -239,3 +235,135 @@ 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;
+}

common/content/world_content_service.h

@@ -1,33 +1,21 @@
-/**
- * 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;
@@ -176,14 +164,35 @@ 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;

common/crash.cpp

@@ -15,7 +15,7 @@
 #include <cstdio>
 #include <vector>
 
-#if WINDOWS
+#ifdef _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 = {
-		"http://spire.akkadius.com/api/v1/analytics/server-crash-report",
+		"https://spire.akkadius.com/api/v1/analytics/server-crash-report",
 //		"http://localhost:3010/api/v1/analytics/server-crash-report", // development
 	};
 

common/database.h

@@ -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,8 +38,7 @@
 class MySQLRequestResult;
 class Client;
 
-namespace EQ
-{
+namespace EQ {
 	class InventoryProfile;
 }
 
@@ -52,10 +51,11 @@ 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,37 +76,33 @@ class PTimerList;
 
 #define SQL(...) #__VA_ARGS__
 
-class LogSettings;
 class Database : public DBcore {
 public:
 	Database();
-	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(
+		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();
 
 	/* Character Creation */
-
-	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 DeleteCharacter(const std::string& name);
+	bool MoveCharacterToZone(const std::string& name, uint32 zone_id);
 	bool MoveCharacterToZone(uint32 character_id, uint32 zone_id);
-	bool ReserveName(uint32 account_id, char *name);
-	bool SaveCharacterCreate(uint32 character_id, uint32 account_id, PlayerProfile_Struct *pp);
-	bool UpdateName(const char *oldname, const char *newname);
+	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 CopyCharacter(
 		const std::string& source_character_name,
 		const std::string& destination_character_name,
@@ -114,160 +110,175 @@ 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);
 
-	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);
+	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);
 
-	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);
+	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);
 
 	/* 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 charid, int16 version);
+	uint16 GetInstanceID(uint32 zone, uint32 character_id, 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 gid, uint32 instance_id);
-	void AssignRaidToInstance(uint32 rid, uint32 instance_id);
+	void AssignGroupToInstance(uint32 group_id, uint32 instance_id);
+	void AssignRaidToInstance(uint32 raid_id, uint32 instance_id);
 	void DeleteInstance(uint16 instance_id);
-	void FlagInstanceByGroupLeader(uint32 zone_id, int16 version, uint32 charid, uint32 group_id);
-	void FlagInstanceByRaidLeader(uint32 zone_id, int16 version, uint32 charid, uint32 raid_id);
-	void GetCharactersInInstance(uint16 instance_id, std::list<uint32> &character_ids);
+	void FlagInstanceByGroupLeader(uint32 zone_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 PurgeExpiredInstances();
 	void SetInstanceDuration(uint16 instance_id, uint32 new_duration);
+	void CleanupInstanceCorpses();
 
 	/* Adventure related. */
-
-	void UpdateAdventureStatsEntry(uint32 char_id, uint8 theme, bool win = false, bool remove = false);
-	bool GetAdventureStats(uint32 char_id, AdventureStats_Struct *as);
+	void UpdateAdventureStatsEntry(uint32 character_id, uint8 theme_id, bool is_win = false, bool is_remove = false);
+	bool GetAdventureStats(uint32 character_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 GetAccountStatus(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
+	);
 
-	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);
+	uint8 GetAgreementFlag(uint32 account_id);
+	void SetAgreementFlag(uint32 account_id);
 
-	int16	CheckStatus(uint32 account_id);
+	int GetIPExemption(const std::string& account_ip);
+	void SetIPExemption(const std::string& account_ip, int exemption_amount);
 
-	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);
+	int GetInstanceID(uint32 character_id, uint32 zone_id);
 
 
 	/* Groups */
-
-	std::string GetGroupLeaderForLogin(std::string character_name);
-	char* GetGroupLeadershipInfo(uint32 gid, char* leaderbuf, char* maintank = nullptr, char* assist = nullptr, char* puller = nullptr, char *marknpc = nullptr, char *mentoree = nullptr, int *mentor_percent = nullptr, GroupLeadershipAA_Struct* GLAA = nullptr);
-
-	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);
+	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);
 
 	/* 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);
 
-	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();
+	void PurgeAllDeletedDataBuckets();
+	void ClearGuildOnlineStatus();
 
 
 	/* Database Variables */
+	bool GetVariable(const std::string& name, std::string& value);
+	bool SetVariable(const std::string& name, const std::string& value);
+	bool LoadVariables();
 
-	bool	GetVariable(std::string varname, std::string &varvalue);
-	bool	SetVariable(const std::string& varname, const std::string &varvalue);
-	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);
 
-	/* General Queries */
+	int64 CountInvSnapshots();
+	void ClearInvSnapshots(bool from_now = false);
 
-	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);
+	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);
 
 private:
-
-	Mutex Mvarcache;
+	Mutex           Mvarcache;
 	VarCache_Struct varcache;
 
 	/* Groups, utility methods. */
-	void    ClearAllGroupLeaders();
-	void    ClearAllGroups();
+	void ClearAllGroupLeaders();
+	void ClearAllGroups();
 
 	/* Raid, utility methods. */
 	void ClearAllRaids();

common/database/database_dump_service.cpp

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

common/database/database_update_manifest.cpp

@@ -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",
@@ -5241,6 +5241,425 @@ DROP TABLE IF EXISTS item_tick
 		.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`;
+)"
+	},
+	ManifestEntry{
+		.version = 9277,
+		.description = "2024_05_09_parcel_enable_containers.sql",
+		.check = "SHOW TABLES LIKE 'character_parcels_containers'",
+		.condition = "empty",
+		.match = "",
+		.sql = R"(
+CREATE TABLE `character_parcels_containers` (
+	`id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+	`parcels_id` INT(10) UNSIGNED NOT NULL DEFAULT '0',
+	`slot_id` INT(10) UNSIGNED NOT NULL DEFAULT '0',
+	`item_id` INT(10) UNSIGNED NOT NULL DEFAULT '0',
+	`aug_slot_1` INT(10) UNSIGNED NOT NULL DEFAULT '0',
+	`aug_slot_2` INT(10) UNSIGNED NOT NULL DEFAULT '0',
+	`aug_slot_3` INT(10) UNSIGNED NOT NULL DEFAULT '0',
+	`aug_slot_4` INT(10) UNSIGNED NOT NULL DEFAULT '0',
+	`aug_slot_5` INT(10) UNSIGNED NOT NULL DEFAULT '0',
+	`aug_slot_6` INT(10) UNSIGNED NOT NULL DEFAULT '0',
+	`quantity` INT(10) UNSIGNED NOT NULL DEFAULT '0',
+	PRIMARY KEY (`id`) USING BTREE,
+	INDEX `fk_character_parcels_id` (`parcels_id`) USING BTREE,
+	CONSTRAINT `fk_character_parcels_id` FOREIGN KEY (`parcels_id`) REFERENCES `character_parcels` (`id`) ON UPDATE NO ACTION ON DELETE CASCADE
+)
+COLLATE='latin1_swedish_ci'
+ENGINE=InnoDB
+AUTO_INCREMENT=1
+;
+)"
+	},
+	ManifestEntry{
+		.version = 9278,
+		.description = "2024_05_06_npc_greed.sql",
+		.check = "SHOW COLUMNS FROM `npc_types` LIKE 'greed'",
+		.condition = "empty",
+		.match = "",
+		.sql = R"(
+ALTER TABLE `npc_types`
+ADD COLUMN `greed` tinyint(8) UNSIGNED NOT NULL DEFAULT 0 AFTER `merchant_id`;
+ )",
+		.content_schema_update = true
+	},
+	ManifestEntry{
+		.version = 9279,
+		.description = "2024_05_13_content_flagging_npc_spells_entries.sql",
+		.check = "SHOW COLUMNS FROM `npc_spells_entries` LIKE 'content_flags'",
+		.condition = "empty",
+		.match = "",
+		.sql = R"(
+ALTER TABLE `npc_spells_entries` ADD `min_expansion` tinyint(4) NOT NULL DEFAULT -1;
+ALTER TABLE `npc_spells_entries` ADD `max_expansion` tinyint(4) NOT NULL DEFAULT -1;
+ALTER TABLE `npc_spells_entries` ADD `content_flags` varchar(100) NULL;
+ALTER TABLE `npc_spells_entries` ADD `content_flags_disabled` varchar(100) NULL;
+)",
+		.content_schema_update = true
+	},
+	ManifestEntry{
+		.version     = 9280,
+		.description = "2024_05_11_update_trader_support.sql",
+		.check       = "SHOW COLUMNS FROM `trader` LIKE 'aug_slot_1'",
+		.condition   = "empty",
+		.match       = "",
+		.sql         = R"(
+ALTER TABLE `trader`
+	ADD COLUMN `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT FIRST,
+	CHANGE COLUMN `char_id` `char_id` INT(11) UNSIGNED NOT NULL DEFAULT '0' AFTER `id`,
+	CHANGE COLUMN `item_id` `item_id` INT(11) UNSIGNED NOT NULL DEFAULT '0' AFTER `char_id`,
+	ADD COLUMN `aug_slot_1` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `item_id`,
+	ADD COLUMN `aug_slot_2` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `aug_slot_1`,
+	ADD COLUMN `aug_slot_3` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `aug_slot_2`,
+	ADD COLUMN `aug_slot_4` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `aug_slot_3`,
+	ADD COLUMN `aug_slot_5` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `aug_slot_4`,
+	ADD COLUMN `aug_slot_6` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `aug_slot_5`,
+	CHANGE COLUMN `serialnumber` `item_sn` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `aug_slot_6`,
+	CHANGE COLUMN `charges` `item_charges` INT(11) NOT NULL DEFAULT '0' AFTER `item_sn`,
+	ADD COLUMN `char_entity_id` INT(11) UNSIGNED NOT NULL DEFAULT 0 AFTER `slot_id`,
+	ADD COLUMN `char_zone_id` INT(11) UNSIGNED NOT NULL DEFAULT 0 AFTER `char_entity_id`,
+	ADD COLUMN `active_transaction` TINYINT(3) UNSIGNED NOT NULL DEFAULT 0 AFTER `char_zone_id`,
+	DROP PRIMARY KEY,
+	ADD PRIMARY KEY (`id`),
+	ADD INDEX `charid_slotid` (`char_id`, `slot_id`);
 )"
 	}
 // -- template; copy/paste this when you need to create a new entry

common/database/database_update_manifest_bots.cpp

@@ -123,6 +123,33 @@ 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

common/database_instances.cpp

@@ -421,20 +421,25 @@ void Database::AssignGroupToInstance(uint32 group_id, uint32 instance_id)
 	auto zone_id = GetInstanceZoneID(instance_id);
 	auto version = GetInstanceVersion(instance_id);
 
-	auto l = GroupIdRepository::GetWhere(
+	const auto& l = GroupIdRepository::GetWhere(
 		*this,
 		fmt::format(
-			"groupid = {}",
+			"`group_id` = {}",
 			group_id
 		)
 	);
+
 	if (l.empty()) {
 		return;
 	}
 
 	for (const auto& e : l) {
-		if (!GetInstanceID(zone_id, e.charid, version)) {
-			AddClientToInstance(instance_id, e.charid);
+		if (!e.character_id) {
+			continue;
+		}
+
+		if (!GetInstanceID(zone_id, e.character_id, version)) {
+			AddClientToInstance(instance_id, e.character_id);
 		}
 	}
 }
@@ -504,7 +509,7 @@ void Database::FlagInstanceByRaidLeader(uint32 zone_id, int16 version, uint32 ch
 		return;
 	}
 
-	auto raid_leader_id = GetCharacterID(GetRaidLeaderName(raid_id));
+	auto raid_leader_id = GetCharacterID(GetRaidLeaderName(raid_id).c_str());
 	auto raid_leader_instance_id = GetInstanceID(zone_id, raid_leader_id, version);
 
 	if (!raid_leader_instance_id) {
@@ -570,3 +575,23 @@ 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);
+}

common/database_schema.h

@@ -59,6 +59,8 @@ namespace DatabaseSchema {
 			{"character_leadership_abilities", "id"},
 			{"character_material",             "id"},
 			{"character_memmed_spells",        "id"},
+			{"character_parcels",              "char_id"},
+			{"character_parcels_containers",   "id"},
 			{"character_pet_buffs",            "char_id"},
 			{"character_pet_info",             "char_id"},
 			{"character_pet_inventory",        "char_id"},
@@ -128,6 +130,8 @@ namespace DatabaseSchema {
 			"character_leadership_abilities",
 			"character_material",
 			"character_memmed_spells",
+			"character_parcels",
+			"character_parcels_containers",
 			"character_pet_buffs",
 			"character_pet_info",
 			"character_pet_inventory",
@@ -146,8 +150,10 @@ namespace DatabaseSchema {
 			"friends",
 			"guild_bank",
 			"guild_members",
+			"guild_permissions",
 			"guild_ranks",
 			"guild_relations",
+			"guild_tributes",
 			"guilds",
 			"instance_list_player",
 			"inventory",
@@ -332,7 +338,6 @@ namespace DatabaseSchema {
 			"group_leaders",
 			"instance_list",
 			"ip_exemptions",
-			"item_tick",
 			"lfguild",
 			"merc_buffs",
 			"merchantlist_temp",

common/deity.h

@@ -71,6 +71,8 @@ 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();

common/emu_constants.cpp

@@ -639,3 +639,100 @@ std::string EQ::constants::GetAppearanceTypeName(uint32 appearance_type)
 
 	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();
+}

common/emu_constants.h

@@ -401,6 +401,12 @@ namespace EQ
 		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;
@@ -556,6 +562,17 @@ 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,
@@ -597,6 +614,67 @@ 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
 {

common/emu_opcodes.h

@@ -45,6 +45,7 @@ typedef enum { //EQEmu internal opcodes list
 	_maxEmuOpcode
 } EmuOpcode;
 
+constexpr int format_as(EmuOpcode opcode) { return static_cast<int>(opcode); }
 extern const char *OpcodeNames[_maxEmuOpcode+1];
 
 #endif

common/emu_oplist.h

@@ -228,6 +228,7 @@ N(OP_GuildBank),
 N(OP_GuildBankItemList),
 N(OP_GuildCreate),
 N(OP_GuildDelete),
+N(OP_GuildDeleteGuild),
 N(OP_GuildDemote),
 N(OP_GuildInvite),
 N(OP_GuildInviteAccept),
@@ -239,15 +240,33 @@ 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_GuildUpdateURLAndChannel),
+N(OP_GuildUpdate),
+N(OP_GuildTributeDonateItem),
+N(OP_GuildTributeDonatePlat),
 N(OP_GuildWar),
 N(OP_Heartbeat),
 N(OP_Hide),
@@ -425,6 +444,7 @@ N(OP_ReqClientSpawn),
 N(OP_ReqNewZone),
 N(OP_RequestClientZoneChange),
 N(OP_RequestDuel),
+N(OP_RequestGuildTributes),
 N(OP_RequestKnowledgeBase),
 N(OP_RequestTitles),
 N(OP_RespawnWindow),
@@ -490,6 +510,11 @@ 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),
@@ -532,6 +557,7 @@ N(OP_TradeBusy),
 N(OP_TradeCoins),
 N(OP_TradeMoneyUpdate),
 N(OP_Trader),
+N(OP_TraderBulkSend),
 N(OP_TraderBuy),
 N(OP_TraderDelItem),
 N(OP_TradeRequest),

common/eq_constants.h

@@ -772,27 +772,47 @@ typedef enum {
 	FilterShowSelfOnly
 } eqFilterMode;
 
-#define	STAT_STR		0
-#define	STAT_STA		1
-#define	STAT_AGI		2
-#define	STAT_DEX		3
-#define	STAT_INT		4
-#define	STAT_WIS		5
-#define	STAT_CHA		6
-#define	STAT_MAGIC		7
-#define	STAT_COLD		8
-#define	STAT_FIRE		9
-#define	STAT_POISON		10
-#define	STAT_DISEASE		11
-#define	STAT_MANA		12
-#define	STAT_HP			13
-#define	STAT_AC			14
-#define STAT_ENDURANCE		15
-#define STAT_ATTACK		16
-#define STAT_HP_REGEN		17
-#define STAT_MANA_REGEN		18
-#define STAT_HASTE		19
-#define STAT_DAMAGE_SHIELD	20
+#define STAT_STR                 0
+#define STAT_STA                 1
+#define STAT_AGI                 2
+#define STAT_DEX                 3
+#define STAT_INT                 4
+#define STAT_WIS                 5
+#define STAT_CHA                 6
+#define STAT_MAGIC               7
+#define STAT_COLD                8
+#define STAT_FIRE                9
+#define STAT_POISON              10
+#define STAT_DISEASE             11
+#define STAT_MANA                12
+#define STAT_HP                  13
+#define STAT_AC                  14
+#define STAT_ENDURANCE           15
+#define STAT_ATTACK              16
+#define STAT_HP_REGEN            17
+#define STAT_MANA_REGEN          18
+#define STAT_HASTE               19
+#define STAT_DAMAGE_SHIELD       20
+#define STAT_DS_MITIGATION       22
+#define	STAT_HEAL_AMOUNT         23
+#define	STAT_SPELL_DAMAGE        24
+#define	STAT_CLAIRVOYANCE        25
+#define	STAT_HEROIC_AGILITY      26
+#define	STAT_HEROIC_CHARISMA     27
+#define	STAT_HEROIC_DEXTERITY    28
+#define	STAT_HEROIC_INTELLIGENCE 29
+#define	STAT_HEROIC_STAMINA      30
+#define	STAT_HEROIC_STRENGTH     31
+#define	STAT_HEROIC_WISDOM       32
+#define	STAT_BASH                33
+#define	STAT_BACKSTAB            34
+#define	STAT_DRAGON_PUNCH        35
+#define	STAT_EAGLE_STRIKE        36
+#define	STAT_FLYING_KICK         37
+#define STAT_KICK                38
+#define	STAT_ROUND_KICK          39
+#define STAT_TIGER_CLAW          40
+#define STAT_FRENZY              41
 
 /*
 **	Recast timer types. Used as an off set to charProfileStruct timers.
@@ -1127,4 +1147,26 @@ namespace RaidLootType {
 	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*/

common/eqemu_logsys.h

@@ -140,6 +140,8 @@ namespace Logs {
 		DataBuckets,
 		Zoning,
 		EqTime,
+		Corpses,
+		XTargets,
 		MaxCategoryID /* Don't Remove this */
 	};
 
@@ -239,6 +241,8 @@ namespace Logs {
 		"DataBuckets",
 		"Zoning",
 		"EqTime",
+		"Corpses",
+		"XTargets"
 	};
 }
 

common/eqemu_logsys_log_aliases.h

@@ -824,6 +824,26 @@
         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__);\

common/events/player_event_logs.cpp

@@ -642,6 +642,10 @@ void PlayerEventLogs::ProcessRetentionTruncation()
 void PlayerEventLogs::ReloadSettings()
 {
 	for (auto &e: PlayerEventLogSettingsRepository::All(*m_database)) {
+		if (e.id >= PlayerEvent::MAX || e.id < 0) {
+			continue;
+		}
+
 		m_settings[e.id] = e;
 	}
 }
@@ -697,6 +701,11 @@ 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;

common/events/player_events.h

@@ -56,6 +56,11 @@ 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
 	};
 
@@ -64,7 +69,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[PlayerEvent::MAX] = {
+	static const char *EventName[EventType::MAX] = {
 		"None",
 		"GM Command",
 		"Zoning",
@@ -112,7 +117,12 @@ namespace PlayerEvent {
 		"Killed NPC",
 		"Killed Named NPC",
 		"Killed Raid NPC",
-		"Item Creation"
+		"Item Creation",
+		"Guild Tribute Donate Item",
+		"Guild Tribute Donate Platinum",
+		"Parcel Item Sent",
+		"Parcel Item Retrieved",
+		"Parcel Prune Routine"
 	};
 
 	// Generic struct used by all events
@@ -942,6 +952,135 @@ 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

common/faction.h

@@ -24,17 +24,15 @@
 #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 {
@@ -75,23 +73,6 @@ 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

common/file.cpp

@@ -38,21 +38,21 @@
 #include <fmt/format.h>
 #include <filesystem>
 #include <iostream>
+#include <sys/stat.h>
 
 namespace fs = std::filesystem;
 
-/**
- * @param name
- * @return
- */
+
 bool File::Exists(const std::string &name)
 {
-	return fs::exists(fs::path{name});
+	struct stat sb{};
+	if (stat(name.c_str(), &sb) == 0) {
+		return true;
+	}
+
+	return false;
 }
 
-/**
- * @param directory_name
- */
 void File::Makedir(const std::string &directory_name)
 {
 	try {

common/guild_base.h

@@ -5,6 +5,42 @@
 #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;
 
@@ -12,22 +48,23 @@ 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.
@@ -38,21 +75,31 @@ class BaseGuildManager
 		virtual ~BaseGuildManager();
 
 		//this must be called before doing anything else with this object
-		void SetDatabase(Database *db)
+		BaseGuildManager * SetDatabase(Database *db)
 		{
 			m_db = db;
+
+			return this;
+		}
+
+		BaseGuildManager * SetContentDatabase(Database *db)
+		{
+			m_content_db = db;
+
+			return this;
 		}
 
 		bool LoadGuilds();
-		bool RefreshGuild(uint32 guild_id);
+		virtual bool RefreshGuild(uint32 guild_id);
 
 		//guild edit actions.
-		uint32	CreateGuild(const char* name, uint32 leader_char_id);
+		uint32	CreateGuild(std::string name, uint32 leader_char_id);
+		bool    StoreGuildDB(uint32 guild_id);
 		bool	DeleteGuild(uint32 guild_id);
-		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);
+		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);
 
 		//character edit actions
 		bool	SetGuildLeader(uint32 guild_id, uint32 leader_char_id);
@@ -62,9 +109,16 @@ class BaseGuildManager
 		bool	ForceRankUpdate(uint32 charid);
 		bool	GetAltFlag(uint32 CharID);
 		bool	SetAltFlag(uint32 charid, bool is_alt);
-		bool	GetBankerFlag(uint32 CharID);
+		bool	GetBankerFlag(uint32 CharID, bool compat_mode = false);
+		bool    GetGuildBankerStatus(uint32 guild_id, uint32 guild_rank);
 		bool	SetTributeFlag(uint32 charid, bool enabled);
-		bool	SetPublicNote(uint32 charid, const char *note);
+		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);
 
 		//queries
 		bool	GetCharInfo(const char *char_name, CharGuildInfo &into);
@@ -74,29 +128,24 @@ 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;
-		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);
+        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);
 
 	protected:
 		//the methods which must be defined by base classes.
@@ -105,58 +154,62 @@ class BaseGuildManager
 		virtual void SendRankUpdate(uint32 CharID) = 0;
 		virtual void SendGuildDelete(uint32 guild_id) = 0;
 
-		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);
+		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);
 		bool	QueryWithLogging(std::string query, const char *errmsg);
-//	void	DBSetPublicNote(uint32 guild_id,char* charname, char* note);
-
 		bool	LocalDeleteGuild(uint32 guild_id);
 
-		class RankInfo
+		struct RankInfo
 		{
-			public:
-				RankInfo();
-				std::string name;
-				bool permissions[_MaxGuildAction];
+			RankInfo();
+			std::string rank_name;
 		};
-		class GuildInfo
+		struct Functions
 		{
-			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];
+			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);
 
+	protected:
 		std::map<uint32, GuildInfo *> m_guilds;	//we own the pointers in this map
 		void ClearGuilds();	//clears internal structure
 
-		Database *m_db;	//we do not own this
+		Database *m_db;
+		Database *m_content_db;
 
 		bool _StoreGuildDB(uint32 guild_id);
-		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();
+		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);
 };
-
-
 #endif /*GUILD_BASE_H_*/
 
 

common/guilds.h

@@ -16,31 +16,71 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
-#ifndef GUILD_H
-#define GUILD_H
+#ifndef GUILDS_H
+#define GUILDS_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_RANK                     8 // 0-2 - some places in the code assume a single digit, dont go above 9
+#define GUILD_MAX_FUNCTIONS                30
+#define GUILD_TRIBUTES_MODIFY              1
+#define GUILD_TRIBUTES_SAVE                0
+#define GUILD_TRIBUTES_OFF                 0
+#define GUILD_TRIBUTES_ON                  1
+#define GUILD_INVITE_DECLINE               9
 
 //defines for standard ranks
-#define GUILD_MEMBER	0
-#define GUILD_OFFICER	1
-#define GUILD_LEADER	2
-#define GUILD_RANK_NONE (GUILD_MAX_RANK+1)
+#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
 
 typedef enum {
-	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
+	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,
 } GuildAction;
 
+constexpr int format_as(GuildAction action) { return static_cast<int>(action); }
+
 #endif

common/inventory_profile.cpp

@@ -173,7 +173,8 @@ EQ::ItemInstance* EQ::InventoryProfile::GetItem(int16 slot_id) const
 		result = _GetItem(m_inv, slot_id);
 	}
 	else if ((slot_id >= invslot::EQUIPMENT_BEGIN && slot_id <= invslot::EQUIPMENT_END) ||
-		(slot_id >= invslot::TRIBUTE_BEGIN && slot_id <= invslot::TRIBUTE_END)) {
+		(slot_id >= invslot::TRIBUTE_BEGIN && slot_id <= invslot::TRIBUTE_END) ||
+		(slot_id >= invslot::GUILD_TRIBUTE_BEGIN && slot_id <= invslot::GUILD_TRIBUTE_END)) {
 		// Equippable slots (on body)
 		result = _GetItem(m_worn, slot_id);
 	}
@@ -465,6 +466,10 @@ 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);
@@ -1419,6 +1424,10 @@ 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;

common/item_data.h

@@ -58,72 +58,75 @@ namespace EQ
 		};
 
 		enum ItemType : uint8 {
-/*9138*/	ItemType1HSlash = 0,
-/*9141*/	ItemType2HSlash,
-/*9140*/	ItemType1HPiercing,
-/*9139*/	ItemType1HBlunt,
-/*9142*/	ItemType2HBlunt,
-/*5504*/	ItemTypeBow, // 5
-/*----*/	ItemTypeUnknown1,
-/*----*/	ItemTypeLargeThrowing,
-/*5505*/	ItemTypeShield,
-/*5506*/	ItemTypeScroll,
-/*5507*/	ItemTypeArmor, // 10
-/*5508*/	ItemTypeMisc,			// a lot of random crap has this item use.
-/*7564*/	ItemTypeLockPick,
-/*----*/	ItemTypeUnknown2,
-/*5509*/	ItemTypeFood,
-/*5510*/	ItemTypeDrink, // 15
-/*5511*/	ItemTypeLight,
-/*5512*/	ItemTypeCombinable,		// not all stackable items are this use...
-/*5513*/	ItemTypeBandage,
-/*----*/	ItemTypeSmallThrowing,
-/*----*/	ItemTypeSpell, // 20	// spells and tomes
-/*5514*/	ItemTypePotion,
-/*----*/	ItemTypeUnknown3,
-/*0406*/	ItemTypeWindInstrument,
-/*0407*/	ItemTypeStringedInstrument,
-/*0408*/	ItemTypeBrassInstrument, // 25
-/*0405*/	ItemTypePercussionInstrument,
-/*5515*/	ItemTypeArrow,
-/*----*/	ItemTypeUnknown4,
-/*5521*/	ItemTypeJewelry,
-/*----*/	ItemTypeSkull, // 30
-/*5516*/	ItemTypeBook,			// skill-up tomes/books? (would probably need a pp flag if true...)
-/*5517*/	ItemTypeNote,
-/*5518*/	ItemTypeKey,
-/*----*/	ItemTypeCoin,
-/*5520*/	ItemType2HPiercing, // 35
-/*----*/	ItemTypeFishingPole,
-/*----*/	ItemTypeFishingBait,
-/*5519*/	ItemTypeAlcohol,
-/*----*/	ItemTypeKey2,			// keys and satchels?? (questable keys?)
-/*----*/	ItemTypeCompass, // 40
-/*----*/	ItemTypeUnknown5,
-/*----*/	ItemTypePoison,			// might be wrong, but includes poisons
-/*----*/	ItemTypeUnknown6,
-/*----*/	ItemTypeUnknown7,
-/*5522*/	ItemTypeMartial, // 45
-/*----*/	ItemTypeUnknown8,
-/*----*/	ItemTypeUnknown9,
-/*----*/	ItemTypeUnknown10,
-/*----*/	ItemTypeUnknown11,
-/*----*/	ItemTypeSinging, // 50
-/*5750*/	ItemTypeAllInstrumentTypes,
-/*5776*/	ItemTypeCharm,
-/*----*/	ItemTypeDye,
-/*----*/	ItemTypeAugmentation,
-/*----*/	ItemTypeAugmentationSolvent, // 55
-/*----*/	ItemTypeAugmentationDistiller,
-/*----*/	ItemTypeUnknown12,
-/*----*/	ItemTypeFellowshipKit,
-/*----*/	ItemTypeUnknown13,
-/*----*/	ItemTypeRecipe, // 60
-/*----*/	ItemTypeAdvancedRecipe,
-/*----*/	ItemTypeJournal,		// only one(1) database entry
-/*----*/	ItemTypeAltCurrency,	// alt-currency (as opposed to coinage)
-/*5881*/	ItemTypePerfectedAugmentationDistiller,
-/*----*/	ItemTypeCount
+			/*9138*/ ItemType1HSlash = 0,
+			/*9141*/ ItemType2HSlash,
+			/*9140*/ ItemType1HPiercing,
+			/*9139*/ ItemType1HBlunt,
+			/*9142*/ ItemType2HBlunt,
+			/*5504*/ ItemTypeBow,                 // 5
+			/*----*/ ItemTypeUnknown1,
+			/*----*/ ItemTypeLargeThrowing,
+			/*5505*/ ItemTypeShield,
+			/*5506*/ ItemTypeScroll,
+			/*5507*/ ItemTypeArmor,               // 10
+			/*5508*/ ItemTypeMisc,                // a lot of random crap has this item use.
+			/*7564*/ ItemTypeLockPick,
+			/*----*/ ItemTypeUnknown2,
+			/*5509*/ ItemTypeFood,
+			/*5510*/ ItemTypeDrink,               // 15
+			/*5511*/ ItemTypeLight,
+			/*5512*/ ItemTypeCombinable,          // not all stackable items are this use...
+			/*5513*/ ItemTypeBandage,
+			/*----*/ ItemTypeSmallThrowing,
+			/*----*/ ItemTypeSpell,               // 20	// spells and tomes
+			/*5514*/ ItemTypePotion,
+			/*----*/ ItemTypeUnknown3,
+			/*0406*/ ItemTypeWindInstrument,
+			/*0407*/ ItemTypeStringedInstrument,
+			/*0408*/ ItemTypeBrassInstrument,     // 25
+			/*0405*/ ItemTypePercussionInstrument,
+			/*5515*/ ItemTypeArrow,
+			/*----*/ ItemTypeUnknown4,
+			/*5521*/ ItemTypeJewelry,
+			/*----*/ ItemTypeSkull,               // 30
+			/*5516*/ ItemTypeBook,                // skill-up tomes/books? (would probably need a pp flag if true...)
+			/*5517*/ ItemTypeNote,
+			/*5518*/ ItemTypeKey,
+			/*----*/ ItemTypeCoin,
+			/*5520*/ ItemType2HPiercing,          // 35
+			/*----*/ ItemTypeFishingPole,
+			/*----*/ ItemTypeFishingBait,
+			/*5519*/ ItemTypeAlcohol,
+			/*----*/ ItemTypeKey2,                // keys and satchels?? (questable keys?)
+			/*----*/ ItemTypeCompass,             // 40
+			/*----*/ ItemTypeUnknown5,
+			/*----*/ ItemTypePoison,              // might be wrong, but includes poisons
+			/*----*/ ItemTypeUnknown6,
+			/*----*/ ItemTypeUnknown7,
+			/*5522*/ ItemTypeMartial,             // 45
+			/*----*/ ItemTypeAllEffects,
+			/*----*/ ItemTypeUnknown9,
+			/*----*/ ItemTypeUnknown10,
+			/*----*/ ItemTypeFocusEffect,
+			/*----*/ ItemTypeSinging,             // 50
+			/*5750*/ ItemTypeAllInstrumentTypes,
+			/*5776*/ ItemTypeCharm,
+			/*----*/ ItemTypeDye,
+			/*----*/ ItemTypeAugmentation,
+			/*----*/ ItemTypeAugmentationSolvent, // 55
+			/*----*/ ItemTypeAugmentationDistiller,
+			/*----*/ ItemTypeAlternateAbility,
+			/*----*/ ItemTypeFellowshipKit,
+			/*----*/ ItemTypeUnknown13,
+			/*----*/ ItemTypeRecipe,              // 60
+			/*----*/ ItemTypeAdvancedRecipe,
+			/*----*/ ItemTypeJournal,             // only one(1) database entry
+			/*----*/ ItemTypeAltCurrency,         // alt-currency (as opposed to coinage)
+			/*5881*/ ItemTypePerfectedAugmentationDistiller,
+			/*----*/ ItemTypeCount,
+			/*----*/ ItemTypeCollectible,
+			/*----*/ ItemTypeContainer,
+			/*----*/ ItemTypeAll     = 0xFF
 
 /*
 			Unknowns:

common/item_instance.cpp

@@ -1791,6 +1791,163 @@ 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;
+}
+
+int EQ::ItemInstance::GetItemRegen(bool augments) const
+{
+	int        stat = 0;
+	const auto item = GetItem();
+	if (item) {
+		stat = item->Regen;
+		if (augments) {
+			for (int i = invaug::SOCKET_BEGIN; i <= invaug::SOCKET_END; ++i) {
+				if (GetAugment(i)) {
+					stat += GetAugment(i)->GetItemRegen();
+				}
+			}
+		}
+	}
+	return stat;
+}
+
+int EQ::ItemInstance::GetItemManaRegen(bool augments) const
+{
+	int        stat = 0;
+	const auto item = GetItem();
+	if (item) {
+		stat = item->ManaRegen;
+		if (augments) {
+			for (int i = invaug::SOCKET_BEGIN; i <= invaug::SOCKET_END; ++i) {
+				if (GetAugment(i)) {
+					stat += GetAugment(i)->GetItemManaRegen();
+				}
+			}
+		}
+	}
+	return stat;
+}
+
+int EQ::ItemInstance::GetItemDamageShield(bool augments) const
+{
+	int        stat = 0;
+	const auto item = GetItem();
+	if (item) {
+		stat = item->DamageShield;
+		if (augments) {
+			for (int i = invaug::SOCKET_BEGIN; i <= invaug::SOCKET_END; ++i) {
+				if (GetAugment(i)) {
+					stat += GetAugment(i)->GetItemDamageShield();
+				}
+			}
+		}
+	}
+	return stat;
+}
+
+int EQ::ItemInstance::GetItemDSMitigation(bool augments) const
+{
+	int        stat = 0;
+	const auto item = GetItem();
+	if (item) {
+		stat = item->DSMitigation;
+		if (augments) {
+			for (int i = invaug::SOCKET_BEGIN; i <= invaug::SOCKET_END; ++i) {
+				if (GetAugment(i)) {
+					stat += GetAugment(i)->GetItemDSMitigation();
+				}
+			}
+		}
+	}
+	return stat;
+}
+
+int EQ::ItemInstance::GetItemHealAmt(bool augments) const
+{
+	int        stat = 0;
+	const auto item = GetItem();
+	if (item) {
+		stat = item->HealAmt;
+		if (augments) {
+			for (int i = invaug::SOCKET_BEGIN; i <= invaug::SOCKET_END; ++i) {
+				if (GetAugment(i)) {
+					stat += GetAugment(i)->GetItemHealAmt();
+				}
+			}
+		}
+	}
+	return stat;
+}
+
+int EQ::ItemInstance::GetItemSpellDamage(bool augments) const
+{
+	int        stat = 0;
+	const auto item = GetItem();
+	if (item) {
+		stat = item->SpellDmg;
+		if (augments) {
+			for (int i = invaug::SOCKET_BEGIN; i <= invaug::SOCKET_END; ++i) {
+				if (GetAugment(i)) {
+					stat += GetAugment(i)->GetItemSpellDamage();
+				}
+			}
+		}
+	}
+	return stat;
+}
+
+int EQ::ItemInstance::GetItemClairvoyance(bool augments) const
+{
+	int        stat = 0;
+	const auto item = GetItem();
+	if (item) {
+		stat = item->Clairvoyance;
+		if (augments) {
+			for (int i = invaug::SOCKET_BEGIN; i <= invaug::SOCKET_END; ++i) {
+				if (GetAugment(i)) {
+					stat += GetAugment(i)->GetItemClairvoyance();
+				}
+			}
+		}
+	}
+	return stat;
+}
+
+int EQ::ItemInstance::GetItemSkillsStat(EQ::skills::SkillType skill, bool augments) const
+{
+	int        stat = 0;
+	const auto item = GetItem();
+	if (item) {
+		stat = item->ExtraDmgSkill == skill ? item->ExtraDmgAmt : 0;
+		if (augments) {
+			for (int i = invaug::SOCKET_BEGIN; i <= invaug::SOCKET_END; ++i) {
+				if (GetAugment(i)) {
+					stat += GetAugment(i)->GetItemSkillsStat(skill);
+				}
+			}
+		}
+	}
+	return stat;
+}
+
 //
 // class EvolveInfo
 //

common/item_instance.h

@@ -270,6 +270,7 @@ namespace EQ
 		int GetItemMagical(bool augments = false) const;
 		int GetItemHP(bool augments = false) const;
 		int GetItemMana(bool augments = false) const;
+		int GetItemManaRegen(bool augments = false) const;
 		int GetItemEndur(bool augments = false) const;
 		int GetItemAttack(bool augments = false) const;
 		int GetItemStr(bool augments = false) const;
@@ -299,6 +300,15 @@ namespace EQ
 		int GetItemHeroicDR(bool augments = false) const;
 		int GetItemHeroicCorrup(bool augments = false) const;
 		int GetItemHaste(bool augments = false) const;
+		int GetItemRegen(bool augments = false) const;
+		int GetItemDamageShield(bool augments = false) const;
+		int GetItemDSMitigation(bool augments = false) const;
+		int GetItemHealAmt(bool augments = false) const;
+		int GetItemSpellDamage(bool augments = false) const;
+		int GetItemClairvoyance(bool augments = false) const;
+		int GetItemSkillsStat(EQ::skills::SkillType skill, bool augments = false) const;
+		uint32 GetItemGuildFavor() const;
+		std::vector<uint32> GetAugmentIDs() const;
 
 	protected:
 		//////////////////////////

common/loot.h

@@ -0,0 +1,33 @@
+#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

common/loottable.h

@@ -1,68 +0,0 @@
-/*	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

common/patches/rof.cpp

@@ -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
-				}
-
+				//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);
 				PutFieldN(time_last_on);
 				PutFieldN(tribute_enable);
 				e->unknown01 = 0;
@@ -3051,19 +3051,12 @@ namespace RoF
 		ENCODE_LENGTH_EXACT(GuildSetRank_Struct);
 		SETUP_DIRECT_ENCODE(GuildSetRank_Struct, structs::GuildSetRank_Struct);
 
-		eq->GuildID = emu->Unknown00;
+		eq->guild_id = emu->Unknown00;
+		eq->rank = emu->rank;
 
-		/* 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;
+		memcpy(eq->member_name, emu->member_name, sizeof(eq->member_name));
+		OUT(banker);
+		eq->unknown76 = 1;
 
 		FINISH_ENCODE();
 	}
@@ -3096,21 +3089,6 @@ 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);
@@ -3516,14 +3494,13 @@ namespace RoF
 			ENCODE_LENGTH_EXACT(ClickTrader_Struct);
 			SETUP_DIRECT_ENCODE(ClickTrader_Struct, structs::ClickTrader_Struct);
 
-			eq->Code = emu->Code;
-			// Live actually has 200 items now, but 80 is the most our internal struct supports
-			for (uint32 i = 0; i < 200; i++)
+			eq->Code = emu->action;
+			for (uint32 i = 0; i < RoF::invtype::BAZAAR_SIZE; i++)
 			{
 				strncpy(eq->items[i].SerialNumber, "0000000000000000", sizeof(eq->items[i].SerialNumber));
 				eq->items[i].Unknown18 = 0;
 				if (i < 80) {
-					eq->ItemCost[i] = emu->ItemCost[i];
+					eq->ItemCost[i] = emu->item_cost[i];
 				}
 				else {
 					eq->ItemCost[i] = 0;
@@ -3537,9 +3514,9 @@ namespace RoF
 			ENCODE_LENGTH_EXACT(Trader_ShowItems_Struct);
 			SETUP_DIRECT_ENCODE(Trader_ShowItems_Struct, structs::Trader_ShowItems_Struct);
 
-			eq->Code = emu->Code;
+			eq->Code = emu->action;
 			strncpy(eq->SerialNumber, "0000000000000000", sizeof(eq->SerialNumber));
-			eq->TraderID = emu->TraderID;
+			eq->TraderID = emu->entity_id;
 			eq->Stacksize = 0;
 			eq->Price = 0;
 
@@ -3565,13 +3542,13 @@ namespace RoF
 		ENCODE_LENGTH_EXACT(TraderBuy_Struct);
 		SETUP_DIRECT_ENCODE(TraderBuy_Struct, structs::TraderBuy_Struct);
 
-		OUT(Action);
-		OUT(Price);
-		OUT(TraderID);
-		memcpy(eq->ItemName, emu->ItemName, sizeof(eq->ItemName));
-		OUT(ItemID);
-		OUT(Quantity);
-		OUT(AlreadySold);
+		OUT(action);
+		OUT(price);
+		OUT(trader_id);
+		memcpy(eq->item_name, emu->item_name, sizeof(eq->item_name));
+		OUT(item_id);
+		OUT(quantity);
+		OUT(already_sold);
 
 		FINISH_ENCODE();
 	}
@@ -3973,10 +3950,22 @@ 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;
+					}  //
 				}
 			}
 
@@ -5042,19 +5031,6 @@ 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;
@@ -5064,12 +5040,11 @@ namespace RoF
 			SETUP_DIRECT_DECODE(ClickTrader_Struct, structs::ClickTrader_Struct);
 			MEMSET_IN(ClickTrader_Struct);
 
-			emu->Code = eq->Code;
-			// Live actually has 200 items now, but 80 is the most our internal struct supports
-			for (uint32 i = 0; i < 80; i++)
+			emu->action = eq->Code;
+			for (uint32 i = 0; i < RoF::invtype::BAZAAR_SIZE; i++)
 			{
-				emu->SerialNumber[i] = 0;	// eq->SerialNumber[i];
-				emu->ItemCost[i] = eq->ItemCost[i];
+				emu->serial_number[i] = 0;    // eq->SerialNumber[i];
+				emu->item_cost[i]     = eq->ItemCost[i];
 			}
 
 			FINISH_DIRECT_DECODE();
@@ -5080,8 +5055,8 @@ namespace RoF
 			SETUP_DIRECT_DECODE(Trader_ShowItems_Struct, structs::Trader_ShowItems_Struct);
 			MEMSET_IN(Trader_ShowItems_Struct);
 
-			emu->Code = eq->Code;
-			emu->TraderID = eq->TraderID;
+			emu->action = eq->Code;
+			emu->entity_id = eq->TraderID;
 
 			FINISH_DIRECT_DECODE();
 		}
@@ -5103,12 +5078,12 @@ namespace RoF
 		SETUP_DIRECT_DECODE(TraderBuy_Struct, structs::TraderBuy_Struct);
 		MEMSET_IN(TraderBuy_Struct);
 
-		IN(Action);
-		IN(Price);
-		IN(TraderID);
-		memcpy(emu->ItemName, eq->ItemName, sizeof(emu->ItemName));
-		IN(ItemID);
-		IN(Quantity);
+		IN(action);
+		IN(price);
+		IN(trader_id);
+		memcpy(emu->item_name, eq->item_name, sizeof(emu->item_name));
+		IN(item_id);
+		IN(quantity);
 
 		FINISH_DIRECT_DECODE();
 	}

common/patches/rof2_limits.h

@@ -158,6 +158,7 @@ namespace RoF2
 				slotCursor
 			};
 
+			constexpr int16 format_as(InventorySlots slot) { return static_cast<int16>(slot); }
 		} // namespace enum_
 		using namespace enum_;
 
@@ -270,6 +271,7 @@ namespace RoF2
 		const size_t CHARACTER_CREATION_LIMIT = 12;
 
 		const size_t SAY_LINK_BODY_SIZE = 56;
+		const uint32 MAX_GUILD_ID       = 50000;
 
 	} /*constants*/
 

common/patches/rof2_ops.h

@@ -43,6 +43,7 @@ E(OP_ApplyPoison)
 E(OP_AugmentInfo)
 E(OP_Barter)
 E(OP_BazaarSearch)
+E(OP_BecomeTrader)
 E(OP_BeginCast)
 E(OP_BlockedBuffs)
 E(OP_Buff)
@@ -82,6 +83,7 @@ E(OP_GuildBank)
 E(OP_GuildMemberList)
 E(OP_GuildMemberUpdate)
 E(OP_GuildsList)
+E(OP_GuildTributeDonateItem)
 E(OP_HPUpdate)
 E(OP_Illusion)
 E(OP_InspectBuffs)
@@ -115,7 +117,6 @@ 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_GuildBank)
 D(OP_GuildDemote)
 D(OP_GuildRemove)
 D(OP_GuildStatus)
+D(OP_GuildTributeDonateItem)
 D(OP_InspectRequest)
 D(OP_ItemLinkClick)
 D(OP_ItemVerifyRequest)
@@ -198,7 +200,7 @@ D(OP_Save)
 D(OP_SetServerFilter)
 D(OP_ShopPlayerBuy)
 D(OP_ShopPlayerSell)
-D(OP_ShopRequest)
+D(OP_ShopSendParcel)
 D(OP_Trader)
 D(OP_TraderBuy)
 D(OP_TradeSkillCombine)

common/patches/rof2_structs.h

@@ -2011,6 +2011,31 @@ 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
@@ -2222,15 +2247,17 @@ struct TimeOfDay_Struct {
 };
 
 // Darvik: shopkeeper structs
-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*/
+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*/
 };
+
 /*
 Unknowns:
 0 is e7 from 01 to // MAYBE SLOT IN PURCHASE
@@ -3079,28 +3106,43 @@ struct EnvDamage2_Struct {
 };
 
 //Bazaar Stuff
+enum RoF2BazaarTraderBuyerActions {
+	Zero            = 0,
+	BeginTraderMode = 1,
+	EndTraderMode   = 2,
+	PriceUpdate     = 3,
+	EndTransaction  = 4,
+	BazaarSearch    = 7,
+	WelcomeMessage  = 9,
+	BuyTraderItem   = 10,
+	ListTraderItems = 11,
+	BazaarInspect   = 18,
+	ClickTrader     = 28,
+	ItemMove        = 19,
+	ReconcileItems  = 20
+};
 
 enum {
-	BazaarTrader_StartTraderMode = 1,
-	BazaarTrader_EndTraderMode = 2,
-	BazaarTrader_UpdatePrice = 3,
-	BazaarTrader_EndTransaction = 4,
-	BazaarSearchResults = 7,
-	BazaarWelcome = 9,
-	BazaarBuyItem = 10,
-	BazaarTrader_ShowItems = 11,
-	BazaarSearchDone = 12,
+	BazaarTrader_StartTraderMode  = 1,
+	BazaarTrader_EndTraderMode    = 2,
+	BazaarTrader_UpdatePrice      = 3,
+	BazaarTrader_EndTransaction   = 4,
+	BazaarSearchResults           = 7,
+	BazaarWelcome                 = 9,
+	BazaarBuyItem                 = 10,
+	BazaarTrader_ShowItems        = 11,
+	BazaarSearchDone              = 12,
 	BazaarTrader_CustomerBrowsing = 13,
-	BazaarInspectItem = 18,
-	BazaarSearchDone2 = 19,
+	BazaarInspectItem             = 18,
+	BazaarSearchDone2             = 19,
 	BazaarTrader_StartTraderMode2 = 22
 };
 
 enum {
-	BazaarPriceChange_Fail = 0,
+	BazaarPriceChange_Fail        = 0,
 	BazaarPriceChange_UpdatePrice = 1,
-	BazaarPriceChange_RemoveItem = 2,
-	BazaarPriceChange_AddItem = 3
+	BazaarPriceChange_RemoveItem  = 2,
+	BazaarPriceChange_AddItem     = 3
 };
 
 struct BazaarWindowStart_Struct {
@@ -3109,34 +3151,51 @@ struct BazaarWindowStart_Struct {
 	uint16  Unknown002;
 };
 
+struct BazaarDeliveryCost_Struct {
+	uint32 action;
+	uint32 voucher_delivery_cost;
+	float  parcel_deliver_cost; //percentage of item cost
+	uint32 unknown_010;
+};
 
 struct BazaarWelcome_Struct {
-	uint32 Code;
-	uint32 EntityID;
-	uint32 Traders;
-	uint32 Items;
-	uint32 Traders2;
-	uint32 Items2;
+	uint32 action;
+	uint32 unknown_004;
+	uint32 num_of_traders;
+	uint32 num_of_items;
 };
 
 struct BazaarSearch_Struct {
-	BazaarWindowStart_Struct Beginning;
-	uint32	TraderID;
-	uint32	Class_;
-	uint32	Race;
-	uint32	ItemStat;
-	uint32	Slot;
-	uint32	Type;
-	char	Name[64];
-	uint32	MinPrice;
-	uint32	MaxPrice;
-	uint32	Minlevel;
-	uint32	MaxLlevel;
+/*000*/ uint32 action;
+/*004*/ uint8  search_scope;//1 all traders 0 local traders
+/*005*/ uint8  unknown_005{0};
+/*006*/ uint16 unknown_006{0};
+/*008*/ uint32 unknown_008{0};
+/*012*/ uint32 unknown_012{0};
+/*016*/ uint32 trader_id;
+/*020*/ uint32 _class;
+/*024*/ uint32 race;
+/*028*/ uint32 item_stat;
+/*032*/ uint32 slot;
+/*036*/ uint32 type;
+/*040*/ char   item_name[64];
+/*104*/ uint32 min_cost;
+/*108*/ uint32 max_cost;
+/*112*/ uint32 min_level;
+/*116*/ uint32 max_level;
+/*120*/ uint32 max_results;
+/*124*/ uint32 prestige;
+/*128*/ uint32 augment;
 };
-struct BazaarInspect_Struct{
-	uint32 ItemID;
-	uint32 Unknown004;
-	char Name[64];
+
+struct BazaarInspect_Struct {
+	uint32 action;
+	uint32 unknown_004;
+	uint32 trader_id;
+	char   serial_number[17];
+	char   unknown_029[3];
+	uint32 item_id;
+	uint32 unknown_036;
 };
 
 struct NewBazaarInspect_Struct {
@@ -3157,18 +3216,23 @@ struct BazaarReturnDone_Struct{
 	uint32 Unknown016;
 };
 
-struct BazaarSearchResults_Struct {
-/*000*/	BazaarWindowStart_Struct Beginning;
-/*004*/	uint32	SellerID;
-/*008*/	char	SellerName[64];
-/*072*/	uint32	NumItems;
-/*076*/	uint32	ItemID;
-/*080*/	uint32	SerialNumber;
-/*084*/	uint32	Unknown084;
-/*088*/	char	ItemName[64];
-/*152*/	uint32	Cost;
-/*156*/	uint32	ItemStat;
-/*160*/
+struct BazaarSearchDetails_Struct { //24+name+17
+/*014*/	uint32	trader_id;
+/*018*/	char	serial_num[17];
+/*022*/	uint32	cost;
+/*026*/	uint32	quanity;
+/*030*/	uint32	id;
+/*034*/	uint32	icon;
+/*038*/	char	name[1];
+/*039*/	uint32	stat;
+};
+
+struct BazaarSearchResults_Struct { //14
+/*000*/    uint32                     unknown000;
+/*004*/    uint16                     zone_id;
+/*006*/    uint32                     entity_id;
+/*010*/    uint32                     num_items;
+/*014*/    BazaarSearchDetails_Struct items[];
 };
 
 struct ServerSideFilters_Struct {
@@ -3371,21 +3435,26 @@ struct	WhoAllPlayerPart4 {
 };
 
 struct TraderItemSerial_Struct {
-	char	SerialNumber[17];
-	uint8	Unknown18;
+	char	serial_number[17];
+	uint8	unknown_018;
+
+	void operator=(uint32 a) {
+		auto _tmp = fmt::format("{:016}", a);
+		strn0cpy(this->serial_number, _tmp.c_str(), sizeof(this->serial_number));
+	}
 };
 
-struct Trader_Struct {
-/*0000*/	uint32	Code;
-/*0004*/	TraderItemSerial_Struct	items[200];
-/*3604*/	uint32	ItemCost[200];
+struct BeginTrader_Struct {
+/*0000*/    uint32                  action;
+/*0004*/    TraderItemSerial_Struct items[200];
+/*3604*/    uint32                  item_cost[200];
 /*4404*/
 };
 
 struct ClickTrader_Struct {
-/*0000*/	uint32	Code;
-/*0004*/	TraderItemSerial_Struct	items[200];
-/*3604*/	uint32	ItemCost[200];
+/*0000*/    uint32                  action;
+/*0004*/    TraderItemSerial_Struct items[200];
+/*3604*/    uint32                  item_cost[200];
 /*4404*/
 };
 
@@ -3394,67 +3463,55 @@ struct GetItems_Struct {
 };
 
 struct BecomeTrader_Struct {
-	uint32 id;
-	uint32 code;
+	uint32 entity_id;
+	uint32 action;
+};
+
+struct BazaarWindowRemoveTrader_Struct {
+	uint32 action;
+	uint32 trader_id;
+};
+
+struct TraderPriceUpdate_Struct {
+	uint32 action;
+	char   serial_number[17];
+	char   unknown_021[3];
+	uint32 unknown_024;
+	uint32 new_price;
 };
 
 struct Trader_ShowItems_Struct {
-	/*000*/	uint32 Code;
-	/*004*/	uint16 TraderID;
-	/*008*/	uint32 Unknown08;
-	/*012*/
-};
-
-struct Trader_ShowItems_Struct_WIP {
-/*000*/	uint32 Code;
-/*004*/	char   SerialNumber[17];
-/*021*/	uint8  Unknown21;
-/*022*/	uint16 TraderID;
-/*026*/	uint32 Stacksize;
-/*030*/	uint32 Price;
-/*032*/
+/*000*/	uint32 action;
+/*004*/	uint32 entity_id;
+/*008*/	uint32 unknown_008;
+/*012*/
 };
 
 struct TraderStatus_Struct {
-/*000*/	uint32 Code;
-/*004*/	uint32 Uknown04;
-/*008*/	uint32 Uknown08;
+/*000*/	uint32 action;
+/*004*/	uint32 sub_action;
+/*008*/	uint32 uknown_008;
 /*012*/
 };
 
 struct TraderBuy_Struct {
-	/*000*/ uint32	Action;
-	/*004*/	uint32	Unknown004;
-	/*008*/ uint32	Unknown008;
-	/*012*/	uint32	Unknown012;
-	/*016*/ uint32	TraderID;
-	/*020*/ char	BuyerName[64];
-	/*084*/ char	SellerName[64];
-	/*148*/ char	Unknown148[32];
-	/*180*/ char	ItemName[64];
-	/*244*/ char	SerialNumber[16];
-	/*260*/ uint32	Unknown076;
-	/*264*/ uint32	ItemID;
-	/*268*/ uint32	Price;
-	/*272*/ uint32	AlreadySold;
-	/*276*/ uint32	Unknown276;
-	/*280*/ uint32	Quantity;
-	/*284*/
-};
-
-struct TraderBuy_Struct_OLD {
-/*000*/ uint32   Action;
-/*004*/	uint32	Unknown004;
-/*008*/ uint32   Price;
-/*012*/	uint32	Unknown008;	// Probably high order bits of a 64 bit price.
-/*016*/ uint32   TraderID;
-/*020*/ char    ItemName[64];
-/*084*/ uint32   Unknown076;
-/*088*/ uint32   ItemID;
-/*092*/ uint32   AlreadySold;
-/*096*/ uint32   Quantity;
-/*100*/ uint32   Unknown092;
-/*104*/
+/*000*/ uint32	action;
+/*004*/	uint32	method;
+/*008*/ uint32	sub_action;
+/*012*/	uint32	unknown_012;
+/*016*/ uint32	trader_id;
+/*020*/ char	buyer_name[64];
+/*084*/ char	seller_name[64];
+/*148*/ char	unknown_148[32];
+/*180*/ char	item_name[64];
+/*244*/ char	serial_number[17];
+/*261*/ char	unknown_261[3];
+/*264*/ uint32	item_id;
+/*268*/ uint32	price;
+/*272*/ uint32	already_sold;
+/*276*/ uint32	unknown_276;
+/*280*/ uint32	quantity;
+/*284*/
 };
 
 struct TraderItemUpdate_Struct{
@@ -3475,15 +3532,15 @@ struct MoneyUpdate_Struct{
 struct TraderDelItem_Struct{
 	/*000*/ uint32 Unknown000;
 	/*004*/ uint32 TraderID;
-	/*008*/ char   SerialNumber[16];
+	/*008*/ char   SerialNumber[17];
 	/*024*/ uint32 Unknown012;
 	/*028*/
 };
 
 struct TraderClick_Struct{
-	/*000*/	uint32 Code;
-	/*004*/	uint32 TraderID;
-	/*008*/	uint32 Approval;
+	/*000*/	uint32 action;
+	/*004*/	uint32 trader_id;
+	/*008*/	uint32 unknown_008;
 	/*012*/
 };
 
@@ -3600,11 +3657,11 @@ struct GuildMakeLeader {
 // Update a guild members rank and banker status
 struct GuildSetRank_Struct
 {
-/*00*/	uint32	GuildID;	// Was Unknown00
-/*04*/	uint32	Rank;
-/*08*/	char	MemberName[64];
-/*72*/	uint32	Banker;
-/*76*/	uint32	Unknown76;	// Seen 1 - Maybe Banker?
+/*00*/	uint32	guild_id;	// Was Unknown00
+/*04*/	uint32	rank;
+/*08*/	char	member_name[64];
+/*72*/	uint32	banker;
+/*76*/	uint32	unknown76;	// Seen 1 - Maybe Banker?
 /*80*/
 };
 
@@ -3722,15 +3779,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;
 };
 
 
@@ -4547,25 +4604,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 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;
+    /*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;
 };
 
 struct EvolvingItem {
@@ -5236,6 +5293,18 @@ 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*/

common/patches/rof_ops.h

@@ -101,7 +101,6 @@ E(OP_SendZonepoints)
 E(OP_SetGuildRank)
 E(OP_ShopPlayerBuy)
 E(OP_ShopPlayerSell)
-E(OP_ShopRequest)
 E(OP_SkillUpdate)
 E(OP_SomeItemPacketMaybe)
 E(OP_SpawnAppearance)
@@ -183,7 +182,6 @@ D(OP_Save)
 D(OP_SetServerFilter)
 D(OP_ShopPlayerBuy)
 D(OP_ShopPlayerSell)
-D(OP_ShopRequest)
 D(OP_Trader)
 D(OP_TraderBuy)
 D(OP_TradeSkillCombine)

common/patches/rof_structs.h

@@ -2200,15 +2200,17 @@ struct TimeOfDay_Struct {
 };
 
 // Darvik: shopkeeper structs
-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*/
+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*/
 };
+
 /*
 Unknowns:
 0 is e7 from 01 to // MAYBE SLOT IN PURCHASE
@@ -3374,17 +3376,17 @@ struct TraderStatus_Struct {
 };
 
 struct TraderBuy_Struct {
-/*000*/ uint32   Action;
-/*004*/	uint32	Unknown004;
-/*008*/ uint32   Price;
-/*012*/	uint32	Unknown008;	// Probably high order bits of a 64 bit price.
-/*016*/ uint32   TraderID;
-/*020*/ char    ItemName[64];
-/*084*/ uint32   Unknown076;
-/*088*/ uint32   ItemID;
-/*092*/ uint32   AlreadySold;
-/*096*/ uint32   Quantity;
-/*100*/ uint32   Unknown092;
+/*000*/ uint32  action;
+/*004*/	uint32	unknown_004;
+/*008*/ uint32  price;
+/*012*/	uint32	unknown_008;	// Probably high order bits of a 64 bit price.
+/*016*/ uint32  trader_id;
+/*020*/ char    item_name[64];
+/*084*/ uint32  unknown_076;
+/*088*/ uint32  item_id;
+/*092*/ uint32  already_sold;
+/*096*/ uint32  quantity;
+/*100*/ uint32  unknown_092;
 /*104*/
 };
 
@@ -3537,11 +3539,11 @@ struct GuildMakeLeader {
 // Update a guild members rank and banker status
 struct GuildSetRank_Struct
 {
-/*00*/	uint32	GuildID;	// Was Unknown00
-/*04*/	uint32	Rank;
-/*08*/	char	MemberName[64];
-/*72*/	uint32	Banker;
-/*76*/	uint32	Unknown76;	// Seen 1 - Maybe Banker?
+/*00*/	uint32	guild_id;	// Was Unknown00
+/*04*/	uint32	rank;
+/*08*/	char	member_name[64];
+/*72*/	uint32	banker;
+/*76*/	uint32	unknown76;	// Seen 1 - Maybe Banker?
 /*80*/
 };
 

common/patches/sod.cpp

@@ -2026,6 +2026,19 @@ 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
@@ -2273,13 +2286,13 @@ namespace SoD
 		ENCODE_LENGTH_EXACT(TraderBuy_Struct);
 		SETUP_DIRECT_ENCODE(TraderBuy_Struct, structs::TraderBuy_Struct);
 
-		OUT(Action);
-		OUT(Price);
-		OUT(TraderID);
-		memcpy(eq->ItemName, emu->ItemName, sizeof(eq->ItemName));
-		OUT(ItemID);
-		OUT(Quantity);
-		OUT(AlreadySold);
+		OUT(action);
+		OUT(price);
+		OUT(trader_id);
+		memcpy(eq->item_name, emu->item_name, sizeof(eq->item_name));
+		OUT(item_id);
+		OUT(quantity);
+		OUT(already_sold);
 
 		FINISH_ENCODE();
 	}
@@ -3483,18 +3496,33 @@ 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);
 		SETUP_DIRECT_DECODE(TraderBuy_Struct, structs::TraderBuy_Struct);
 		MEMSET_IN(TraderBuy_Struct);
 
-		IN(Action);
-		IN(Price);
-		IN(TraderID);
-		memcpy(emu->ItemName, eq->ItemName, sizeof(emu->ItemName));
-		IN(ItemID);
-		IN(Quantity);
+		IN(action);
+		IN(price);
+		IN(trader_id);
+		memcpy(emu->item_name, eq->item_name, sizeof(emu->item_name));
+		IN(item_id);
+		IN(quantity);
 
 		FINISH_DIRECT_DECODE();
 	}

common/patches/sod_ops.h

@@ -78,6 +78,7 @@ E(OP_SendCharInfo)
 E(OP_SendZonepoints)
 E(OP_ShopPlayerBuy)
 E(OP_ShopPlayerSell)
+E(OP_ShopRequest)
 E(OP_SomeItemPacketMaybe)
 E(OP_SpawnDoor)
 E(OP_SpecialMesg)
@@ -141,6 +142,7 @@ D(OP_Save)
 D(OP_SetServerFilter)
 D(OP_ShopPlayerBuy)
 D(OP_ShopPlayerSell)
+D(OP_ShopRequest)
 D(OP_TraderBuy)
 D(OP_TradeSkillCombine)
 D(OP_TributeItem)

common/patches/sod_structs.h

@@ -1845,12 +1845,16 @@ struct TimeOfDay_Struct {
 };
 
 // Darvik: shopkeeper structs
-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
+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
 };
+
 /*
 Unknowns:
 0 is e7 from 01 to // MAYBE SLOT IN PURCHASE
@@ -2875,20 +2879,21 @@ struct Trader_ShowItems_Struct{
 };
 
 struct TraderBuy_Struct {
-/*000*/ uint32   Action;
-/*004*/	uint32	Unknown004;
-/*008*/ uint32   Price;
-/*012*/	uint32	Unknown008;	// Probably high order bits of a 64 bit price.
-/*016*/ uint32   TraderID;
-/*020*/ char    ItemName[64];
-/*084*/ uint32   Unknown076;
-/*088*/ uint32   ItemID;
-/*092*/ uint32   AlreadySold;
-/*096*/ uint32   Quantity;
-/*100*/ uint32   Unknown092;
+/*000*/ uint32  action;
+/*004*/	uint32	unknown_004;
+/*008*/ uint32  price;
+/*012*/	uint32	unknown_008;	// Probably high order bits of a 64 bit price.
+/*016*/ uint32  trader_id;
+/*020*/ char    item_name[64];
+/*084*/ uint32  unknown_076;
+/*088*/ uint32  item_id;
+/*092*/ uint32  already_sold;
+/*096*/ uint32  quantity;
+/*100*/ uint32  unknown_092;
 /*104*/
 };
 
+
 struct TraderItemUpdate_Struct{
 	uint32 unknown0;
 	uint32 traderid;

common/patches/sof.cpp

@@ -270,8 +270,8 @@ namespace SoF
 		ENCODE_LENGTH_EXACT(BecomeTrader_Struct);
 		SETUP_DIRECT_ENCODE(BecomeTrader_Struct, structs::BecomeTrader_Struct);
 
-		OUT(ID);
-		OUT(Code);
+		OUT(trader_id);
+		OUT(action);
 
 		FINISH_ENCODE();
 	}
@@ -1683,6 +1683,19 @@ 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
@@ -1889,13 +1902,13 @@ namespace SoF
 		ENCODE_LENGTH_EXACT(TraderBuy_Struct);
 		SETUP_DIRECT_ENCODE(TraderBuy_Struct, structs::TraderBuy_Struct);
 
-		OUT(Action);
-		OUT(Price);
-		OUT(TraderID);
-		memcpy(eq->ItemName, emu->ItemName, sizeof(eq->ItemName));
-		OUT(ItemID);
-		OUT(Quantity);
-		OUT(AlreadySold);
+		OUT(action);
+		OUT(price);
+		OUT(trader_id);
+		memcpy(eq->item_name, emu->item_name, sizeof(eq->item_name));
+		OUT(item_id);
+		OUT(quantity);
+		OUT(already_sold);
 
 		FINISH_ENCODE();
 	}
@@ -2874,18 +2887,33 @@ 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);
 		SETUP_DIRECT_DECODE(TraderBuy_Struct, structs::TraderBuy_Struct);
 		MEMSET_IN(TraderBuy_Struct);
 
-		IN(Action);
-		IN(Price);
-		IN(TraderID);
-		memcpy(emu->ItemName, eq->ItemName, sizeof(emu->ItemName));
-		IN(ItemID);
-		IN(Quantity);
+		IN(action);
+		IN(price);
+		IN(trader_id);
+		memcpy(emu->item_name, eq->item_name, sizeof(emu->item_name));
+		IN(item_id);
+		IN(quantity);
 
 		FINISH_DIRECT_DECODE();
 	}

common/patches/sof_ops.h

@@ -72,6 +72,7 @@ E(OP_SendAATable)
 E(OP_SendCharInfo)
 E(OP_SendZonepoints)
 E(OP_ShopPlayerSell)
+E(OP_ShopRequest)
 E(OP_SomeItemPacketMaybe)
 E(OP_SpawnDoor)
 E(OP_SpecialMesg)
@@ -128,6 +129,7 @@ D(OP_ReadBook)
 D(OP_Save)
 D(OP_SetServerFilter)
 D(OP_ShopPlayerSell)
+D(OP_ShopRequest)
 D(OP_TraderBuy)
 D(OP_TradeSkillCombine)
 D(OP_TributeItem)

common/patches/sof_structs.h

@@ -1859,12 +1859,16 @@ struct TimeOfDay_Struct {
 };
 
 // Darvik: shopkeeper structs
-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
+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
 };
+
 /*
 Unknowns:
 0 is e7 from 01 to // MAYBE SLOT IN PURCHASE
@@ -2767,8 +2771,8 @@ struct GetItems_Struct{
 };
 
 struct BecomeTrader_Struct{
-	uint32 ID;
-	uint32 Code;
+	uint32 trader_id;
+	uint32 action;
 };
 
 struct Trader_ShowItems_Struct{
@@ -2778,15 +2782,15 @@ struct Trader_ShowItems_Struct{
 };
 
 struct TraderBuy_Struct {
-/*000*/ uint32   Action;
-/*004*/ uint32   Price;
-/*008*/ uint32   TraderID;
-/*012*/ char    ItemName[64];
-/*076*/ uint32   Unknown076;
-/*080*/ uint32   ItemID;
-/*084*/ uint32   AlreadySold;
-/*088*/ uint32   Quantity;
-/*092*/ uint32   Unknown092;
+/*000*/ uint32  action;
+/*004*/ uint32  price;
+/*008*/ uint32  trader_id;
+/*012*/ char    item_name[64];
+/*076*/ uint32  unknown_076;
+/*080*/ uint32  item_id;
+/*084*/ uint32  already_sold;
+/*088*/ uint32  quantity;
+/*092*/ uint32  unknown_092;
 };
 
 struct TraderItemUpdate_Struct{

common/patches/ss_define.h

@@ -60,7 +60,7 @@
 	eq_struct *eq = (eq_struct *) __packet->pBuffer; \
 
 #define ALLOC_LEN_ENCODE(len) \
-	__packet->pBuffer = new unsigned char[len]; \
+	__packet->pBuffer = new unsigned char[len] {}; \
 	__packet->size = len; \
 	memset(__packet->pBuffer, 0, len); \
 
@@ -124,7 +124,7 @@
 #define SETUP_DIRECT_DECODE(emu_struct, eq_struct) \
 	unsigned char *__eq_buffer = __packet->pBuffer; \
 	__packet->size = sizeof(emu_struct); \
-	__packet->pBuffer = new unsigned char[__packet->size]; \
+	__packet->pBuffer = new unsigned char[__packet->size] {}; \
 	emu_struct *emu = (emu_struct *) __packet->pBuffer; \
 	eq_struct *eq = (eq_struct *) __eq_buffer;
 
@@ -133,7 +133,7 @@
 	eq_struct* in = (eq_struct*)__packet->pBuffer; \
 	auto size = strlen(in->var_field); \
 	__packet->size = sizeof(emu_struct) + size + 1; \
-	__packet->pBuffer = new unsigned char[__packet->size]; \
+	__packet->pBuffer = new unsigned char[__packet->size] {}; \
 	emu_struct *emu = (emu_struct *) __packet->pBuffer; \
 	eq_struct *eq = (eq_struct *) __eq_buffer;
 

common/patches/titanium_limits.h

@@ -287,6 +287,7 @@ 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*/
 

common/patches/titanium_ops.h

@@ -44,8 +44,14 @@ 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)
@@ -69,11 +75,14 @@ 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)
 E(OP_Trader)
 E(OP_TraderBuy)
+E(OP_TraderShop)
 E(OP_TributeItem)
 E(OP_VetRewardsAvaliable)
 E(OP_WearChange)
@@ -84,6 +93,7 @@ E(OP_ZoneSpawns)
 D(OP_AdventureMerchantSell)
 D(OP_ApplyPoison)
 D(OP_AugmentItem)
+D(OP_BazaarSearch)
 D(OP_Buff)
 D(OP_Bug)
 D(OP_CastSpell)
@@ -100,9 +110,11 @@ 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)
@@ -112,7 +124,10 @@ D(OP_RaidInvite)
 D(OP_ReadBook)
 D(OP_SetServerFilter)
 D(OP_ShopPlayerSell)
+D(OP_ShopRequest)
+D(OP_Trader)
 D(OP_TraderBuy)
+D(OP_TraderShop)
 D(OP_TradeSkillCombine)
 D(OP_TributeItem)
 D(OP_WearChange)

common/patches/titanium_structs.h

@@ -1423,6 +1423,23 @@ 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
@@ -1652,9 +1669,9 @@ struct TimeOfDay_Struct {
 };
 
 // Darvik: shopkeeper structs
-struct Merchant_Click_Struct {
-/*000*/ uint32	npcid;			// Merchant NPC's entity id
-/*004*/ uint32	playerid;
+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
 };
@@ -2256,24 +2273,29 @@ struct BazaarWelcome_Struct {
 };
 
 struct BazaarSearch_Struct {
-	BazaarWindowStart_Struct beginning;
-	uint32	traderid;
-	uint32  class_;
-	uint32  race;
-	uint32  stat;
-	uint32  slot;
-	uint32  type;
-	char   name[64];
-	uint32	minprice;
-	uint32	maxprice;
-	uint32	minlevel;
-	uint32	maxlevel;
+	BazaarWindowStart_Struct Beginning;
+	uint32	TraderID;
+	uint32	Class_;
+	uint32	Race;
+	uint32	ItemStat;
+	uint32	Slot;
+	uint32	Type;
+	char	Name[64];
+	uint32	MinPrice;
+	uint32	MaxPrice;
+	uint32	Minlevel;
+	uint32	MaxLlevel;
 };
-struct BazaarInspect_Struct{
+
+struct BazaarInspect_Struct {
+	uint32 action;
+	char   player_name[64];
+	uint32 unknown_068;
+	uint32 serial_number;
+	uint32 unknown_076;
 	uint32 item_id;
-	uint32 unknown;
-	char name[64];
 };
+
 struct BazaarReturnDone_Struct{
 	uint32 type;
 	uint32 traderid;
@@ -2281,16 +2303,17 @@ struct BazaarReturnDone_Struct{
 	uint32 unknown12;
 	uint32 unknown16;
 };
+
 struct BazaarSearchResults_Struct {
 	BazaarWindowStart_Struct Beginning;
-	uint32	SellerID;
-	uint32   NumItems; // Don't know. Don't know the significance of this field.
-	uint32   SerialNumber;
-	uint32   Unknown016;
-	uint32   Unknown020; // Something to do with stats as well
-	char	ItemName[64];
-	uint32	Cost;
-	uint32	ItemStat;
+	uint32                   entity_id;
+	uint32                   unknown_008;
+	uint32                   item_id;
+	uint32                   serial_number;
+	uint32                   unknown_020;
+	char                     item_name[64];
+	uint32                   item_cost;
+	uint32                   item_stat;
 };
 
 struct ServerSideFilters_Struct {
@@ -2437,11 +2460,18 @@ struct WhoAllReturnStruct {
 	struct WhoAllPlayer player[0];
 };
 
+struct BeginTrader_Struct {
+	uint32 action;
+	uint32 unknown04;
+	uint64 serial_number[80];
+	uint32 cost[80];
+};
+
 struct Trader_Struct {
-	uint32	code;
-	uint32	itemid[160];
-	uint32	unknown;
-	uint32	itemcost[80];
+	uint32 action;
+	uint32 unknown004;
+	uint64 item_id[80];
+	uint32 item_cost[80];
 };
 
 struct ClickTrader_Struct {
@@ -2454,27 +2484,28 @@ struct GetItems_Struct{
 	uint32	items[80];
 };
 
-struct BecomeTrader_Struct{
-	uint32 ID;
-	uint32 Code;
+struct BecomeTrader_Struct {
+	uint32 entity_id;
+	uint32 action;
+	char   trader_name[64];
 };
 
 struct Trader_ShowItems_Struct{
-	uint32 code;
-	uint32 traderid;
+	uint32 action;
+	uint32 entity_id;
 	uint32 unknown08[3];
 };
 
 struct TraderBuy_Struct {
-/*000*/ uint32   Action;
-/*004*/ uint32   Price;
-/*008*/ uint32   TraderID;
-/*012*/ char    ItemName[64];
-/*076*/ uint32   Unknown076;
-/*080*/ uint32   ItemID;
-/*084*/ uint32   AlreadySold;
-/*088*/ uint32   Quantity;
-/*092*/ uint32   Unknown092;
+/*000*/ uint32  action;
+/*004*/ uint32  price;
+/*008*/ uint32  trader_id;
+/*012*/ char    item_name[64];
+/*076*/ uint32  unknown_076;
+/*080*/ uint32  item_id;
+/*084*/ uint32  already_sold;
+/*088*/ uint32  quantity;
+/*092*/ uint32  unknown_092;
 };
 
 
@@ -2500,8 +2531,9 @@ struct TraderDelItem_Struct{
 };
 
 struct TraderClick_Struct{
-	uint32 traderid;
-	uint32 unknown4[2];
+	uint32 trader_id;
+	uint32 action;
+	uint32 unknown_004;
 	uint32 approval;
 };
 
@@ -3508,7 +3540,7 @@ struct LFGuild_GuildToggle_Struct
 /*540*/ uint32	TimeZone;
 /*544*/ uint8	Toggle;
 /*545*/ uint8	Unknown545[3];
-/*548*/ uint32	Expires;
+/*548*/ uint32	TimePosted;
 /*552*/ char	Name[64];
 /*616*/
 };
@@ -3699,6 +3731,49 @@ 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+
+};
+
+enum TiBazaarTraderBuyerActions {
+	Zero            = 0,
+	BeginTraderMode = 1,
+	EndTraderMode   = 2,
+	PriceUpdate     = 3,
+	EndTransaction  = 4,
+	BazaarSearch    = 7,
+	WelcomeMessage  = 9,
+	BuyTraderItem   = 10,
+	ListTraderItems = 11,
+	BazaarInspect   = 18,
+	ItemMove        = 19,
+	ReconcileItems  = 20
+};
+
 	}; /*structs*/
 
 }; /*Titanium*/

common/patches/uf.cpp

@@ -36,6 +36,9 @@
 #include "../classes.h"
 #include "../races.h"
 #include "../raid.h"
+#include "../guilds.h"
+//#include "../repositories/trader_repository.h"
+#include "../cereal/include/cereal/types/vector.hpp"
 
 #include <iostream>
 #include <sstream>
@@ -306,50 +309,134 @@ namespace UF
 		EQApplicationPacket *in = *p;
 		*p = nullptr;
 
-		char *Buffer = (char *)in->pBuffer;
+		uint32 action = *(uint32 *)in->pBuffer;
 
-		uint8 SubAction = VARSTRUCT_DECODE_TYPE(uint8, Buffer);
+		switch (action) {
+			case BazaarSearch: {
+				LogTrading(
+					"Encode OP_BazaarSearch(UF) BazaarSearch action <green>[{}]",
+					action
+				);
+				std::vector<BazaarSearchResultsFromDB_Struct> results {};
+				auto bsms = (BazaarSearchMessaging_Struct *)in->pBuffer;
+				EQ::Util::MemoryStreamReader ss(
+					reinterpret_cast<char *>(bsms->payload),
+					in->size - sizeof(BazaarSearchMessaging_Struct)
+				);
+				cereal::BinaryInputArchive ar(ss);
+				ar(results);
 
-		if (SubAction != BazaarSearchResults)
-		{
-			dest->FastQueuePacket(&in, ack_req);
-			return;
+				auto  size    = results.size() * sizeof(BazaarSearchResults_Struct);
+				auto  buffer  = new uchar[size];
+				uchar *bufptr = buffer;
+				memset(buffer, 0, size);
+
+				for (auto row = results.begin(); row != results.end(); ++row) {
+					VARSTRUCT_ENCODE_TYPE(uint32, bufptr, structs::UFBazaarTraderBuyerActions::BazaarSearch);
+					VARSTRUCT_ENCODE_TYPE(uint32, bufptr, row->trader_entity_id);
+					strn0cpy(reinterpret_cast<char *>(bufptr), row->trader_name.c_str(), 64);
+					bufptr += 64;
+					VARSTRUCT_ENCODE_TYPE(uint32, bufptr, 1);
+					VARSTRUCT_ENCODE_TYPE(int32, bufptr, row->item_id);
+					VARSTRUCT_ENCODE_TYPE(int32, bufptr, row->serial_number);
+					bufptr += 4;
+					if (row->stackable) {
+						strn0cpy(
+							reinterpret_cast<char *>(bufptr),
+							fmt::format("{}({})", row->item_name.c_str(), row->charges).c_str(),
+							64
+						);
+					}
+					else {
+						strn0cpy(
+							reinterpret_cast<char *>(bufptr),
+							fmt::format("{}({})", row->item_name.c_str(), row->count).c_str(),
+							64
+						);
+					}
+					bufptr += 64;
+					VARSTRUCT_ENCODE_TYPE(uint32, bufptr, row->cost);
+					VARSTRUCT_ENCODE_TYPE(uint32, bufptr, row->item_stat);
+				}
+
+				auto outapp = new EQApplicationPacket(OP_BazaarSearch, size);
+				memcpy(outapp->pBuffer, buffer, size);
+				dest->FastQueuePacket(&outapp);
+
+				safe_delete(outapp);
+				safe_delete_array(buffer);
+				safe_delete(in);
+				break;
+			}
+			case BazaarInspect:
+			case WelcomeMessage: {
+				LogTrading(
+					"Encode OP_BazaarSearch(UF) BazaarInspect/WelcomeMessage action <green>[{}]",
+					action
+				);
+				dest->FastQueuePacket(&in, ack_req);
+				break;
+			}
+			default: {
+				LogTrading(
+					"Encode OP_BazaarSearch(UF) unhandled action <red>[{}]",
+					action
+				);
+				dest->FastQueuePacket(&in, ack_req);
+			}
 		}
+	}
 
-		unsigned char *__emu_buffer = in->pBuffer;
+	ENCODE(OP_BecomeTrader)
+	{
+		uint32 action = *(uint32 *)(*p)->pBuffer;
 
-		BazaarSearchResults_Struct *emu = (BazaarSearchResults_Struct *)__emu_buffer;
-
-		int EntryCount = in->size / sizeof(BazaarSearchResults_Struct);
-
-		if (EntryCount == 0 || (in->size % sizeof(BazaarSearchResults_Struct)) != 0)
+		switch (action)
 		{
-			LogNetcode("[STRUCTS] Wrong size on outbound [{}]: Got [{}], expected multiple of [{}]", opcodes->EmuToName(in->GetOpcode()), in->size, sizeof(BazaarSearchResults_Struct));
-			delete in;
-			return;
+			case TraderOff:
+			{
+				ENCODE_LENGTH_EXACT(BecomeTrader_Struct);
+				SETUP_DIRECT_ENCODE(BecomeTrader_Struct, structs::BecomeTrader_Struct);
+				LogTrading(
+                    "Encode OP_BecomeTrader(UF) TraderOff action <green>[{}] entity_id <green>[{}] trader_name "
+                    "<green>[{}]",
+                    emu->action,
+                    emu->entity_id,
+                    emu->trader_name
+                );
+				eq->action    = structs::UFBazaarTraderBuyerActions::Zero;
+				eq->entity_id = emu->entity_id;
+				FINISH_ENCODE();
+				break;
+			}
+			case TraderOn:
+			{
+				ENCODE_LENGTH_EXACT(BecomeTrader_Struct);
+				SETUP_DIRECT_ENCODE(BecomeTrader_Struct, structs::BecomeTrader_Struct);
+				LogTrading(
+                    "Encode OP_BecomeTrader(UF) TraderOn action <green>[{}] entity_id <green>[{}] trader_name "
+                    "<green>[{}]",
+                    emu->action,
+                    emu->entity_id,
+                    emu->trader_name
+                );
+				eq->action    = structs::UFBazaarTraderBuyerActions::BeginTraderMode;
+				eq->entity_id = emu->entity_id;
+				strn0cpy(eq->trader_name, emu->trader_name, sizeof(eq->trader_name));
+				FINISH_ENCODE();
+				break;
+			}
+			default:
+			{
+				LogTrading(
+					"Encode OP_BecomeTrader(UF) unhandled action <red>[{}] Sending packet as is.",
+					action
+				);
+				EQApplicationPacket *in = *p;
+				*p = nullptr;
+				dest->FastQueuePacket(&in, ack_req);
+			}
 		}
-
-		in->size = EntryCount * sizeof(structs::BazaarSearchResults_Struct);
-		in->pBuffer = new unsigned char[in->size];
-		memset(in->pBuffer, 0, in->size);
-
-		structs::BazaarSearchResults_Struct *eq = (structs::BazaarSearchResults_Struct *)in->pBuffer;
-
-		for (int i = 0; i < EntryCount; ++i, ++emu, ++eq)
-		{
-			OUT(Beginning.Action);
-			OUT(SellerID);
-			memcpy(eq->SellerName, emu->SellerName, sizeof(eq->SellerName));
-			OUT(NumItems);
-			OUT(ItemID);
-			OUT(SerialNumber);
-			memcpy(eq->ItemName, emu->ItemName, sizeof(eq->ItemName));
-			OUT(Cost);
-			OUT(ItemStat);
-		}
-
-		delete[] __emu_buffer;
-		dest->FastQueuePacket(&in, ack_req);
 	}
 
 	ENCODE(OP_Buff)
@@ -1134,6 +1221,30 @@ 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);
@@ -1157,53 +1268,142 @@ namespace UF
 
 	ENCODE(OP_GuildsList)
 	{
-		EQApplicationPacket *in = *p;
+		EQApplicationPacket* in = *p;
 		*p = nullptr;
 
-		uint32 NumberOfGuilds = in->size / 64;
-		uint32 PacketSize = 68;	// 64 x 0x00 + a uint32 that I am guessing is the highest guild ID in use.
+		GuildsListMessaging_Struct   glms{};
+		EQ::Util::MemoryStreamReader ss(reinterpret_cast<char *>(in->pBuffer), in->size);
+		cereal::BinaryInputArchive   ar(ss);
+		ar(glms);
 
-		unsigned char *__emu_buffer = in->pBuffer;
-		char *InBuffer = (char *)__emu_buffer;
-		uint32 HighestGuildID = 0;
+		auto packet_size = 64 + 4 + glms.guild_detail.size() * 4 + glms.string_length;
+		auto buffer      = new uchar[packet_size];
+		auto buf_pos     = buffer;
 
-		for (unsigned int i = 0; i < NumberOfGuilds; ++i)
-		{
-			if (InBuffer[0])
-			{
-				PacketSize += (5 + strlen(InBuffer));
-				HighestGuildID = i - 1;
+		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;
 			}
-			InBuffer += 64;
 		}
 
-		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;
+		auto outapp = new EQApplicationPacket(OP_GuildsList);
 
-		// Init the first 64 bytes to zero, as per live.
-		//
-		memset(OutBuffer, 0, 64);
-		OutBuffer += 64;
+		outapp->size    = packet_size;
+		outapp->pBuffer = buffer;
 
-		VARSTRUCT_ENCODE_TYPE(uint32, OutBuffer, HighestGuildID);
+		dest->FastQueuePacket(&outapp);
+	}
 
-		for (unsigned int i = 0; i < NumberOfGuilds; ++i)
-		{
-			if (InBuffer[0])
-			{
-				VARSTRUCT_ENCODE_TYPE(uint32, OutBuffer, i - 1);
-				VARSTRUCT_ENCODE_STRING(OutBuffer, InBuffer);
+	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;
 			}
-			InBuffer += 64;
 		}
+		OUT(zone_id)
+		OUT(last_on)
+		OUT_str(player_name)
 
-		VARSTRUCT_ENCODE_TYPE(uint8, OutBuffer, 0x00);
+		FINISH_ENCODE()
+	}
 
-		delete[] __emu_buffer;
-		dest->FastQueuePacket(&in, ack_req);
+	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()
 	}
 
 	ENCODE(OP_Illusion)
@@ -1829,6 +2029,30 @@ 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]);
@@ -2300,6 +2524,19 @@ 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
@@ -2332,29 +2569,88 @@ namespace UF
 
 	ENCODE(OP_SpawnAppearance)
 	{
-		EQApplicationPacket *in = *p;
-		*p = nullptr;
+		ENCODE_LENGTH_EXACT(SpawnAppearance_Struct);
+		SETUP_DIRECT_ENCODE(SpawnAppearance_Struct, structs::SpawnAppearance_Struct);
 
-		unsigned char *emu_buffer = in->pBuffer;
-
-		SpawnAppearance_Struct *sas = (SpawnAppearance_Struct *)emu_buffer;
-
-		if (sas->type != AppearanceType::Size)
-		{
-			dest->FastQueuePacket(&in, ack_req);
-			return;
+		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;
+			}
 		}
 
-		auto outapp = new EQApplicationPacket(OP_ChangeSize, sizeof(ChangeSize_Struct));
-		ChangeSize_Struct *css = (ChangeSize_Struct *)outapp->pBuffer;
+		FINISH_ENCODE();
+	}
 
-		css->EntityID = sas->spawn_id;
-		css->Size = (float)sas->parameter;
-		css->Unknown08 = 0;
-		css->Unknown12 = 1.0f;
+	ENCODE(OP_SetGuildRank)
+	{
+		ENCODE_LENGTH_EXACT(GuildSetRank_Struct);
+		SETUP_DIRECT_ENCODE(GuildSetRank_Struct, structs::GuildSetRank_Struct);
 
-		dest->FastQueuePacket(&outapp, ack_req);
-		delete in;
+		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();
 	}
 
 	ENCODE(OP_SpawnDoor)
@@ -2533,32 +2829,170 @@ namespace UF
 
 	ENCODE(OP_Trader)
 	{
-		if ((*p)->size != sizeof(TraderBuy_Struct)) {
-			EQApplicationPacket *in = *p;
-			*p = nullptr;
-			dest->FastQueuePacket(&in, ack_req);
-			return;
-		}
+		auto action = *(uint32 *) (*p)->pBuffer;
 
-		ENCODE_FORWARD(OP_TraderBuy);
+		switch (action) {
+			case TraderOn: {
+				ENCODE_LENGTH_EXACT(Trader_ShowItems_Struct);
+				SETUP_DIRECT_ENCODE(Trader_ShowItems_Struct, structs::Trader_ShowItems_Struct);
+				LogTrading(
+					"Encode OP_Trader BeginTraderMode action <green>[{}]",
+					action
+				);
+
+				eq->action = structs::UFBazaarTraderBuyerActions::BeginTraderMode;
+				OUT(entity_id);
+
+				FINISH_ENCODE();
+				break;
+			}
+			case TraderOff: {
+				ENCODE_LENGTH_EXACT(Trader_ShowItems_Struct);
+				SETUP_DIRECT_ENCODE(Trader_ShowItems_Struct, structs::Trader_ShowItems_Struct);
+				LogTrading(
+					"Encode OP_Trader EndTraderMode action <green>[{}]",
+					action
+				);
+
+				eq->action = structs::UFBazaarTraderBuyerActions::EndTraderMode;
+				OUT(entity_id);
+
+				FINISH_ENCODE();
+				break;
+			}
+			case ListTraderItems: {
+				ENCODE_LENGTH_EXACT(Trader_Struct);
+				SETUP_DIRECT_ENCODE(Trader_Struct, structs::Trader_Struct);
+				LogTrading(
+					"Encode OP_Trader ListTraderItems action <green>[{}]",
+					action
+				);
+
+				eq->action = structs::UFBazaarTraderBuyerActions::ListTraderItems;
+				std::copy_n(emu->items, UF::invtype::BAZAAR_SIZE, eq->item_id);
+				std::copy_n(emu->item_cost, UF::invtype::BAZAAR_SIZE, eq->item_cost);
+
+				FINISH_ENCODE();
+				break;
+			}
+			case BuyTraderItem: {
+				ENCODE_LENGTH_EXACT(TraderBuy_Struct);
+				SETUP_DIRECT_ENCODE(TraderBuy_Struct, structs::TraderBuy_Struct);
+				LogTrading(
+					"Encode OP_Trader item_id <green>[{}] price <green>[{}] quantity <green>[{}] trader_id <green>[{}]",
+					eq->item_id,
+					eq->price,
+					eq->quantity,
+					eq->trader_id
+				);
+
+				eq->action = structs::UFBazaarTraderBuyerActions::BuyTraderItem;
+				OUT(price);
+				OUT(trader_id);
+				OUT(item_id);
+				OUT(already_sold);
+				OUT(quantity);
+				strn0cpy(eq->item_name, emu->item_name, sizeof(eq->item_name));
+
+				FINISH_ENCODE();
+				break;
+			}
+			case ItemMove: {
+				LogTrading(
+					"Encode OP_Trader ItemMove action <green>[{}]",
+					action
+				);
+				EQApplicationPacket *in = *p;
+				*p = nullptr;
+				dest->FastQueuePacket(&in, ack_req);
+				break;
+			}
+			default: {
+				EQApplicationPacket *in = *p;
+				*p                      = nullptr;
+
+				dest->FastQueuePacket(&in, ack_req);
+				LogError("Unknown Encode OP_Trader action <red>{} received.  Unhandled.", action);
+			}
+		}
 	}
 
 	ENCODE(OP_TraderBuy)
 	{
 		ENCODE_LENGTH_EXACT(TraderBuy_Struct);
 		SETUP_DIRECT_ENCODE(TraderBuy_Struct, structs::TraderBuy_Struct);
+		LogTrading(
+			"Encode OP_TraderBuy item_id <green>[{}] price <green>[{}] quantity <green>[{}] trader_id <green>[{}]",
+			emu->item_id,
+			emu->price,
+			emu->quantity,
+			emu->trader_id
+		);
 
-		OUT(Action);
-		OUT(Price);
-		OUT(TraderID);
-		memcpy(eq->ItemName, emu->ItemName, sizeof(eq->ItemName));
-		OUT(ItemID);
-		OUT(Quantity);
-		OUT(AlreadySold);
+		OUT(action);
+		OUT(price);
+		OUT(trader_id);
+		OUT(item_id);
+		OUT(already_sold);
+		OUT(quantity);
+		OUT_str(item_name);
 
 		FINISH_ENCODE();
 	}
 
+	ENCODE(OP_TraderShop)
+	{
+		auto action = *(uint32 *)(*p)->pBuffer;
+
+		switch (action) {
+			case ClickTrader: {
+				ENCODE_LENGTH_EXACT(TraderClick_Struct);
+				SETUP_DIRECT_ENCODE(TraderClick_Struct, structs::TraderClick_Struct);
+				LogTrading(
+					"ClickTrader action <green>[{}] trader_id <green>[{}]",
+					action,
+					emu->TraderID
+				);
+
+				eq->action    = 0;
+				eq->trader_id = emu->TraderID;
+				eq->approval  = emu->Approval;
+
+				FINISH_ENCODE();
+				break;
+			}
+			case BuyTraderItem: {
+				ENCODE_LENGTH_EXACT(TraderBuy_Struct);
+				SETUP_DIRECT_ENCODE(TraderBuy_Struct, structs::TraderBuy_Struct);
+				LogTrading(
+					"Encode OP_TraderShop item_id <green>[{}] price <green>[{}] quantity <green>[{}] trader_id <green>[{}]",
+					eq->item_id,
+					eq->price,
+					eq->quantity,
+					eq->trader_id
+				);
+
+				eq->action = structs::UFBazaarTraderBuyerActions::BuyTraderItem;
+				OUT(price);
+				OUT(trader_id);
+				OUT(item_id);
+				OUT(already_sold);
+				OUT(quantity);
+				strn0cpy(eq->item_name, emu->item_name, sizeof(eq->item_name));
+
+				FINISH_ENCODE();
+				break;
+			}
+			default: {
+				EQApplicationPacket *in = *p;
+				*p = nullptr;
+
+				dest->FastQueuePacket(&in, ack_req);
+				LogError("Unknown Encode OP_TraderShop action <red>[{}] received.  Unhandled.", action);
+			}
+		}
+	}
+
 	ENCODE(OP_TributeItem)
 	{
 		ENCODE_LENGTH_EXACT(TributeItem_Struct);
@@ -2830,7 +3264,7 @@ namespace UF
 			Bitfields->targetable = 1;
 			Bitfields->targetable_with_hotkey = emu->targetable_with_hotkey ? 1 : 0;
 			Bitfields->statue = 0;
-			Bitfields->trader = 0;
+			Bitfields->trader = emu->trader ? 1 : 0;
 			Bitfields->buyer = 0;
 
 			Bitfields->showname = ShowName;
@@ -2945,6 +3379,30 @@ 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_);
@@ -3129,20 +3587,49 @@ namespace UF
 
 	DECODE(OP_BazaarSearch)
 	{
-		char *Buffer = (char *)__packet->pBuffer;
+		uint32 action = *(uint32 *) __packet->pBuffer;
 
-		uint8 SubAction = VARSTRUCT_DECODE_TYPE(uint8, Buffer);
+		switch (action) {
+			case structs::UFBazaarTraderBuyerActions::BazaarSearch: {
+				DECODE_LENGTH_EXACT(structs::BazaarSearch_Struct);
+				SETUP_DIRECT_DECODE(BazaarSearchCriteria_Struct, structs::BazaarSearch_Struct);
 
-		if ((SubAction != BazaarInspectItem) || (__packet->size != sizeof(structs::NewBazaarInspect_Struct)))
-			return;
+				emu->action           = eq->Beginning.Action;
+				emu->item_stat        = eq->ItemStat;
+				emu->max_cost         = eq->MaxPrice;
+				emu->min_cost         = eq->MinPrice;
+				emu->max_level        = eq->MaxLlevel;
+				emu->min_level        = eq->Minlevel;
+                emu->race             = eq->Race;
+                emu->slot             = eq->Slot;
+                emu->type             = eq->Type == UINT32_MAX ? UINT8_MAX : eq->Type;
+                emu->trader_entity_id = eq->TraderID;
+                emu->trader_id        = 0;
+                emu->_class           = eq->Class_;
+                emu->search_scope     = eq->TraderID > 0 ? NonRoFBazaarSearchScope : Local_Scope;
+                emu->max_results      = RuleI(Bazaar, MaxSearchResults);
+                strn0cpy(emu->item_name, eq->Name, sizeof(emu->item_name));
 
-		SETUP_DIRECT_DECODE(NewBazaarInspect_Struct, structs::NewBazaarInspect_Struct);
-		MEMSET_IN(structs::NewBazaarInspect_Struct);
-		IN(Beginning.Action);
-		memcpy(emu->Name, eq->Name, sizeof(emu->Name));
-		IN(SerialNumber);
+				FINISH_DIRECT_DECODE();
+				break;
+			}
+			case structs::UFBazaarTraderBuyerActions::BazaarInspect: {
+				SETUP_DIRECT_DECODE(BazaarInspect_Struct, structs::BazaarInspect_Struct);
 
-		FINISH_DIRECT_DECODE();
+				IN(action);
+				memcpy(emu->player_name, eq->player_name, sizeof(emu->player_name));
+				IN(serial_number);
+
+				FINISH_DIRECT_DECODE();
+				break;
+			}
+			case structs::UFBazaarTraderBuyerActions::WelcomeMessage: {
+				break;
+			}
+			default: {
+				LogTrading("(UF) Unhandled action <red>[{}]", action);
+			}
+		}
 	}
 
 	DECODE(OP_BookButton)
@@ -3577,6 +4064,34 @@ 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);
@@ -3782,18 +4297,112 @@ 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_Trader)
+	{
+		auto action = (uint32) __packet->pBuffer[0];
+
+		switch (action) {
+			case structs::UFBazaarTraderBuyerActions::BeginTraderMode: {
+				DECODE_LENGTH_EXACT(structs::BeginTrader_Struct);
+				SETUP_DIRECT_DECODE(ClickTrader_Struct, structs::BeginTrader_Struct);
+				LogTrading(
+					"Decode OP_Trader BeginTraderMode action <red>[{}]",
+					action
+				);
+
+				emu->action      = TraderOn;
+				emu->unknown_004 = 0;
+				std::copy_n(eq->serial_number, UF::invtype::BAZAAR_SIZE, emu->serial_number);
+				std::copy_n(eq->cost, UF::invtype::BAZAAR_SIZE, emu->item_cost);
+
+				FINISH_DIRECT_DECODE();
+				break;
+			}
+			case structs::UFBazaarTraderBuyerActions::EndTraderMode: {
+				DECODE_LENGTH_EXACT(structs::Trader_ShowItems_Struct);
+				SETUP_DIRECT_DECODE(Trader_ShowItems_Struct, structs::Trader_ShowItems_Struct);
+				LogTrading(
+					"Decode OP_Trader(UF) EndTraderMode action <red>[{}]",
+					action
+				);
+
+				emu->action = TraderOff;
+				IN(entity_id);
+
+				FINISH_DIRECT_DECODE();
+				break;
+			}
+			case structs::UFBazaarTraderBuyerActions::PriceUpdate:
+			case structs::UFBazaarTraderBuyerActions::ItemMove:
+			case structs::UFBazaarTraderBuyerActions::EndTransaction:
+			case structs::UFBazaarTraderBuyerActions::ListTraderItems: {
+				LogTrading(
+					"Decode OP_Trader(UF) Price/ItemMove/EndTransaction/ListTraderItems action <red>[{}]",
+					action
+				);
+				break;
+			}
+			case structs::UFBazaarTraderBuyerActions::ReconcileItems: {
+				break;
+			}
+			default: {
+				LogError("Unhandled(UF) action <red>[{}] received.", action);
+			}
+		}
+	}
+
 	DECODE(OP_TraderBuy)
 	{
 		DECODE_LENGTH_EXACT(structs::TraderBuy_Struct);
 		SETUP_DIRECT_DECODE(TraderBuy_Struct, structs::TraderBuy_Struct);
-		MEMSET_IN(TraderBuy_Struct);
+		LogTrading(
+			"Decode OP_TraderBuy(UF) item_id <green>[{}] price <green>[{}] quantity <green>[{}] trader_id <green>[{}]",
+			eq->item_id,
+			eq->price,
+			eq->quantity,
+			eq->trader_id
+		);
 
-		IN(Action);
-		IN(Price);
-		IN(TraderID);
-		memcpy(emu->ItemName, eq->ItemName, sizeof(emu->ItemName));
-		IN(ItemID);
-		IN(Quantity);
+		emu->action = BuyTraderItem;
+		IN(price);
+		IN(trader_id);
+		IN(item_id);
+		IN(quantity);
+		IN(already_sold);
+		strn0cpy(emu->item_name, eq->item_name, sizeof(eq->item_name));
+
+		FINISH_DIRECT_DECODE();
+	}
+
+	DECODE(OP_TraderShop)
+	{
+		DECODE_LENGTH_EXACT(structs::TraderClick_Struct);
+		SETUP_DIRECT_DECODE(TraderClick_Struct, structs::TraderClick_Struct);
+		LogTrading(
+			"(UF) action <green>[{}] trader_id <green>[{}] approval <green>[{}]",
+			eq->action,
+			eq->trader_id,
+			eq->approval
+		);
+
+		emu->Code     = ClickTrader;
+		emu->TraderID = eq->trader_id;
+		emu->Approval = eq->approval;
 
 		FINISH_DIRECT_DECODE();
 	}

common/patches/uf_limits.h

@@ -289,6 +289,7 @@ namespace UF
 		const size_t CHARACTER_CREATION_LIMIT = 12;
 
 		const size_t SAY_LINK_BODY_SIZE = 50;
+		const uint32 MAX_GUILD_ID       = 50000;
 
 	} /*constants*/
 

common/patches/uf_ops.h

@@ -27,6 +27,7 @@ E(OP_ApplyPoison)
 E(OP_AugmentInfo)
 E(OP_Barter)
 E(OP_BazaarSearch)
+E(OP_BecomeTrader)
 E(OP_Buff)
 E(OP_BuffCreate)
 E(OP_CancelTrade)
@@ -58,6 +59,10 @@ 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)
@@ -82,8 +87,10 @@ 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)
@@ -94,6 +101,7 @@ E(OP_TaskDescription)
 E(OP_Track)
 E(OP_Trader)
 E(OP_TraderBuy)
+E(OP_TraderShop)
 E(OP_TributeItem)
 E(OP_VetRewardsAvaliable)
 E(OP_WearChange)
@@ -138,6 +146,8 @@ 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)
@@ -151,7 +161,10 @@ D(OP_Save)
 D(OP_SetServerFilter)
 D(OP_ShopPlayerBuy)
 D(OP_ShopPlayerSell)
+D(OP_ShopRequest)
+D(OP_Trader)
 D(OP_TraderBuy)
+D(OP_TraderShop)
 D(OP_TradeSkillCombine)
 D(OP_TributeItem)
 D(OP_WearChange)

common/patches/uf_structs.h

@@ -1670,6 +1670,15 @@ 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];
 };
@@ -1685,6 +1694,27 @@ 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
@@ -1886,9 +1916,9 @@ struct TimeOfDay_Struct {
 };
 
 // Darvik: shopkeeper structs
-struct Merchant_Click_Struct {
-/*000*/ uint32	npcid;			// Merchant NPC's entity id
-/*004*/ uint32	playerid;
+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
 };
@@ -2610,23 +2640,23 @@ struct EnvDamage2_Struct {
 //Bazaar Stuff
 
 enum {
-	BazaarTrader_StartTraderMode = 1,
-	BazaarTrader_EndTraderMode = 2,
-	BazaarTrader_UpdatePrice = 3,
-	BazaarTrader_EndTransaction = 4,
-	BazaarSearchResults = 7,
-	BazaarWelcome = 9,
-	BazaarBuyItem = 10,
-	BazaarTrader_ShowItems = 11,
-	BazaarSearchDone = 12,
+	BazaarTrader_StartTraderMode  = 1,
+	BazaarTrader_EndTraderMode    = 2,
+	BazaarTrader_UpdatePrice      = 3,
+	BazaarTrader_EndTransaction   = 4,
+	BazaarSearchResults           = 7,
+	BazaarWelcome                 = 9,
+	BazaarBuyItem                 = 10,
+	BazaarTrader_ShowItems        = 11,
+	BazaarSearchDone              = 12,
 	BazaarTrader_CustomerBrowsing = 13
 };
 
 enum {
-	BazaarPriceChange_Fail = 0,
+	BazaarPriceChange_Fail        = 0,
 	BazaarPriceChange_UpdatePrice = 1,
-	BazaarPriceChange_RemoveItem = 2,
-	BazaarPriceChange_AddItem = 3
+	BazaarPriceChange_RemoveItem  = 2,
+	BazaarPriceChange_AddItem     = 3
 };
 
 struct BazaarWindowStart_Struct {
@@ -2657,10 +2687,14 @@ struct BazaarSearch_Struct {
 	uint32	Minlevel;
 	uint32	MaxLlevel;
 };
-struct BazaarInspect_Struct{
-	uint32 ItemID;
-	uint32 Unknown004;
-	char Name[64];
+
+struct BazaarInspect_Struct {
+	uint32 action;
+	char   player_name[64];
+	uint32 unknown_068;
+	uint32 serial_number;
+	uint32 unknown_076;
+	uint32 item_id;
 };
 
 struct NewBazaarInspect_Struct {
@@ -2899,10 +2933,17 @@ struct	WhoAllPlayerPart4 {
 };
 
 struct Trader_Struct {
-	uint32	code;
-	uint32	itemid[160];
-	uint32	unknown;
-	uint32	itemcost[80];
+	uint32 action;
+	uint32 unknown004;
+	uint64 item_id[80];
+	uint32 item_cost[80];
+};
+
+struct BeginTrader_Struct {
+	uint32 action;
+	uint32 unknown04;
+	uint64 serial_number[80];
+	uint32 cost[80];
 };
 
 struct ClickTrader_Struct {
@@ -2915,30 +2956,30 @@ struct GetItems_Struct{
 	uint32	items[80];
 };
 
-struct BecomeTrader_Struct{
-	uint32 id;
-	uint32 code;
+struct BecomeTrader_Struct {
+	uint32 entity_id;
+	uint32 action;
+	char   trader_name[64];
 };
 
 struct Trader_ShowItems_Struct{
-	uint32 code;
-	uint32 traderid;
+	uint32 action;
+	uint32 entity_id;
 	uint32 unknown08[3];
 };
 
 struct TraderBuy_Struct {
-/*000*/ uint32   Action;
-/*004*/	uint32	Unknown004;
-/*008*/ uint32   Price;
-/*012*/	uint32	Unknown008;	// Probably high order bits of a 64 bit price.
-/*016*/ uint32   TraderID;
-/*020*/ char    ItemName[64];
-/*084*/ uint32   Unknown076;
-/*088*/ uint32   ItemID;
-/*092*/ uint32   AlreadySold;
-/*096*/ uint32   Quantity;
-/*100*/ uint32   Unknown092;
-/*104*/
+	uint32 action;
+	uint32 unknown_004;
+	uint32 price;
+	uint32 unknown_008;    // Probably high order bits of a 64 bit price.
+	uint32 trader_id;
+	char   item_name[64];
+	uint32 unknown_076;
+	uint32 item_id;
+	uint32 already_sold;
+	uint32 quantity;
+	uint32 unknown_092;
 };
 
 struct TraderItemUpdate_Struct{
@@ -2972,8 +3013,9 @@ struct TraderDelItem_Struct{
 };
 
 struct TraderClick_Struct{
-	uint32 traderid;
-	uint32 unknown4[2];
+	uint32 trader_id;
+	uint32 action;
+	uint32 unknown_004;
 	uint32 approval;
 };
 
@@ -3067,6 +3109,23 @@ 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_;
@@ -4627,6 +4686,30 @@ struct SayLinkBodyFrame_Struct {
 /*050*/
 };
 
+struct TraderPriceUpdate_Struct {
+/*000*/    uint32 action;
+/*004*/    uint32 sub_action;
+/*008*/    int32  serial_number;
+/*012*/    uint32 unknown_012;
+/*016*/    uint32 new_price;
+/*020*/    uint32 unknown_016;
+};
+
+enum UFBazaarTraderBuyerActions {
+	Zero            = 0,
+	BeginTraderMode = 1,
+	EndTraderMode   = 2,
+	PriceUpdate     = 3,
+	EndTransaction  = 4,
+	BazaarSearch    = 7,
+	WelcomeMessage  = 9,
+	BuyTraderItem   = 10,
+	ListTraderItems = 11,
+	BazaarInspect   = 18,
+	ItemMove        = 19,
+	ReconcileItems  = 20
+};
+
 	}; /*structs*/
 
 }; /*UF*/

common/races.cpp

@@ -1379,7 +1379,7 @@ uint32 GetPlayerRaceValue(uint16 race_id) {
 	}
 }
 
-uint32 GetPlayerRaceBit(uint16 race_id) {
+uint16 GetPlayerRaceBit(uint16 race_id) {
 	switch (race_id) {
 		case HUMAN:
 			return PLAYER_RACE_HUMAN_BIT;

common/races.h

@@ -124,7 +124,7 @@ bool IsPlayerRace(uint16 race_id);
 const std::string GetPlayerRaceAbbreviation(uint16 race_id);
 
 uint32 GetPlayerRaceValue(uint16 race_id);
-uint32 GetPlayerRaceBit(uint16 race_id);
+uint16 GetPlayerRaceBit(uint16 race_id);
 
 uint16 GetRaceIDFromPlayerRaceValue(uint32 player_race_value);
 uint16 GetRaceIDFromPlayerRaceBit(uint32 player_race_bit);

common/repositories/account_repository.h

@@ -44,7 +44,69 @@ public:
      */
 
 	// Custom extended repository methods here
+	static int16 GetAccountStatus(Database& db, const uint32 account_id)
+	{
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"SELECT `status`, TIMESTAMPDIFF(SECOND, NOW(), `suspendeduntil`) FROM `{}` WHERE `{}` = {}",
+				TableName(),
+				PrimaryKey(),
+				account_id
+			)
+		);
 
+		if (!results.Success() || !results.RowCount()) {
+			return 0;
+		}
+
+		auto row = results.begin();
+
+		int16 status    = static_cast<int16>(Strings::ToInt(row[0]));
+		int   date_diff = 0;
+
+		if (row[1]) {
+			date_diff = Strings::ToInt(row[1]);
+		}
+
+		if (date_diff > 0) {
+			status = -1;
+		}
+
+		return status;
+	}
+
+	static bool UpdatePassword(Database& db, const uint32 account_id, const std::string& password)
+	{
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"UPDATE `{}` SET `password` = MD5('{}') WHERE `{}` = {}",
+				TableName(),
+				password,
+				PrimaryKey(),
+				account_id
+			)
+		);
+
+		return results.Success();
+	}
+
+	static std::string GetAutoLoginCharacterNameByAccountID(Database& db, const uint32 account_id)
+	{
+		return AccountRepository::FindOne(db, account_id).auto_login_charname;
+	}
+
+	static bool SetAutoLoginCharacterNameByAccountID(Database& db, const uint32 account_id, const std::string& character_name)
+	{
+		auto e = AccountRepository::FindOne(db, account_id);
+
+		if (!e.id) {
+			return false;
+		}
+
+		e.auto_login_charname = character_name;
+
+		return AccountRepository::UpdateOne(db, e);
+	}
 };
 
 #endif //EQEMU_ACCOUNT_REPOSITORY_H

common/repositories/adventure_stats_repository.h

@@ -44,7 +44,65 @@ public:
      */
 
 	// Custom extended repository methods here
+	static void UpdateAdventureStatsEntry(Database& db, uint32 character_id, uint8 theme_id, bool is_win, bool is_remove)
+	{
+		std::string field;
 
+		switch (theme_id) {
+			case LDoNThemes::GUK: {
+				field = "guk_";
+				break;
+			}
+			case LDoNThemes::MIR: {
+				field = "mir_";
+				break;
+			}
+			case LDoNThemes::MMC: {
+				field = "mmc_";
+				break;
+			}
+			case LDoNThemes::RUJ: {
+				field = "ruj_";
+				break;
+			}
+			case LDoNThemes::TAK: {
+				field = "tak_";
+				break;
+			}
+		}
+
+		field += is_win ? "wins" : "losses";
+
+		auto e = FindOne(db, character_id);
+
+		if (!e.player_id && !is_remove) {
+			const std::string& query = fmt::format(
+				"INSERT INTO `{}` SET `{}` = 1, `{}` = {}",
+				TableName(),
+				field,
+				PrimaryKey(),
+				character_id
+			);
+
+			db.QueryDatabase(query);
+
+			return;
+		}
+
+		const std::string& field_operation = is_remove ? "-" : "+";
+
+		const std::string& query = fmt::format(
+			"UPDATE `{}` SET `{}` = {} {} 1 WHERE `{}` = {}",
+			TableName(),
+			field,
+			field,
+			field_operation,
+			PrimaryKey(),
+			character_id
+		);
+
+		db.QueryDatabase(query);
+	}
 };
 
 #endif //EQEMU_ADVENTURE_STATS_REPOSITORY_H

common/repositories/base/base_account_ip_repository.h

@@ -22,7 +22,7 @@ public:
 		int32_t     accid;
 		std::string ip;
 		int32_t     count;
-		std::string lastused;
+		time_t      lastused;
 	};
 
 	static std::string PrimaryKey()
@@ -46,7 +46,7 @@ public:
 			"accid",
 			"ip",
 			"count",
-			"lastused",
+			"UNIX_TIMESTAMP(lastused)",
 		};
 	}
 
@@ -130,7 +130,7 @@ public:
 			e.accid    = row[0] ? static_cast<int32_t>(atoi(row[0])) : 0;
 			e.ip       = row[1] ? row[1] : "";
 			e.count    = row[2] ? static_cast<int32_t>(atoi(row[2])) : 1;
-			e.lastused = row[3] ? row[3] : std::time(nullptr);
+			e.lastused = strtoll(row[3] ? row[3] : "-1", nullptr, 10);
 
 			return e;
 		}
@@ -167,7 +167,7 @@ public:
 		v.push_back(columns[0] + " = " + std::to_string(e.accid));
 		v.push_back(columns[1] + " = '" + Strings::Escape(e.ip) + "'");
 		v.push_back(columns[2] + " = " + std::to_string(e.count));
-		v.push_back(columns[3] + " = '" + Strings::Escape(e.lastused) + "'");
+		v.push_back(columns[3] + " = FROM_UNIXTIME(" + (e.lastused > 0 ? std::to_string(e.lastused) : "null") + ")");
 
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -192,7 +192,7 @@ public:
 		v.push_back(std::to_string(e.accid));
 		v.push_back("'" + Strings::Escape(e.ip) + "'");
 		v.push_back(std::to_string(e.count));
-		v.push_back("'" + Strings::Escape(e.lastused) + "'");
+		v.push_back("FROM_UNIXTIME(" + (e.lastused > 0 ? std::to_string(e.lastused) : "null") + ")");
 
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -225,7 +225,7 @@ public:
 			v.push_back(std::to_string(e.accid));
 			v.push_back("'" + Strings::Escape(e.ip) + "'");
 			v.push_back(std::to_string(e.count));
-			v.push_back("'" + Strings::Escape(e.lastused) + "'");
+			v.push_back("FROM_UNIXTIME(" + (e.lastused > 0 ? std::to_string(e.lastused) : "null") + ")");
 
 			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
 		}
@@ -262,7 +262,7 @@ public:
 			e.accid    = row[0] ? static_cast<int32_t>(atoi(row[0])) : 0;
 			e.ip       = row[1] ? row[1] : "";
 			e.count    = row[2] ? static_cast<int32_t>(atoi(row[2])) : 1;
-			e.lastused = row[3] ? row[3] : std::time(nullptr);
+			e.lastused = strtoll(row[3] ? row[3] : "-1", nullptr, 10);
 
 			all_entries.push_back(e);
 		}
@@ -290,7 +290,7 @@ public:
 			e.accid    = row[0] ? static_cast<int32_t>(atoi(row[0])) : 0;
 			e.ip       = row[1] ? row[1] : "";
 			e.count    = row[2] ? static_cast<int32_t>(atoi(row[2])) : 1;
-			e.lastused = row[3] ? row[3] : std::time(nullptr);
+			e.lastused = strtoll(row[3] ? row[3] : "-1", nullptr, 10);
 
 			all_entries.push_back(e);
 		}
@@ -368,7 +368,7 @@ public:
 		v.push_back(std::to_string(e.accid));
 		v.push_back("'" + Strings::Escape(e.ip) + "'");
 		v.push_back(std::to_string(e.count));
-		v.push_back("'" + Strings::Escape(e.lastused) + "'");
+		v.push_back("FROM_UNIXTIME(" + (e.lastused > 0 ? std::to_string(e.lastused) : "null") + ")");
 
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -394,7 +394,7 @@ public:
 			v.push_back(std::to_string(e.accid));
 			v.push_back("'" + Strings::Escape(e.ip) + "'");
 			v.push_back(std::to_string(e.count));
-			v.push_back("'" + Strings::Escape(e.lastused) + "'");
+			v.push_back("FROM_UNIXTIME(" + (e.lastused > 0 ? std::to_string(e.lastused) : "null") + ")");
 
 			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
 		}

common/repositories/base/base_account_repository.h

@@ -22,6 +22,7 @@ public:
 		int32_t     id;
 		std::string name;
 		std::string charname;
+		std::string auto_login_charname;
 		uint32_t    sharedplat;
 		std::string password;
 		int32_t     status;
@@ -56,6 +57,7 @@ public:
 			"id",
 			"name",
 			"charname",
+			"auto_login_charname",
 			"sharedplat",
 			"password",
 			"status",
@@ -86,6 +88,7 @@ public:
 			"id",
 			"name",
 			"charname",
+			"auto_login_charname",
 			"sharedplat",
 			"password",
 			"status",
@@ -147,30 +150,31 @@ public:
 	{
 		Account e{};
 
-		e.id             = 0;
-		e.name           = "";
-		e.charname       = "";
-		e.sharedplat     = 0;
-		e.password       = "";
-		e.status         = 0;
-		e.ls_id          = "eqemu";
-		e.lsaccount_id   = 0;
-		e.gmspeed        = 0;
-		e.invulnerable   = 0;
-		e.flymode        = 0;
-		e.ignore_tells   = 0;
-		e.revoked        = 0;
-		e.karma          = 0;
-		e.minilogin_ip   = "";
-		e.hideme         = 0;
-		e.rulesflag      = 0;
-		e.suspendeduntil = 0;
-		e.time_creation  = 0;
-		e.ban_reason     = "";
-		e.suspend_reason = "";
-		e.crc_eqgame     = "";
-		e.crc_skillcaps  = "";
-		e.crc_basedata   = "";
+		e.id                  = 0;
+		e.name                = "";
+		e.charname            = "";
+		e.auto_login_charname = "";
+		e.sharedplat          = 0;
+		e.password            = "";
+		e.status              = 0;
+		e.ls_id               = "eqemu";
+		e.lsaccount_id        = 0;
+		e.gmspeed             = 0;
+		e.invulnerable        = 0;
+		e.flymode             = 0;
+		e.ignore_tells        = 0;
+		e.revoked             = 0;
+		e.karma               = 0;
+		e.minilogin_ip        = "";
+		e.hideme              = 0;
+		e.rulesflag           = 0;
+		e.suspendeduntil      = 0;
+		e.time_creation       = 0;
+		e.ban_reason          = "";
+		e.suspend_reason      = "";
+		e.crc_eqgame          = "";
+		e.crc_skillcaps       = "";
+		e.crc_basedata        = "";
 
 		return e;
 	}
@@ -207,30 +211,31 @@ public:
 		if (results.RowCount() == 1) {
 			Account e{};
 
-			e.id             = row[0] ? static_cast<int32_t>(atoi(row[0])) : 0;
-			e.name           = row[1] ? row[1] : "";
-			e.charname       = row[2] ? row[2] : "";
-			e.sharedplat     = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
-			e.password       = row[4] ? row[4] : "";
-			e.status         = row[5] ? static_cast<int32_t>(atoi(row[5])) : 0;
-			e.ls_id          = row[6] ? row[6] : "eqemu";
-			e.lsaccount_id   = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
-			e.gmspeed        = row[8] ? static_cast<uint8_t>(strtoul(row[8], nullptr, 10)) : 0;
-			e.invulnerable   = row[9] ? static_cast<int8_t>(atoi(row[9])) : 0;
-			e.flymode        = row[10] ? static_cast<int8_t>(atoi(row[10])) : 0;
-			e.ignore_tells   = row[11] ? static_cast<int8_t>(atoi(row[11])) : 0;
-			e.revoked        = row[12] ? static_cast<uint8_t>(strtoul(row[12], nullptr, 10)) : 0;
-			e.karma          = row[13] ? static_cast<uint32_t>(strtoul(row[13], nullptr, 10)) : 0;
-			e.minilogin_ip   = row[14] ? row[14] : "";
-			e.hideme         = row[15] ? static_cast<int8_t>(atoi(row[15])) : 0;
-			e.rulesflag      = row[16] ? static_cast<uint8_t>(strtoul(row[16], nullptr, 10)) : 0;
-			e.suspendeduntil = strtoll(row[17] ? row[17] : "-1", nullptr, 10);
-			e.time_creation  = row[18] ? static_cast<uint32_t>(strtoul(row[18], nullptr, 10)) : 0;
-			e.ban_reason     = row[19] ? row[19] : "";
-			e.suspend_reason = row[20] ? row[20] : "";
-			e.crc_eqgame     = row[21] ? row[21] : "";
-			e.crc_skillcaps  = row[22] ? row[22] : "";
-			e.crc_basedata   = row[23] ? row[23] : "";
+			e.id                  = row[0] ? static_cast<int32_t>(atoi(row[0])) : 0;
+			e.name                = row[1] ? row[1] : "";
+			e.charname            = row[2] ? row[2] : "";
+			e.auto_login_charname = row[3] ? row[3] : "";
+			e.sharedplat          = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
+			e.password            = row[5] ? row[5] : "";
+			e.status              = row[6] ? static_cast<int32_t>(atoi(row[6])) : 0;
+			e.ls_id               = row[7] ? row[7] : "eqemu";
+			e.lsaccount_id        = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
+			e.gmspeed             = row[9] ? static_cast<uint8_t>(strtoul(row[9], nullptr, 10)) : 0;
+			e.invulnerable        = row[10] ? static_cast<int8_t>(atoi(row[10])) : 0;
+			e.flymode             = row[11] ? static_cast<int8_t>(atoi(row[11])) : 0;
+			e.ignore_tells        = row[12] ? static_cast<int8_t>(atoi(row[12])) : 0;
+			e.revoked             = row[13] ? static_cast<uint8_t>(strtoul(row[13], nullptr, 10)) : 0;
+			e.karma               = row[14] ? static_cast<uint32_t>(strtoul(row[14], nullptr, 10)) : 0;
+			e.minilogin_ip        = row[15] ? row[15] : "";
+			e.hideme              = row[16] ? static_cast<int8_t>(atoi(row[16])) : 0;
+			e.rulesflag           = row[17] ? static_cast<uint8_t>(strtoul(row[17], nullptr, 10)) : 0;
+			e.suspendeduntil      = strtoll(row[18] ? row[18] : "-1", nullptr, 10);
+			e.time_creation       = row[19] ? static_cast<uint32_t>(strtoul(row[19], nullptr, 10)) : 0;
+			e.ban_reason          = row[20] ? row[20] : "";
+			e.suspend_reason      = row[21] ? row[21] : "";
+			e.crc_eqgame          = row[22] ? row[22] : "";
+			e.crc_skillcaps       = row[23] ? row[23] : "";
+			e.crc_basedata        = row[24] ? row[24] : "";
 
 			return e;
 		}
@@ -266,27 +271,28 @@ public:
 
 		v.push_back(columns[1] + " = '" + Strings::Escape(e.name) + "'");
 		v.push_back(columns[2] + " = '" + Strings::Escape(e.charname) + "'");
-		v.push_back(columns[3] + " = " + std::to_string(e.sharedplat));
-		v.push_back(columns[4] + " = '" + Strings::Escape(e.password) + "'");
-		v.push_back(columns[5] + " = " + std::to_string(e.status));
-		v.push_back(columns[6] + " = '" + Strings::Escape(e.ls_id) + "'");
-		v.push_back(columns[7] + " = " + std::to_string(e.lsaccount_id));
-		v.push_back(columns[8] + " = " + std::to_string(e.gmspeed));
-		v.push_back(columns[9] + " = " + std::to_string(e.invulnerable));
-		v.push_back(columns[10] + " = " + std::to_string(e.flymode));
-		v.push_back(columns[11] + " = " + std::to_string(e.ignore_tells));
-		v.push_back(columns[12] + " = " + std::to_string(e.revoked));
-		v.push_back(columns[13] + " = " + std::to_string(e.karma));
-		v.push_back(columns[14] + " = '" + Strings::Escape(e.minilogin_ip) + "'");
-		v.push_back(columns[15] + " = " + std::to_string(e.hideme));
-		v.push_back(columns[16] + " = " + std::to_string(e.rulesflag));
-		v.push_back(columns[17] + " = FROM_UNIXTIME(" + (e.suspendeduntil > 0 ? std::to_string(e.suspendeduntil) : "null") + ")");
-		v.push_back(columns[18] + " = " + std::to_string(e.time_creation));
-		v.push_back(columns[19] + " = '" + Strings::Escape(e.ban_reason) + "'");
-		v.push_back(columns[20] + " = '" + Strings::Escape(e.suspend_reason) + "'");
-		v.push_back(columns[21] + " = '" + Strings::Escape(e.crc_eqgame) + "'");
-		v.push_back(columns[22] + " = '" + Strings::Escape(e.crc_skillcaps) + "'");
-		v.push_back(columns[23] + " = '" + Strings::Escape(e.crc_basedata) + "'");
+		v.push_back(columns[3] + " = '" + Strings::Escape(e.auto_login_charname) + "'");
+		v.push_back(columns[4] + " = " + std::to_string(e.sharedplat));
+		v.push_back(columns[5] + " = '" + Strings::Escape(e.password) + "'");
+		v.push_back(columns[6] + " = " + std::to_string(e.status));
+		v.push_back(columns[7] + " = '" + Strings::Escape(e.ls_id) + "'");
+		v.push_back(columns[8] + " = " + std::to_string(e.lsaccount_id));
+		v.push_back(columns[9] + " = " + std::to_string(e.gmspeed));
+		v.push_back(columns[10] + " = " + std::to_string(e.invulnerable));
+		v.push_back(columns[11] + " = " + std::to_string(e.flymode));
+		v.push_back(columns[12] + " = " + std::to_string(e.ignore_tells));
+		v.push_back(columns[13] + " = " + std::to_string(e.revoked));
+		v.push_back(columns[14] + " = " + std::to_string(e.karma));
+		v.push_back(columns[15] + " = '" + Strings::Escape(e.minilogin_ip) + "'");
+		v.push_back(columns[16] + " = " + std::to_string(e.hideme));
+		v.push_back(columns[17] + " = " + std::to_string(e.rulesflag));
+		v.push_back(columns[18] + " = FROM_UNIXTIME(" + (e.suspendeduntil > 0 ? std::to_string(e.suspendeduntil) : "null") + ")");
+		v.push_back(columns[19] + " = " + std::to_string(e.time_creation));
+		v.push_back(columns[20] + " = '" + Strings::Escape(e.ban_reason) + "'");
+		v.push_back(columns[21] + " = '" + Strings::Escape(e.suspend_reason) + "'");
+		v.push_back(columns[22] + " = '" + Strings::Escape(e.crc_eqgame) + "'");
+		v.push_back(columns[23] + " = '" + Strings::Escape(e.crc_skillcaps) + "'");
+		v.push_back(columns[24] + " = '" + Strings::Escape(e.crc_basedata) + "'");
 
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -311,6 +317,7 @@ public:
 		v.push_back(std::to_string(e.id));
 		v.push_back("'" + Strings::Escape(e.name) + "'");
 		v.push_back("'" + Strings::Escape(e.charname) + "'");
+		v.push_back("'" + Strings::Escape(e.auto_login_charname) + "'");
 		v.push_back(std::to_string(e.sharedplat));
 		v.push_back("'" + Strings::Escape(e.password) + "'");
 		v.push_back(std::to_string(e.status));
@@ -364,6 +371,7 @@ public:
 			v.push_back(std::to_string(e.id));
 			v.push_back("'" + Strings::Escape(e.name) + "'");
 			v.push_back("'" + Strings::Escape(e.charname) + "'");
+			v.push_back("'" + Strings::Escape(e.auto_login_charname) + "'");
 			v.push_back(std::to_string(e.sharedplat));
 			v.push_back("'" + Strings::Escape(e.password) + "'");
 			v.push_back(std::to_string(e.status));
@@ -418,30 +426,31 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			Account e{};
 
-			e.id             = row[0] ? static_cast<int32_t>(atoi(row[0])) : 0;
-			e.name           = row[1] ? row[1] : "";
-			e.charname       = row[2] ? row[2] : "";
-			e.sharedplat     = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
-			e.password       = row[4] ? row[4] : "";
-			e.status         = row[5] ? static_cast<int32_t>(atoi(row[5])) : 0;
-			e.ls_id          = row[6] ? row[6] : "eqemu";
-			e.lsaccount_id   = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
-			e.gmspeed        = row[8] ? static_cast<uint8_t>(strtoul(row[8], nullptr, 10)) : 0;
-			e.invulnerable   = row[9] ? static_cast<int8_t>(atoi(row[9])) : 0;
-			e.flymode        = row[10] ? static_cast<int8_t>(atoi(row[10])) : 0;
-			e.ignore_tells   = row[11] ? static_cast<int8_t>(atoi(row[11])) : 0;
-			e.revoked        = row[12] ? static_cast<uint8_t>(strtoul(row[12], nullptr, 10)) : 0;
-			e.karma          = row[13] ? static_cast<uint32_t>(strtoul(row[13], nullptr, 10)) : 0;
-			e.minilogin_ip   = row[14] ? row[14] : "";
-			e.hideme         = row[15] ? static_cast<int8_t>(atoi(row[15])) : 0;
-			e.rulesflag      = row[16] ? static_cast<uint8_t>(strtoul(row[16], nullptr, 10)) : 0;
-			e.suspendeduntil = strtoll(row[17] ? row[17] : "-1", nullptr, 10);
-			e.time_creation  = row[18] ? static_cast<uint32_t>(strtoul(row[18], nullptr, 10)) : 0;
-			e.ban_reason     = row[19] ? row[19] : "";
-			e.suspend_reason = row[20] ? row[20] : "";
-			e.crc_eqgame     = row[21] ? row[21] : "";
-			e.crc_skillcaps  = row[22] ? row[22] : "";
-			e.crc_basedata   = row[23] ? row[23] : "";
+			e.id                  = row[0] ? static_cast<int32_t>(atoi(row[0])) : 0;
+			e.name                = row[1] ? row[1] : "";
+			e.charname            = row[2] ? row[2] : "";
+			e.auto_login_charname = row[3] ? row[3] : "";
+			e.sharedplat          = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
+			e.password            = row[5] ? row[5] : "";
+			e.status              = row[6] ? static_cast<int32_t>(atoi(row[6])) : 0;
+			e.ls_id               = row[7] ? row[7] : "eqemu";
+			e.lsaccount_id        = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
+			e.gmspeed             = row[9] ? static_cast<uint8_t>(strtoul(row[9], nullptr, 10)) : 0;
+			e.invulnerable        = row[10] ? static_cast<int8_t>(atoi(row[10])) : 0;
+			e.flymode             = row[11] ? static_cast<int8_t>(atoi(row[11])) : 0;
+			e.ignore_tells        = row[12] ? static_cast<int8_t>(atoi(row[12])) : 0;
+			e.revoked             = row[13] ? static_cast<uint8_t>(strtoul(row[13], nullptr, 10)) : 0;
+			e.karma               = row[14] ? static_cast<uint32_t>(strtoul(row[14], nullptr, 10)) : 0;
+			e.minilogin_ip        = row[15] ? row[15] : "";
+			e.hideme              = row[16] ? static_cast<int8_t>(atoi(row[16])) : 0;
+			e.rulesflag           = row[17] ? static_cast<uint8_t>(strtoul(row[17], nullptr, 10)) : 0;
+			e.suspendeduntil      = strtoll(row[18] ? row[18] : "-1", nullptr, 10);
+			e.time_creation       = row[19] ? static_cast<uint32_t>(strtoul(row[19], nullptr, 10)) : 0;
+			e.ban_reason          = row[20] ? row[20] : "";
+			e.suspend_reason      = row[21] ? row[21] : "";
+			e.crc_eqgame          = row[22] ? row[22] : "";
+			e.crc_skillcaps       = row[23] ? row[23] : "";
+			e.crc_basedata        = row[24] ? row[24] : "";
 
 			all_entries.push_back(e);
 		}
@@ -466,30 +475,31 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			Account e{};
 
-			e.id             = row[0] ? static_cast<int32_t>(atoi(row[0])) : 0;
-			e.name           = row[1] ? row[1] : "";
-			e.charname       = row[2] ? row[2] : "";
-			e.sharedplat     = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
-			e.password       = row[4] ? row[4] : "";
-			e.status         = row[5] ? static_cast<int32_t>(atoi(row[5])) : 0;
-			e.ls_id          = row[6] ? row[6] : "eqemu";
-			e.lsaccount_id   = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
-			e.gmspeed        = row[8] ? static_cast<uint8_t>(strtoul(row[8], nullptr, 10)) : 0;
-			e.invulnerable   = row[9] ? static_cast<int8_t>(atoi(row[9])) : 0;
-			e.flymode        = row[10] ? static_cast<int8_t>(atoi(row[10])) : 0;
-			e.ignore_tells   = row[11] ? static_cast<int8_t>(atoi(row[11])) : 0;
-			e.revoked        = row[12] ? static_cast<uint8_t>(strtoul(row[12], nullptr, 10)) : 0;
-			e.karma          = row[13] ? static_cast<uint32_t>(strtoul(row[13], nullptr, 10)) : 0;
-			e.minilogin_ip   = row[14] ? row[14] : "";
-			e.hideme         = row[15] ? static_cast<int8_t>(atoi(row[15])) : 0;
-			e.rulesflag      = row[16] ? static_cast<uint8_t>(strtoul(row[16], nullptr, 10)) : 0;
-			e.suspendeduntil = strtoll(row[17] ? row[17] : "-1", nullptr, 10);
-			e.time_creation  = row[18] ? static_cast<uint32_t>(strtoul(row[18], nullptr, 10)) : 0;
-			e.ban_reason     = row[19] ? row[19] : "";
-			e.suspend_reason = row[20] ? row[20] : "";
-			e.crc_eqgame     = row[21] ? row[21] : "";
-			e.crc_skillcaps  = row[22] ? row[22] : "";
-			e.crc_basedata   = row[23] ? row[23] : "";
+			e.id                  = row[0] ? static_cast<int32_t>(atoi(row[0])) : 0;
+			e.name                = row[1] ? row[1] : "";
+			e.charname            = row[2] ? row[2] : "";
+			e.auto_login_charname = row[3] ? row[3] : "";
+			e.sharedplat          = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
+			e.password            = row[5] ? row[5] : "";
+			e.status              = row[6] ? static_cast<int32_t>(atoi(row[6])) : 0;
+			e.ls_id               = row[7] ? row[7] : "eqemu";
+			e.lsaccount_id        = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
+			e.gmspeed             = row[9] ? static_cast<uint8_t>(strtoul(row[9], nullptr, 10)) : 0;
+			e.invulnerable        = row[10] ? static_cast<int8_t>(atoi(row[10])) : 0;
+			e.flymode             = row[11] ? static_cast<int8_t>(atoi(row[11])) : 0;
+			e.ignore_tells        = row[12] ? static_cast<int8_t>(atoi(row[12])) : 0;
+			e.revoked             = row[13] ? static_cast<uint8_t>(strtoul(row[13], nullptr, 10)) : 0;
+			e.karma               = row[14] ? static_cast<uint32_t>(strtoul(row[14], nullptr, 10)) : 0;
+			e.minilogin_ip        = row[15] ? row[15] : "";
+			e.hideme              = row[16] ? static_cast<int8_t>(atoi(row[16])) : 0;
+			e.rulesflag           = row[17] ? static_cast<uint8_t>(strtoul(row[17], nullptr, 10)) : 0;
+			e.suspendeduntil      = strtoll(row[18] ? row[18] : "-1", nullptr, 10);
+			e.time_creation       = row[19] ? static_cast<uint32_t>(strtoul(row[19], nullptr, 10)) : 0;
+			e.ban_reason          = row[20] ? row[20] : "";
+			e.suspend_reason      = row[21] ? row[21] : "";
+			e.crc_eqgame          = row[22] ? row[22] : "";
+			e.crc_skillcaps       = row[23] ? row[23] : "";
+			e.crc_basedata        = row[24] ? row[24] : "";
 
 			all_entries.push_back(e);
 		}
@@ -567,6 +577,7 @@ public:
 		v.push_back(std::to_string(e.id));
 		v.push_back("'" + Strings::Escape(e.name) + "'");
 		v.push_back("'" + Strings::Escape(e.charname) + "'");
+		v.push_back("'" + Strings::Escape(e.auto_login_charname) + "'");
 		v.push_back(std::to_string(e.sharedplat));
 		v.push_back("'" + Strings::Escape(e.password) + "'");
 		v.push_back(std::to_string(e.status));
@@ -613,6 +624,7 @@ public:
 			v.push_back(std::to_string(e.id));
 			v.push_back("'" + Strings::Escape(e.name) + "'");
 			v.push_back("'" + Strings::Escape(e.charname) + "'");
+			v.push_back("'" + Strings::Escape(e.auto_login_charname) + "'");
 			v.push_back(std::to_string(e.sharedplat));
 			v.push_back("'" + Strings::Escape(e.password) + "'");
 			v.push_back(std::to_string(e.status));

common/repositories/base/base_base_data_repository.h

@@ -19,16 +19,16 @@
 class BaseBaseDataRepository {
 public:
 	struct BaseData {
-		uint32_t level;
-		uint32_t class_;
-		double   hp;
-		double   mana;
-		double   end;
-		double   unk1;
-		double   unk2;
-		double   hp_fac;
-		double   mana_fac;
-		double   end_fac;
+		uint8_t level;
+		uint8_t class_;
+		double  hp;
+		double  mana;
+		double  end;
+		double  hp_regen;
+		double  end_regen;
+		double  hp_fac;
+		double  mana_fac;
+		double  end_fac;
 	};
 
 	static std::string PrimaryKey()
@@ -44,8 +44,8 @@ public:
 			"hp",
 			"mana",
 			"end",
-			"unk1",
-			"unk2",
+			"hp_regen",
+			"end_regen",
 			"hp_fac",
 			"mana_fac",
 			"end_fac",
@@ -60,8 +60,8 @@ public:
 			"hp",
 			"mana",
 			"end",
-			"unk1",
-			"unk2",
+			"hp_regen",
+			"end_regen",
 			"hp_fac",
 			"mana_fac",
 			"end_fac",
@@ -105,16 +105,16 @@ public:
 	{
 		BaseData e{};
 
-		e.level    = 0;
-		e.class_   = 0;
-		e.hp       = 0;
-		e.mana     = 0;
-		e.end      = 0;
-		e.unk1     = 0;
-		e.unk2     = 0;
-		e.hp_fac   = 0;
-		e.mana_fac = 0;
-		e.end_fac  = 0;
+		e.level     = 0;
+		e.class_    = 0;
+		e.hp        = 0;
+		e.mana      = 0;
+		e.end       = 0;
+		e.hp_regen  = 0;
+		e.end_regen = 0;
+		e.hp_fac    = 0;
+		e.mana_fac  = 0;
+		e.end_fac   = 0;
 
 		return e;
 	}
@@ -151,16 +151,16 @@ public:
 		if (results.RowCount() == 1) {
 			BaseData e{};
 
-			e.level    = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
-			e.class_   = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
-			e.hp       = row[2] ? strtod(row[2], nullptr) : 0;
-			e.mana     = row[3] ? strtod(row[3], nullptr) : 0;
-			e.end      = row[4] ? strtod(row[4], nullptr) : 0;
-			e.unk1     = row[5] ? strtod(row[5], nullptr) : 0;
-			e.unk2     = row[6] ? strtod(row[6], nullptr) : 0;
-			e.hp_fac   = row[7] ? strtod(row[7], nullptr) : 0;
-			e.mana_fac = row[8] ? strtod(row[8], nullptr) : 0;
-			e.end_fac  = row[9] ? strtod(row[9], nullptr) : 0;
+			e.level     = row[0] ? static_cast<uint8_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.class_    = row[1] ? static_cast<uint8_t>(strtoul(row[1], nullptr, 10)) : 0;
+			e.hp        = row[2] ? strtod(row[2], nullptr) : 0;
+			e.mana      = row[3] ? strtod(row[3], nullptr) : 0;
+			e.end       = row[4] ? strtod(row[4], nullptr) : 0;
+			e.hp_regen  = row[5] ? strtod(row[5], nullptr) : 0;
+			e.end_regen = row[6] ? strtod(row[6], nullptr) : 0;
+			e.hp_fac    = row[7] ? strtod(row[7], nullptr) : 0;
+			e.mana_fac  = row[8] ? strtod(row[8], nullptr) : 0;
+			e.end_fac   = row[9] ? strtod(row[9], nullptr) : 0;
 
 			return e;
 		}
@@ -199,8 +199,8 @@ public:
 		v.push_back(columns[2] + " = " + std::to_string(e.hp));
 		v.push_back(columns[3] + " = " + std::to_string(e.mana));
 		v.push_back(columns[4] + " = " + std::to_string(e.end));
-		v.push_back(columns[5] + " = " + std::to_string(e.unk1));
-		v.push_back(columns[6] + " = " + std::to_string(e.unk2));
+		v.push_back(columns[5] + " = " + std::to_string(e.hp_regen));
+		v.push_back(columns[6] + " = " + std::to_string(e.end_regen));
 		v.push_back(columns[7] + " = " + std::to_string(e.hp_fac));
 		v.push_back(columns[8] + " = " + std::to_string(e.mana_fac));
 		v.push_back(columns[9] + " = " + std::to_string(e.end_fac));
@@ -230,8 +230,8 @@ public:
 		v.push_back(std::to_string(e.hp));
 		v.push_back(std::to_string(e.mana));
 		v.push_back(std::to_string(e.end));
-		v.push_back(std::to_string(e.unk1));
-		v.push_back(std::to_string(e.unk2));
+		v.push_back(std::to_string(e.hp_regen));
+		v.push_back(std::to_string(e.end_regen));
 		v.push_back(std::to_string(e.hp_fac));
 		v.push_back(std::to_string(e.mana_fac));
 		v.push_back(std::to_string(e.end_fac));
@@ -269,8 +269,8 @@ public:
 			v.push_back(std::to_string(e.hp));
 			v.push_back(std::to_string(e.mana));
 			v.push_back(std::to_string(e.end));
-			v.push_back(std::to_string(e.unk1));
-			v.push_back(std::to_string(e.unk2));
+			v.push_back(std::to_string(e.hp_regen));
+			v.push_back(std::to_string(e.end_regen));
 			v.push_back(std::to_string(e.hp_fac));
 			v.push_back(std::to_string(e.mana_fac));
 			v.push_back(std::to_string(e.end_fac));
@@ -307,16 +307,16 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			BaseData e{};
 
-			e.level    = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
-			e.class_   = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
-			e.hp       = row[2] ? strtod(row[2], nullptr) : 0;
-			e.mana     = row[3] ? strtod(row[3], nullptr) : 0;
-			e.end      = row[4] ? strtod(row[4], nullptr) : 0;
-			e.unk1     = row[5] ? strtod(row[5], nullptr) : 0;
-			e.unk2     = row[6] ? strtod(row[6], nullptr) : 0;
-			e.hp_fac   = row[7] ? strtod(row[7], nullptr) : 0;
-			e.mana_fac = row[8] ? strtod(row[8], nullptr) : 0;
-			e.end_fac  = row[9] ? strtod(row[9], nullptr) : 0;
+			e.level     = row[0] ? static_cast<uint8_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.class_    = row[1] ? static_cast<uint8_t>(strtoul(row[1], nullptr, 10)) : 0;
+			e.hp        = row[2] ? strtod(row[2], nullptr) : 0;
+			e.mana      = row[3] ? strtod(row[3], nullptr) : 0;
+			e.end       = row[4] ? strtod(row[4], nullptr) : 0;
+			e.hp_regen  = row[5] ? strtod(row[5], nullptr) : 0;
+			e.end_regen = row[6] ? strtod(row[6], nullptr) : 0;
+			e.hp_fac    = row[7] ? strtod(row[7], nullptr) : 0;
+			e.mana_fac  = row[8] ? strtod(row[8], nullptr) : 0;
+			e.end_fac   = row[9] ? strtod(row[9], nullptr) : 0;
 
 			all_entries.push_back(e);
 		}
@@ -341,16 +341,16 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			BaseData e{};
 
-			e.level    = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
-			e.class_   = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
-			e.hp       = row[2] ? strtod(row[2], nullptr) : 0;
-			e.mana     = row[3] ? strtod(row[3], nullptr) : 0;
-			e.end      = row[4] ? strtod(row[4], nullptr) : 0;
-			e.unk1     = row[5] ? strtod(row[5], nullptr) : 0;
-			e.unk2     = row[6] ? strtod(row[6], nullptr) : 0;
-			e.hp_fac   = row[7] ? strtod(row[7], nullptr) : 0;
-			e.mana_fac = row[8] ? strtod(row[8], nullptr) : 0;
-			e.end_fac  = row[9] ? strtod(row[9], nullptr) : 0;
+			e.level     = row[0] ? static_cast<uint8_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.class_    = row[1] ? static_cast<uint8_t>(strtoul(row[1], nullptr, 10)) : 0;
+			e.hp        = row[2] ? strtod(row[2], nullptr) : 0;
+			e.mana      = row[3] ? strtod(row[3], nullptr) : 0;
+			e.end       = row[4] ? strtod(row[4], nullptr) : 0;
+			e.hp_regen  = row[5] ? strtod(row[5], nullptr) : 0;
+			e.end_regen = row[6] ? strtod(row[6], nullptr) : 0;
+			e.hp_fac    = row[7] ? strtod(row[7], nullptr) : 0;
+			e.mana_fac  = row[8] ? strtod(row[8], nullptr) : 0;
+			e.end_fac   = row[9] ? strtod(row[9], nullptr) : 0;
 
 			all_entries.push_back(e);
 		}
@@ -430,8 +430,8 @@ public:
 		v.push_back(std::to_string(e.hp));
 		v.push_back(std::to_string(e.mana));
 		v.push_back(std::to_string(e.end));
-		v.push_back(std::to_string(e.unk1));
-		v.push_back(std::to_string(e.unk2));
+		v.push_back(std::to_string(e.hp_regen));
+		v.push_back(std::to_string(e.end_regen));
 		v.push_back(std::to_string(e.hp_fac));
 		v.push_back(std::to_string(e.mana_fac));
 		v.push_back(std::to_string(e.end_fac));
@@ -462,8 +462,8 @@ public:
 			v.push_back(std::to_string(e.hp));
 			v.push_back(std::to_string(e.mana));
 			v.push_back(std::to_string(e.end));
-			v.push_back(std::to_string(e.unk1));
-			v.push_back(std::to_string(e.unk2));
+			v.push_back(std::to_string(e.hp_regen));
+			v.push_back(std::to_string(e.end_regen));
 			v.push_back(std::to_string(e.hp_fac));
 			v.push_back(std::to_string(e.mana_fac));
 			v.push_back(std::to_string(e.end_fac));

common/repositories/base/base_bot_data_repository.h

@@ -57,6 +57,7 @@ public:
 		int32_t     int_;
 		int32_t     agi;
 		int32_t     wis;
+		int32_t     extra_haste;
 		int16_t     fire;
 		int16_t     cold;
 		int16_t     magic;
@@ -118,6 +119,7 @@ public:
 			"`int`",
 			"agi",
 			"wis",
+			"extra_haste",
 			"fire",
 			"cold",
 			"magic",
@@ -175,6 +177,7 @@ public:
 			"`int`",
 			"agi",
 			"wis",
+			"extra_haste",
 			"fire",
 			"cold",
 			"magic",
@@ -266,6 +269,7 @@ public:
 		e.int_                   = 75;
 		e.agi                    = 75;
 		e.wis                    = 75;
+		e.extra_haste            = 0;
 		e.fire                   = 0;
 		e.cold                   = 0;
 		e.magic                  = 0;
@@ -353,19 +357,20 @@ public:
 			e.int_                   = row[35] ? static_cast<int32_t>(atoi(row[35])) : 75;
 			e.agi                    = row[36] ? static_cast<int32_t>(atoi(row[36])) : 75;
 			e.wis                    = row[37] ? static_cast<int32_t>(atoi(row[37])) : 75;
-			e.fire                   = row[38] ? static_cast<int16_t>(atoi(row[38])) : 0;
-			e.cold                   = row[39] ? static_cast<int16_t>(atoi(row[39])) : 0;
-			e.magic                  = row[40] ? static_cast<int16_t>(atoi(row[40])) : 0;
-			e.poison                 = row[41] ? static_cast<int16_t>(atoi(row[41])) : 0;
-			e.disease                = row[42] ? static_cast<int16_t>(atoi(row[42])) : 0;
-			e.corruption             = row[43] ? static_cast<int16_t>(atoi(row[43])) : 0;
-			e.show_helm              = row[44] ? static_cast<uint32_t>(strtoul(row[44], nullptr, 10)) : 0;
-			e.follow_distance        = row[45] ? static_cast<uint32_t>(strtoul(row[45], nullptr, 10)) : 200;
-			e.stop_melee_level       = row[46] ? static_cast<uint8_t>(strtoul(row[46], nullptr, 10)) : 255;
-			e.expansion_bitmask      = row[47] ? static_cast<int32_t>(atoi(row[47])) : -1;
-			e.enforce_spell_settings = row[48] ? static_cast<uint8_t>(strtoul(row[48], nullptr, 10)) : 0;
-			e.archery_setting        = row[49] ? static_cast<uint8_t>(strtoul(row[49], nullptr, 10)) : 0;
-			e.caster_range           = row[50] ? static_cast<uint32_t>(strtoul(row[50], nullptr, 10)) : 300;
+			e.extra_haste            = row[38] ? static_cast<int32_t>(atoi(row[38])) : 0;
+			e.fire                   = row[39] ? static_cast<int16_t>(atoi(row[39])) : 0;
+			e.cold                   = row[40] ? static_cast<int16_t>(atoi(row[40])) : 0;
+			e.magic                  = row[41] ? static_cast<int16_t>(atoi(row[41])) : 0;
+			e.poison                 = row[42] ? static_cast<int16_t>(atoi(row[42])) : 0;
+			e.disease                = row[43] ? static_cast<int16_t>(atoi(row[43])) : 0;
+			e.corruption             = row[44] ? static_cast<int16_t>(atoi(row[44])) : 0;
+			e.show_helm              = row[45] ? static_cast<uint32_t>(strtoul(row[45], nullptr, 10)) : 0;
+			e.follow_distance        = row[46] ? static_cast<uint32_t>(strtoul(row[46], nullptr, 10)) : 200;
+			e.stop_melee_level       = row[47] ? static_cast<uint8_t>(strtoul(row[47], nullptr, 10)) : 255;
+			e.expansion_bitmask      = row[48] ? static_cast<int32_t>(atoi(row[48])) : -1;
+			e.enforce_spell_settings = row[49] ? static_cast<uint8_t>(strtoul(row[49], nullptr, 10)) : 0;
+			e.archery_setting        = row[50] ? static_cast<uint8_t>(strtoul(row[50], nullptr, 10)) : 0;
+			e.caster_range           = row[51] ? static_cast<uint32_t>(strtoul(row[51], nullptr, 10)) : 300;
 
 			return e;
 		}
@@ -436,19 +441,20 @@ public:
 		v.push_back(columns[35] + " = " + std::to_string(e.int_));
 		v.push_back(columns[36] + " = " + std::to_string(e.agi));
 		v.push_back(columns[37] + " = " + std::to_string(e.wis));
-		v.push_back(columns[38] + " = " + std::to_string(e.fire));
-		v.push_back(columns[39] + " = " + std::to_string(e.cold));
-		v.push_back(columns[40] + " = " + std::to_string(e.magic));
-		v.push_back(columns[41] + " = " + std::to_string(e.poison));
-		v.push_back(columns[42] + " = " + std::to_string(e.disease));
-		v.push_back(columns[43] + " = " + std::to_string(e.corruption));
-		v.push_back(columns[44] + " = " + std::to_string(e.show_helm));
-		v.push_back(columns[45] + " = " + std::to_string(e.follow_distance));
-		v.push_back(columns[46] + " = " + std::to_string(e.stop_melee_level));
-		v.push_back(columns[47] + " = " + std::to_string(e.expansion_bitmask));
-		v.push_back(columns[48] + " = " + std::to_string(e.enforce_spell_settings));
-		v.push_back(columns[49] + " = " + std::to_string(e.archery_setting));
-		v.push_back(columns[50] + " = " + std::to_string(e.caster_range));
+		v.push_back(columns[38] + " = " + std::to_string(e.extra_haste));
+		v.push_back(columns[39] + " = " + std::to_string(e.fire));
+		v.push_back(columns[40] + " = " + std::to_string(e.cold));
+		v.push_back(columns[41] + " = " + std::to_string(e.magic));
+		v.push_back(columns[42] + " = " + std::to_string(e.poison));
+		v.push_back(columns[43] + " = " + std::to_string(e.disease));
+		v.push_back(columns[44] + " = " + std::to_string(e.corruption));
+		v.push_back(columns[45] + " = " + std::to_string(e.show_helm));
+		v.push_back(columns[46] + " = " + std::to_string(e.follow_distance));
+		v.push_back(columns[47] + " = " + std::to_string(e.stop_melee_level));
+		v.push_back(columns[48] + " = " + std::to_string(e.expansion_bitmask));
+		v.push_back(columns[49] + " = " + std::to_string(e.enforce_spell_settings));
+		v.push_back(columns[50] + " = " + std::to_string(e.archery_setting));
+		v.push_back(columns[51] + " = " + std::to_string(e.caster_range));
 
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -508,6 +514,7 @@ public:
 		v.push_back(std::to_string(e.int_));
 		v.push_back(std::to_string(e.agi));
 		v.push_back(std::to_string(e.wis));
+		v.push_back(std::to_string(e.extra_haste));
 		v.push_back(std::to_string(e.fire));
 		v.push_back(std::to_string(e.cold));
 		v.push_back(std::to_string(e.magic));
@@ -588,6 +595,7 @@ public:
 			v.push_back(std::to_string(e.int_));
 			v.push_back(std::to_string(e.agi));
 			v.push_back(std::to_string(e.wis));
+			v.push_back(std::to_string(e.extra_haste));
 			v.push_back(std::to_string(e.fire));
 			v.push_back(std::to_string(e.cold));
 			v.push_back(std::to_string(e.magic));
@@ -672,19 +680,20 @@ public:
 			e.int_                   = row[35] ? static_cast<int32_t>(atoi(row[35])) : 75;
 			e.agi                    = row[36] ? static_cast<int32_t>(atoi(row[36])) : 75;
 			e.wis                    = row[37] ? static_cast<int32_t>(atoi(row[37])) : 75;
-			e.fire                   = row[38] ? static_cast<int16_t>(atoi(row[38])) : 0;
-			e.cold                   = row[39] ? static_cast<int16_t>(atoi(row[39])) : 0;
-			e.magic                  = row[40] ? static_cast<int16_t>(atoi(row[40])) : 0;
-			e.poison                 = row[41] ? static_cast<int16_t>(atoi(row[41])) : 0;
-			e.disease                = row[42] ? static_cast<int16_t>(atoi(row[42])) : 0;
-			e.corruption             = row[43] ? static_cast<int16_t>(atoi(row[43])) : 0;
-			e.show_helm              = row[44] ? static_cast<uint32_t>(strtoul(row[44], nullptr, 10)) : 0;
-			e.follow_distance        = row[45] ? static_cast<uint32_t>(strtoul(row[45], nullptr, 10)) : 200;
-			e.stop_melee_level       = row[46] ? static_cast<uint8_t>(strtoul(row[46], nullptr, 10)) : 255;
-			e.expansion_bitmask      = row[47] ? static_cast<int32_t>(atoi(row[47])) : -1;
-			e.enforce_spell_settings = row[48] ? static_cast<uint8_t>(strtoul(row[48], nullptr, 10)) : 0;
-			e.archery_setting        = row[49] ? static_cast<uint8_t>(strtoul(row[49], nullptr, 10)) : 0;
-			e.caster_range           = row[50] ? static_cast<uint32_t>(strtoul(row[50], nullptr, 10)) : 300;
+			e.extra_haste            = row[38] ? static_cast<int32_t>(atoi(row[38])) : 0;
+			e.fire                   = row[39] ? static_cast<int16_t>(atoi(row[39])) : 0;
+			e.cold                   = row[40] ? static_cast<int16_t>(atoi(row[40])) : 0;
+			e.magic                  = row[41] ? static_cast<int16_t>(atoi(row[41])) : 0;
+			e.poison                 = row[42] ? static_cast<int16_t>(atoi(row[42])) : 0;
+			e.disease                = row[43] ? static_cast<int16_t>(atoi(row[43])) : 0;
+			e.corruption             = row[44] ? static_cast<int16_t>(atoi(row[44])) : 0;
+			e.show_helm              = row[45] ? static_cast<uint32_t>(strtoul(row[45], nullptr, 10)) : 0;
+			e.follow_distance        = row[46] ? static_cast<uint32_t>(strtoul(row[46], nullptr, 10)) : 200;
+			e.stop_melee_level       = row[47] ? static_cast<uint8_t>(strtoul(row[47], nullptr, 10)) : 255;
+			e.expansion_bitmask      = row[48] ? static_cast<int32_t>(atoi(row[48])) : -1;
+			e.enforce_spell_settings = row[49] ? static_cast<uint8_t>(strtoul(row[49], nullptr, 10)) : 0;
+			e.archery_setting        = row[50] ? static_cast<uint8_t>(strtoul(row[50], nullptr, 10)) : 0;
+			e.caster_range           = row[51] ? static_cast<uint32_t>(strtoul(row[51], nullptr, 10)) : 300;
 
 			all_entries.push_back(e);
 		}
@@ -747,19 +756,20 @@ public:
 			e.int_                   = row[35] ? static_cast<int32_t>(atoi(row[35])) : 75;
 			e.agi                    = row[36] ? static_cast<int32_t>(atoi(row[36])) : 75;
 			e.wis                    = row[37] ? static_cast<int32_t>(atoi(row[37])) : 75;
-			e.fire                   = row[38] ? static_cast<int16_t>(atoi(row[38])) : 0;
-			e.cold                   = row[39] ? static_cast<int16_t>(atoi(row[39])) : 0;
-			e.magic                  = row[40] ? static_cast<int16_t>(atoi(row[40])) : 0;
-			e.poison                 = row[41] ? static_cast<int16_t>(atoi(row[41])) : 0;
-			e.disease                = row[42] ? static_cast<int16_t>(atoi(row[42])) : 0;
-			e.corruption             = row[43] ? static_cast<int16_t>(atoi(row[43])) : 0;
-			e.show_helm              = row[44] ? static_cast<uint32_t>(strtoul(row[44], nullptr, 10)) : 0;
-			e.follow_distance        = row[45] ? static_cast<uint32_t>(strtoul(row[45], nullptr, 10)) : 200;
-			e.stop_melee_level       = row[46] ? static_cast<uint8_t>(strtoul(row[46], nullptr, 10)) : 255;
-			e.expansion_bitmask      = row[47] ? static_cast<int32_t>(atoi(row[47])) : -1;
-			e.enforce_spell_settings = row[48] ? static_cast<uint8_t>(strtoul(row[48], nullptr, 10)) : 0;
-			e.archery_setting        = row[49] ? static_cast<uint8_t>(strtoul(row[49], nullptr, 10)) : 0;
-			e.caster_range           = row[50] ? static_cast<uint32_t>(strtoul(row[50], nullptr, 10)) : 300;
+			e.extra_haste            = row[38] ? static_cast<int32_t>(atoi(row[38])) : 0;
+			e.fire                   = row[39] ? static_cast<int16_t>(atoi(row[39])) : 0;
+			e.cold                   = row[40] ? static_cast<int16_t>(atoi(row[40])) : 0;
+			e.magic                  = row[41] ? static_cast<int16_t>(atoi(row[41])) : 0;
+			e.poison                 = row[42] ? static_cast<int16_t>(atoi(row[42])) : 0;
+			e.disease                = row[43] ? static_cast<int16_t>(atoi(row[43])) : 0;
+			e.corruption             = row[44] ? static_cast<int16_t>(atoi(row[44])) : 0;
+			e.show_helm              = row[45] ? static_cast<uint32_t>(strtoul(row[45], nullptr, 10)) : 0;
+			e.follow_distance        = row[46] ? static_cast<uint32_t>(strtoul(row[46], nullptr, 10)) : 200;
+			e.stop_melee_level       = row[47] ? static_cast<uint8_t>(strtoul(row[47], nullptr, 10)) : 255;
+			e.expansion_bitmask      = row[48] ? static_cast<int32_t>(atoi(row[48])) : -1;
+			e.enforce_spell_settings = row[49] ? static_cast<uint8_t>(strtoul(row[49], nullptr, 10)) : 0;
+			e.archery_setting        = row[50] ? static_cast<uint8_t>(strtoul(row[50], nullptr, 10)) : 0;
+			e.caster_range           = row[51] ? static_cast<uint32_t>(strtoul(row[51], nullptr, 10)) : 300;
 
 			all_entries.push_back(e);
 		}
@@ -872,6 +882,7 @@ public:
 		v.push_back(std::to_string(e.int_));
 		v.push_back(std::to_string(e.agi));
 		v.push_back(std::to_string(e.wis));
+		v.push_back(std::to_string(e.extra_haste));
 		v.push_back(std::to_string(e.fire));
 		v.push_back(std::to_string(e.cold));
 		v.push_back(std::to_string(e.magic));
@@ -945,6 +956,7 @@ public:
 			v.push_back(std::to_string(e.int_));
 			v.push_back(std::to_string(e.agi));
 			v.push_back(std::to_string(e.wis));
+			v.push_back(std::to_string(e.extra_haste));
 			v.push_back(std::to_string(e.fire));
 			v.push_back(std::to_string(e.cold));
 			v.push_back(std::to_string(e.magic));

common/repositories/base/base_bot_starting_items_repository.h

@@ -24,6 +24,12 @@ public:
 		uint32_t    classes;
 		uint32_t    item_id;
 		uint8_t     item_charges;
+		uint32_t    augment_one;
+		uint32_t    augment_two;
+		uint32_t    augment_three;
+		uint32_t    augment_four;
+		uint32_t    augment_five;
+		uint32_t    augment_six;
 		uint8_t     min_status;
 		int32_t     slot_id;
 		int8_t      min_expansion;
@@ -45,6 +51,12 @@ public:
 			"classes",
 			"item_id",
 			"item_charges",
+			"augment_one",
+			"augment_two",
+			"augment_three",
+			"augment_four",
+			"augment_five",
+			"augment_six",
 			"min_status",
 			"slot_id",
 			"min_expansion",
@@ -62,6 +74,12 @@ public:
 			"classes",
 			"item_id",
 			"item_charges",
+			"augment_one",
+			"augment_two",
+			"augment_three",
+			"augment_four",
+			"augment_five",
+			"augment_six",
 			"min_status",
 			"slot_id",
 			"min_expansion",
@@ -113,6 +131,12 @@ public:
 		e.classes                = 0;
 		e.item_id                = 0;
 		e.item_charges           = 1;
+		e.augment_one            = 0;
+		e.augment_two            = 0;
+		e.augment_three          = 0;
+		e.augment_four           = 0;
+		e.augment_five           = 0;
+		e.augment_six            = 0;
 		e.min_status             = 0;
 		e.slot_id                = -1;
 		e.min_expansion          = -1;
@@ -160,12 +184,18 @@ public:
 			e.classes                = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
 			e.item_id                = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
 			e.item_charges           = row[4] ? static_cast<uint8_t>(strtoul(row[4], nullptr, 10)) : 1;
-			e.min_status             = row[5] ? static_cast<uint8_t>(strtoul(row[5], nullptr, 10)) : 0;
-			e.slot_id                = row[6] ? static_cast<int32_t>(atoi(row[6])) : -1;
-			e.min_expansion          = row[7] ? static_cast<int8_t>(atoi(row[7])) : -1;
-			e.max_expansion          = row[8] ? static_cast<int8_t>(atoi(row[8])) : -1;
-			e.content_flags          = row[9] ? row[9] : "";
-			e.content_flags_disabled = row[10] ? row[10] : "";
+			e.augment_one            = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
+			e.augment_two            = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
+			e.augment_three          = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
+			e.augment_four           = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
+			e.augment_five           = row[9] ? static_cast<uint32_t>(strtoul(row[9], nullptr, 10)) : 0;
+			e.augment_six            = row[10] ? static_cast<uint32_t>(strtoul(row[10], nullptr, 10)) : 0;
+			e.min_status             = row[11] ? static_cast<uint8_t>(strtoul(row[11], nullptr, 10)) : 0;
+			e.slot_id                = row[12] ? static_cast<int32_t>(atoi(row[12])) : -1;
+			e.min_expansion          = row[13] ? static_cast<int8_t>(atoi(row[13])) : -1;
+			e.max_expansion          = row[14] ? static_cast<int8_t>(atoi(row[14])) : -1;
+			e.content_flags          = row[15] ? row[15] : "";
+			e.content_flags_disabled = row[16] ? row[16] : "";
 
 			return e;
 		}
@@ -203,12 +233,18 @@ public:
 		v.push_back(columns[2] + " = " + std::to_string(e.classes));
 		v.push_back(columns[3] + " = " + std::to_string(e.item_id));
 		v.push_back(columns[4] + " = " + std::to_string(e.item_charges));
-		v.push_back(columns[5] + " = " + std::to_string(e.min_status));
-		v.push_back(columns[6] + " = " + std::to_string(e.slot_id));
-		v.push_back(columns[7] + " = " + std::to_string(e.min_expansion));
-		v.push_back(columns[8] + " = " + std::to_string(e.max_expansion));
-		v.push_back(columns[9] + " = '" + Strings::Escape(e.content_flags) + "'");
-		v.push_back(columns[10] + " = '" + Strings::Escape(e.content_flags_disabled) + "'");
+		v.push_back(columns[5] + " = " + std::to_string(e.augment_one));
+		v.push_back(columns[6] + " = " + std::to_string(e.augment_two));
+		v.push_back(columns[7] + " = " + std::to_string(e.augment_three));
+		v.push_back(columns[8] + " = " + std::to_string(e.augment_four));
+		v.push_back(columns[9] + " = " + std::to_string(e.augment_five));
+		v.push_back(columns[10] + " = " + std::to_string(e.augment_six));
+		v.push_back(columns[11] + " = " + std::to_string(e.min_status));
+		v.push_back(columns[12] + " = " + std::to_string(e.slot_id));
+		v.push_back(columns[13] + " = " + std::to_string(e.min_expansion));
+		v.push_back(columns[14] + " = " + std::to_string(e.max_expansion));
+		v.push_back(columns[15] + " = '" + Strings::Escape(e.content_flags) + "'");
+		v.push_back(columns[16] + " = '" + Strings::Escape(e.content_flags_disabled) + "'");
 
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -235,6 +271,12 @@ public:
 		v.push_back(std::to_string(e.classes));
 		v.push_back(std::to_string(e.item_id));
 		v.push_back(std::to_string(e.item_charges));
+		v.push_back(std::to_string(e.augment_one));
+		v.push_back(std::to_string(e.augment_two));
+		v.push_back(std::to_string(e.augment_three));
+		v.push_back(std::to_string(e.augment_four));
+		v.push_back(std::to_string(e.augment_five));
+		v.push_back(std::to_string(e.augment_six));
 		v.push_back(std::to_string(e.min_status));
 		v.push_back(std::to_string(e.slot_id));
 		v.push_back(std::to_string(e.min_expansion));
@@ -275,6 +317,12 @@ public:
 			v.push_back(std::to_string(e.classes));
 			v.push_back(std::to_string(e.item_id));
 			v.push_back(std::to_string(e.item_charges));
+			v.push_back(std::to_string(e.augment_one));
+			v.push_back(std::to_string(e.augment_two));
+			v.push_back(std::to_string(e.augment_three));
+			v.push_back(std::to_string(e.augment_four));
+			v.push_back(std::to_string(e.augment_five));
+			v.push_back(std::to_string(e.augment_six));
 			v.push_back(std::to_string(e.min_status));
 			v.push_back(std::to_string(e.slot_id));
 			v.push_back(std::to_string(e.min_expansion));
@@ -319,12 +367,18 @@ public:
 			e.classes                = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
 			e.item_id                = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
 			e.item_charges           = row[4] ? static_cast<uint8_t>(strtoul(row[4], nullptr, 10)) : 1;
-			e.min_status             = row[5] ? static_cast<uint8_t>(strtoul(row[5], nullptr, 10)) : 0;
-			e.slot_id                = row[6] ? static_cast<int32_t>(atoi(row[6])) : -1;
-			e.min_expansion          = row[7] ? static_cast<int8_t>(atoi(row[7])) : -1;
-			e.max_expansion          = row[8] ? static_cast<int8_t>(atoi(row[8])) : -1;
-			e.content_flags          = row[9] ? row[9] : "";
-			e.content_flags_disabled = row[10] ? row[10] : "";
+			e.augment_one            = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
+			e.augment_two            = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
+			e.augment_three          = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
+			e.augment_four           = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
+			e.augment_five           = row[9] ? static_cast<uint32_t>(strtoul(row[9], nullptr, 10)) : 0;
+			e.augment_six            = row[10] ? static_cast<uint32_t>(strtoul(row[10], nullptr, 10)) : 0;
+			e.min_status             = row[11] ? static_cast<uint8_t>(strtoul(row[11], nullptr, 10)) : 0;
+			e.slot_id                = row[12] ? static_cast<int32_t>(atoi(row[12])) : -1;
+			e.min_expansion          = row[13] ? static_cast<int8_t>(atoi(row[13])) : -1;
+			e.max_expansion          = row[14] ? static_cast<int8_t>(atoi(row[14])) : -1;
+			e.content_flags          = row[15] ? row[15] : "";
+			e.content_flags_disabled = row[16] ? row[16] : "";
 
 			all_entries.push_back(e);
 		}
@@ -354,12 +408,18 @@ public:
 			e.classes                = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
 			e.item_id                = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
 			e.item_charges           = row[4] ? static_cast<uint8_t>(strtoul(row[4], nullptr, 10)) : 1;
-			e.min_status             = row[5] ? static_cast<uint8_t>(strtoul(row[5], nullptr, 10)) : 0;
-			e.slot_id                = row[6] ? static_cast<int32_t>(atoi(row[6])) : -1;
-			e.min_expansion          = row[7] ? static_cast<int8_t>(atoi(row[7])) : -1;
-			e.max_expansion          = row[8] ? static_cast<int8_t>(atoi(row[8])) : -1;
-			e.content_flags          = row[9] ? row[9] : "";
-			e.content_flags_disabled = row[10] ? row[10] : "";
+			e.augment_one            = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
+			e.augment_two            = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
+			e.augment_three          = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
+			e.augment_four           = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
+			e.augment_five           = row[9] ? static_cast<uint32_t>(strtoul(row[9], nullptr, 10)) : 0;
+			e.augment_six            = row[10] ? static_cast<uint32_t>(strtoul(row[10], nullptr, 10)) : 0;
+			e.min_status             = row[11] ? static_cast<uint8_t>(strtoul(row[11], nullptr, 10)) : 0;
+			e.slot_id                = row[12] ? static_cast<int32_t>(atoi(row[12])) : -1;
+			e.min_expansion          = row[13] ? static_cast<int8_t>(atoi(row[13])) : -1;
+			e.max_expansion          = row[14] ? static_cast<int8_t>(atoi(row[14])) : -1;
+			e.content_flags          = row[15] ? row[15] : "";
+			e.content_flags_disabled = row[16] ? row[16] : "";
 
 			all_entries.push_back(e);
 		}
@@ -439,6 +499,12 @@ public:
 		v.push_back(std::to_string(e.classes));
 		v.push_back(std::to_string(e.item_id));
 		v.push_back(std::to_string(e.item_charges));
+		v.push_back(std::to_string(e.augment_one));
+		v.push_back(std::to_string(e.augment_two));
+		v.push_back(std::to_string(e.augment_three));
+		v.push_back(std::to_string(e.augment_four));
+		v.push_back(std::to_string(e.augment_five));
+		v.push_back(std::to_string(e.augment_six));
 		v.push_back(std::to_string(e.min_status));
 		v.push_back(std::to_string(e.slot_id));
 		v.push_back(std::to_string(e.min_expansion));
@@ -472,6 +538,12 @@ public:
 			v.push_back(std::to_string(e.classes));
 			v.push_back(std::to_string(e.item_id));
 			v.push_back(std::to_string(e.item_charges));
+			v.push_back(std::to_string(e.augment_one));
+			v.push_back(std::to_string(e.augment_two));
+			v.push_back(std::to_string(e.augment_three));
+			v.push_back(std::to_string(e.augment_four));
+			v.push_back(std::to_string(e.augment_five));
+			v.push_back(std::to_string(e.augment_six));
 			v.push_back(std::to_string(e.min_status));
 			v.push_back(std::to_string(e.slot_id));
 			v.push_back(std::to_string(e.min_expansion));

common/repositories/base/base_character_corpses_repository.h

@@ -66,6 +66,10 @@ public:
 		uint32_t    wc_7;
 		uint32_t    wc_8;
 		uint32_t    wc_9;
+		uint32_t    rez_time;
+		uint32_t    gm_exp;
+		uint32_t    killed_by;
+		uint8_t     rezzable;
 	};
 
 	static std::string PrimaryKey()
@@ -123,6 +127,10 @@ public:
 			"wc_7",
 			"wc_8",
 			"wc_9",
+			"rez_time",
+			"gm_exp",
+			"killed_by",
+			"rezzable",
 		};
 	}
 
@@ -176,6 +184,10 @@ public:
 			"wc_7",
 			"wc_8",
 			"wc_9",
+			"rez_time",
+			"gm_exp",
+			"killed_by",
+			"rezzable",
 		};
 	}
 
@@ -225,7 +237,7 @@ public:
 		e.y                = 0;
 		e.z                = 0;
 		e.heading          = 0;
-		e.time_of_death    = 0;
+		e.time_of_death    = std::time(nullptr);
 		e.guild_consent_id = 0;
 		e.is_rezzed        = 0;
 		e.is_buried        = 0;
@@ -263,6 +275,10 @@ public:
 		e.wc_7             = 0;
 		e.wc_8             = 0;
 		e.wc_9             = 0;
+		e.rez_time         = 0;
+		e.gm_exp           = 0;
+		e.killed_by        = 0;
+		e.rezzable         = 0;
 
 		return e;
 	}
@@ -346,6 +362,10 @@ public:
 			e.wc_7             = row[44] ? static_cast<uint32_t>(strtoul(row[44], nullptr, 10)) : 0;
 			e.wc_8             = row[45] ? static_cast<uint32_t>(strtoul(row[45], nullptr, 10)) : 0;
 			e.wc_9             = row[46] ? static_cast<uint32_t>(strtoul(row[46], nullptr, 10)) : 0;
+			e.rez_time         = row[47] ? static_cast<uint32_t>(strtoul(row[47], nullptr, 10)) : 0;
+			e.gm_exp           = row[48] ? static_cast<uint32_t>(strtoul(row[48], nullptr, 10)) : 0;
+			e.killed_by        = row[49] ? static_cast<uint32_t>(strtoul(row[49], nullptr, 10)) : 0;
+			e.rezzable         = row[50] ? static_cast<uint8_t>(strtoul(row[50], nullptr, 10)) : 0;
 
 			return e;
 		}
@@ -425,6 +445,10 @@ public:
 		v.push_back(columns[44] + " = " + std::to_string(e.wc_7));
 		v.push_back(columns[45] + " = " + std::to_string(e.wc_8));
 		v.push_back(columns[46] + " = " + std::to_string(e.wc_9));
+		v.push_back(columns[47] + " = " + std::to_string(e.rez_time));
+		v.push_back(columns[48] + " = " + std::to_string(e.gm_exp));
+		v.push_back(columns[49] + " = " + std::to_string(e.killed_by));
+		v.push_back(columns[50] + " = " + std::to_string(e.rezzable));
 
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -493,6 +517,10 @@ public:
 		v.push_back(std::to_string(e.wc_7));
 		v.push_back(std::to_string(e.wc_8));
 		v.push_back(std::to_string(e.wc_9));
+		v.push_back(std::to_string(e.rez_time));
+		v.push_back(std::to_string(e.gm_exp));
+		v.push_back(std::to_string(e.killed_by));
+		v.push_back(std::to_string(e.rezzable));
 
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -569,6 +597,10 @@ public:
 			v.push_back(std::to_string(e.wc_7));
 			v.push_back(std::to_string(e.wc_8));
 			v.push_back(std::to_string(e.wc_9));
+			v.push_back(std::to_string(e.rez_time));
+			v.push_back(std::to_string(e.gm_exp));
+			v.push_back(std::to_string(e.killed_by));
+			v.push_back(std::to_string(e.rezzable));
 
 			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
 		}
@@ -649,6 +681,10 @@ public:
 			e.wc_7             = row[44] ? static_cast<uint32_t>(strtoul(row[44], nullptr, 10)) : 0;
 			e.wc_8             = row[45] ? static_cast<uint32_t>(strtoul(row[45], nullptr, 10)) : 0;
 			e.wc_9             = row[46] ? static_cast<uint32_t>(strtoul(row[46], nullptr, 10)) : 0;
+			e.rez_time         = row[47] ? static_cast<uint32_t>(strtoul(row[47], nullptr, 10)) : 0;
+			e.gm_exp           = row[48] ? static_cast<uint32_t>(strtoul(row[48], nullptr, 10)) : 0;
+			e.killed_by        = row[49] ? static_cast<uint32_t>(strtoul(row[49], nullptr, 10)) : 0;
+			e.rezzable         = row[50] ? static_cast<uint8_t>(strtoul(row[50], nullptr, 10)) : 0;
 
 			all_entries.push_back(e);
 		}
@@ -720,6 +756,10 @@ public:
 			e.wc_7             = row[44] ? static_cast<uint32_t>(strtoul(row[44], nullptr, 10)) : 0;
 			e.wc_8             = row[45] ? static_cast<uint32_t>(strtoul(row[45], nullptr, 10)) : 0;
 			e.wc_9             = row[46] ? static_cast<uint32_t>(strtoul(row[46], nullptr, 10)) : 0;
+			e.rez_time         = row[47] ? static_cast<uint32_t>(strtoul(row[47], nullptr, 10)) : 0;
+			e.gm_exp           = row[48] ? static_cast<uint32_t>(strtoul(row[48], nullptr, 10)) : 0;
+			e.killed_by        = row[49] ? static_cast<uint32_t>(strtoul(row[49], nullptr, 10)) : 0;
+			e.rezzable         = row[50] ? static_cast<uint8_t>(strtoul(row[50], nullptr, 10)) : 0;
 
 			all_entries.push_back(e);
 		}
@@ -841,6 +881,10 @@ public:
 		v.push_back(std::to_string(e.wc_7));
 		v.push_back(std::to_string(e.wc_8));
 		v.push_back(std::to_string(e.wc_9));
+		v.push_back(std::to_string(e.rez_time));
+		v.push_back(std::to_string(e.gm_exp));
+		v.push_back(std::to_string(e.killed_by));
+		v.push_back(std::to_string(e.rezzable));
 
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -910,6 +954,10 @@ public:
 			v.push_back(std::to_string(e.wc_7));
 			v.push_back(std::to_string(e.wc_8));
 			v.push_back(std::to_string(e.wc_9));
+			v.push_back(std::to_string(e.rez_time));
+			v.push_back(std::to_string(e.gm_exp));
+			v.push_back(std::to_string(e.killed_by));
+			v.push_back(std::to_string(e.rezzable));
 
 			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
 		}

common/repositories/base/base_character_data_repository.h

@@ -77,6 +77,7 @@ public:
 		uint32_t    int_;
 		uint32_t    agi;
 		uint32_t    wis;
+		int32_t     extra_haste;
 		uint32_t    zone_change_count;
 		uint32_t    toxicity;
 		uint32_t    hunger_level;
@@ -190,6 +191,7 @@ public:
 			"`int`",
 			"agi",
 			"wis",
+			"extra_haste",
 			"zone_change_count",
 			"toxicity",
 			"hunger_level",
@@ -299,6 +301,7 @@ public:
 			"`int`",
 			"agi",
 			"wis",
+			"extra_haste",
 			"zone_change_count",
 			"toxicity",
 			"hunger_level",
@@ -442,6 +445,7 @@ public:
 		e.int_                    = 0;
 		e.agi                     = 0;
 		e.wis                     = 0;
+		e.extra_haste             = 0;
 		e.zone_change_count       = 0;
 		e.toxicity                = 0;
 		e.hunger_level            = 0;
@@ -581,51 +585,52 @@ public:
 			e.int_                    = row[55] ? static_cast<uint32_t>(strtoul(row[55], nullptr, 10)) : 0;
 			e.agi                     = row[56] ? static_cast<uint32_t>(strtoul(row[56], nullptr, 10)) : 0;
 			e.wis                     = row[57] ? static_cast<uint32_t>(strtoul(row[57], nullptr, 10)) : 0;
-			e.zone_change_count       = row[58] ? static_cast<uint32_t>(strtoul(row[58], nullptr, 10)) : 0;
-			e.toxicity                = row[59] ? static_cast<uint32_t>(strtoul(row[59], nullptr, 10)) : 0;
-			e.hunger_level            = row[60] ? static_cast<uint32_t>(strtoul(row[60], nullptr, 10)) : 0;
-			e.thirst_level            = row[61] ? static_cast<uint32_t>(strtoul(row[61], nullptr, 10)) : 0;
-			e.ability_up              = row[62] ? static_cast<uint32_t>(strtoul(row[62], nullptr, 10)) : 0;
-			e.ldon_points_guk         = row[63] ? static_cast<uint32_t>(strtoul(row[63], nullptr, 10)) : 0;
-			e.ldon_points_mir         = row[64] ? static_cast<uint32_t>(strtoul(row[64], nullptr, 10)) : 0;
-			e.ldon_points_mmc         = row[65] ? static_cast<uint32_t>(strtoul(row[65], nullptr, 10)) : 0;
-			e.ldon_points_ruj         = row[66] ? static_cast<uint32_t>(strtoul(row[66], nullptr, 10)) : 0;
-			e.ldon_points_tak         = row[67] ? static_cast<uint32_t>(strtoul(row[67], nullptr, 10)) : 0;
-			e.ldon_points_available   = row[68] ? static_cast<uint32_t>(strtoul(row[68], nullptr, 10)) : 0;
-			e.tribute_time_remaining  = row[69] ? static_cast<uint32_t>(strtoul(row[69], nullptr, 10)) : 0;
-			e.career_tribute_points   = row[70] ? static_cast<uint32_t>(strtoul(row[70], nullptr, 10)) : 0;
-			e.tribute_points          = row[71] ? static_cast<uint32_t>(strtoul(row[71], nullptr, 10)) : 0;
-			e.tribute_active          = row[72] ? static_cast<uint32_t>(strtoul(row[72], nullptr, 10)) : 0;
-			e.pvp_status              = row[73] ? static_cast<uint8_t>(strtoul(row[73], nullptr, 10)) : 0;
-			e.pvp_kills               = row[74] ? static_cast<uint32_t>(strtoul(row[74], nullptr, 10)) : 0;
-			e.pvp_deaths              = row[75] ? static_cast<uint32_t>(strtoul(row[75], nullptr, 10)) : 0;
-			e.pvp_current_points      = row[76] ? static_cast<uint32_t>(strtoul(row[76], nullptr, 10)) : 0;
-			e.pvp_career_points       = row[77] ? static_cast<uint32_t>(strtoul(row[77], nullptr, 10)) : 0;
-			e.pvp_best_kill_streak    = row[78] ? static_cast<uint32_t>(strtoul(row[78], nullptr, 10)) : 0;
-			e.pvp_worst_death_streak  = row[79] ? static_cast<uint32_t>(strtoul(row[79], nullptr, 10)) : 0;
-			e.pvp_current_kill_streak = row[80] ? static_cast<uint32_t>(strtoul(row[80], nullptr, 10)) : 0;
-			e.pvp2                    = row[81] ? static_cast<uint32_t>(strtoul(row[81], nullptr, 10)) : 0;
-			e.pvp_type                = row[82] ? static_cast<uint32_t>(strtoul(row[82], nullptr, 10)) : 0;
-			e.show_helm               = row[83] ? static_cast<uint32_t>(strtoul(row[83], nullptr, 10)) : 0;
-			e.group_auto_consent      = row[84] ? static_cast<uint8_t>(strtoul(row[84], nullptr, 10)) : 0;
-			e.raid_auto_consent       = row[85] ? static_cast<uint8_t>(strtoul(row[85], nullptr, 10)) : 0;
-			e.guild_auto_consent      = row[86] ? static_cast<uint8_t>(strtoul(row[86], nullptr, 10)) : 0;
-			e.leadership_exp_on       = row[87] ? static_cast<uint8_t>(strtoul(row[87], nullptr, 10)) : 0;
-			e.RestTimer               = row[88] ? static_cast<uint32_t>(strtoul(row[88], nullptr, 10)) : 0;
-			e.air_remaining           = row[89] ? static_cast<uint32_t>(strtoul(row[89], nullptr, 10)) : 0;
-			e.autosplit_enabled       = row[90] ? static_cast<uint32_t>(strtoul(row[90], nullptr, 10)) : 0;
-			e.lfp                     = row[91] ? static_cast<uint8_t>(strtoul(row[91], nullptr, 10)) : 0;
-			e.lfg                     = row[92] ? static_cast<uint8_t>(strtoul(row[92], nullptr, 10)) : 0;
-			e.mailkey                 = row[93] ? row[93] : "";
-			e.xtargets                = row[94] ? static_cast<uint8_t>(strtoul(row[94], nullptr, 10)) : 5;
-			e.firstlogon              = row[95] ? static_cast<int8_t>(atoi(row[95])) : 0;
-			e.e_aa_effects            = row[96] ? static_cast<uint32_t>(strtoul(row[96], nullptr, 10)) : 0;
-			e.e_percent_to_aa         = row[97] ? static_cast<uint32_t>(strtoul(row[97], nullptr, 10)) : 0;
-			e.e_expended_aa_spent     = row[98] ? static_cast<uint32_t>(strtoul(row[98], nullptr, 10)) : 0;
-			e.aa_points_spent_old     = row[99] ? static_cast<uint32_t>(strtoul(row[99], nullptr, 10)) : 0;
-			e.aa_points_old           = row[100] ? static_cast<uint32_t>(strtoul(row[100], nullptr, 10)) : 0;
-			e.e_last_invsnapshot      = row[101] ? static_cast<uint32_t>(strtoul(row[101], nullptr, 10)) : 0;
-			e.deleted_at              = strtoll(row[102] ? row[102] : "-1", nullptr, 10);
+			e.extra_haste             = row[58] ? static_cast<int32_t>(atoi(row[58])) : 0;
+			e.zone_change_count       = row[59] ? static_cast<uint32_t>(strtoul(row[59], nullptr, 10)) : 0;
+			e.toxicity                = row[60] ? static_cast<uint32_t>(strtoul(row[60], nullptr, 10)) : 0;
+			e.hunger_level            = row[61] ? static_cast<uint32_t>(strtoul(row[61], nullptr, 10)) : 0;
+			e.thirst_level            = row[62] ? static_cast<uint32_t>(strtoul(row[62], nullptr, 10)) : 0;
+			e.ability_up              = row[63] ? static_cast<uint32_t>(strtoul(row[63], nullptr, 10)) : 0;
+			e.ldon_points_guk         = row[64] ? static_cast<uint32_t>(strtoul(row[64], nullptr, 10)) : 0;
+			e.ldon_points_mir         = row[65] ? static_cast<uint32_t>(strtoul(row[65], nullptr, 10)) : 0;
+			e.ldon_points_mmc         = row[66] ? static_cast<uint32_t>(strtoul(row[66], nullptr, 10)) : 0;
+			e.ldon_points_ruj         = row[67] ? static_cast<uint32_t>(strtoul(row[67], nullptr, 10)) : 0;
+			e.ldon_points_tak         = row[68] ? static_cast<uint32_t>(strtoul(row[68], nullptr, 10)) : 0;
+			e.ldon_points_available   = row[69] ? static_cast<uint32_t>(strtoul(row[69], nullptr, 10)) : 0;
+			e.tribute_time_remaining  = row[70] ? static_cast<uint32_t>(strtoul(row[70], nullptr, 10)) : 0;
+			e.career_tribute_points   = row[71] ? static_cast<uint32_t>(strtoul(row[71], nullptr, 10)) : 0;
+			e.tribute_points          = row[72] ? static_cast<uint32_t>(strtoul(row[72], nullptr, 10)) : 0;
+			e.tribute_active          = row[73] ? static_cast<uint32_t>(strtoul(row[73], nullptr, 10)) : 0;
+			e.pvp_status              = row[74] ? static_cast<uint8_t>(strtoul(row[74], nullptr, 10)) : 0;
+			e.pvp_kills               = row[75] ? static_cast<uint32_t>(strtoul(row[75], nullptr, 10)) : 0;
+			e.pvp_deaths              = row[76] ? static_cast<uint32_t>(strtoul(row[76], nullptr, 10)) : 0;
+			e.pvp_current_points      = row[77] ? static_cast<uint32_t>(strtoul(row[77], nullptr, 10)) : 0;
+			e.pvp_career_points       = row[78] ? static_cast<uint32_t>(strtoul(row[78], nullptr, 10)) : 0;
+			e.pvp_best_kill_streak    = row[79] ? static_cast<uint32_t>(strtoul(row[79], nullptr, 10)) : 0;
+			e.pvp_worst_death_streak  = row[80] ? static_cast<uint32_t>(strtoul(row[80], nullptr, 10)) : 0;
+			e.pvp_current_kill_streak = row[81] ? static_cast<uint32_t>(strtoul(row[81], nullptr, 10)) : 0;
+			e.pvp2                    = row[82] ? static_cast<uint32_t>(strtoul(row[82], nullptr, 10)) : 0;
+			e.pvp_type                = row[83] ? static_cast<uint32_t>(strtoul(row[83], nullptr, 10)) : 0;
+			e.show_helm               = row[84] ? static_cast<uint32_t>(strtoul(row[84], nullptr, 10)) : 0;
+			e.group_auto_consent      = row[85] ? static_cast<uint8_t>(strtoul(row[85], nullptr, 10)) : 0;
+			e.raid_auto_consent       = row[86] ? static_cast<uint8_t>(strtoul(row[86], nullptr, 10)) : 0;
+			e.guild_auto_consent      = row[87] ? static_cast<uint8_t>(strtoul(row[87], nullptr, 10)) : 0;
+			e.leadership_exp_on       = row[88] ? static_cast<uint8_t>(strtoul(row[88], nullptr, 10)) : 0;
+			e.RestTimer               = row[89] ? static_cast<uint32_t>(strtoul(row[89], nullptr, 10)) : 0;
+			e.air_remaining           = row[90] ? static_cast<uint32_t>(strtoul(row[90], nullptr, 10)) : 0;
+			e.autosplit_enabled       = row[91] ? static_cast<uint32_t>(strtoul(row[91], nullptr, 10)) : 0;
+			e.lfp                     = row[92] ? static_cast<uint8_t>(strtoul(row[92], nullptr, 10)) : 0;
+			e.lfg                     = row[93] ? static_cast<uint8_t>(strtoul(row[93], nullptr, 10)) : 0;
+			e.mailkey                 = row[94] ? row[94] : "";
+			e.xtargets                = row[95] ? static_cast<uint8_t>(strtoul(row[95], nullptr, 10)) : 5;
+			e.firstlogon              = row[96] ? static_cast<int8_t>(atoi(row[96])) : 0;
+			e.e_aa_effects            = row[97] ? static_cast<uint32_t>(strtoul(row[97], nullptr, 10)) : 0;
+			e.e_percent_to_aa         = row[98] ? static_cast<uint32_t>(strtoul(row[98], nullptr, 10)) : 0;
+			e.e_expended_aa_spent     = row[99] ? static_cast<uint32_t>(strtoul(row[99], nullptr, 10)) : 0;
+			e.aa_points_spent_old     = row[100] ? static_cast<uint32_t>(strtoul(row[100], nullptr, 10)) : 0;
+			e.aa_points_old           = row[101] ? static_cast<uint32_t>(strtoul(row[101], nullptr, 10)) : 0;
+			e.e_last_invsnapshot      = row[102] ? static_cast<uint32_t>(strtoul(row[102], nullptr, 10)) : 0;
+			e.deleted_at              = strtoll(row[103] ? row[103] : "-1", nullptr, 10);
 
 			return e;
 		}
@@ -716,51 +721,52 @@ public:
 		v.push_back(columns[55] + " = " + std::to_string(e.int_));
 		v.push_back(columns[56] + " = " + std::to_string(e.agi));
 		v.push_back(columns[57] + " = " + std::to_string(e.wis));
-		v.push_back(columns[58] + " = " + std::to_string(e.zone_change_count));
-		v.push_back(columns[59] + " = " + std::to_string(e.toxicity));
-		v.push_back(columns[60] + " = " + std::to_string(e.hunger_level));
-		v.push_back(columns[61] + " = " + std::to_string(e.thirst_level));
-		v.push_back(columns[62] + " = " + std::to_string(e.ability_up));
-		v.push_back(columns[63] + " = " + std::to_string(e.ldon_points_guk));
-		v.push_back(columns[64] + " = " + std::to_string(e.ldon_points_mir));
-		v.push_back(columns[65] + " = " + std::to_string(e.ldon_points_mmc));
-		v.push_back(columns[66] + " = " + std::to_string(e.ldon_points_ruj));
-		v.push_back(columns[67] + " = " + std::to_string(e.ldon_points_tak));
-		v.push_back(columns[68] + " = " + std::to_string(e.ldon_points_available));
-		v.push_back(columns[69] + " = " + std::to_string(e.tribute_time_remaining));
-		v.push_back(columns[70] + " = " + std::to_string(e.career_tribute_points));
-		v.push_back(columns[71] + " = " + std::to_string(e.tribute_points));
-		v.push_back(columns[72] + " = " + std::to_string(e.tribute_active));
-		v.push_back(columns[73] + " = " + std::to_string(e.pvp_status));
-		v.push_back(columns[74] + " = " + std::to_string(e.pvp_kills));
-		v.push_back(columns[75] + " = " + std::to_string(e.pvp_deaths));
-		v.push_back(columns[76] + " = " + std::to_string(e.pvp_current_points));
-		v.push_back(columns[77] + " = " + std::to_string(e.pvp_career_points));
-		v.push_back(columns[78] + " = " + std::to_string(e.pvp_best_kill_streak));
-		v.push_back(columns[79] + " = " + std::to_string(e.pvp_worst_death_streak));
-		v.push_back(columns[80] + " = " + std::to_string(e.pvp_current_kill_streak));
-		v.push_back(columns[81] + " = " + std::to_string(e.pvp2));
-		v.push_back(columns[82] + " = " + std::to_string(e.pvp_type));
-		v.push_back(columns[83] + " = " + std::to_string(e.show_helm));
-		v.push_back(columns[84] + " = " + std::to_string(e.group_auto_consent));
-		v.push_back(columns[85] + " = " + std::to_string(e.raid_auto_consent));
-		v.push_back(columns[86] + " = " + std::to_string(e.guild_auto_consent));
-		v.push_back(columns[87] + " = " + std::to_string(e.leadership_exp_on));
-		v.push_back(columns[88] + " = " + std::to_string(e.RestTimer));
-		v.push_back(columns[89] + " = " + std::to_string(e.air_remaining));
-		v.push_back(columns[90] + " = " + std::to_string(e.autosplit_enabled));
-		v.push_back(columns[91] + " = " + std::to_string(e.lfp));
-		v.push_back(columns[92] + " = " + std::to_string(e.lfg));
-		v.push_back(columns[93] + " = '" + Strings::Escape(e.mailkey) + "'");
-		v.push_back(columns[94] + " = " + std::to_string(e.xtargets));
-		v.push_back(columns[95] + " = " + std::to_string(e.firstlogon));
-		v.push_back(columns[96] + " = " + std::to_string(e.e_aa_effects));
-		v.push_back(columns[97] + " = " + std::to_string(e.e_percent_to_aa));
-		v.push_back(columns[98] + " = " + std::to_string(e.e_expended_aa_spent));
-		v.push_back(columns[99] + " = " + std::to_string(e.aa_points_spent_old));
-		v.push_back(columns[100] + " = " + std::to_string(e.aa_points_old));
-		v.push_back(columns[101] + " = " + std::to_string(e.e_last_invsnapshot));
-		v.push_back(columns[102] + " = FROM_UNIXTIME(" + (e.deleted_at > 0 ? std::to_string(e.deleted_at) : "null") + ")");
+		v.push_back(columns[58] + " = " + std::to_string(e.extra_haste));
+		v.push_back(columns[59] + " = " + std::to_string(e.zone_change_count));
+		v.push_back(columns[60] + " = " + std::to_string(e.toxicity));
+		v.push_back(columns[61] + " = " + std::to_string(e.hunger_level));
+		v.push_back(columns[62] + " = " + std::to_string(e.thirst_level));
+		v.push_back(columns[63] + " = " + std::to_string(e.ability_up));
+		v.push_back(columns[64] + " = " + std::to_string(e.ldon_points_guk));
+		v.push_back(columns[65] + " = " + std::to_string(e.ldon_points_mir));
+		v.push_back(columns[66] + " = " + std::to_string(e.ldon_points_mmc));
+		v.push_back(columns[67] + " = " + std::to_string(e.ldon_points_ruj));
+		v.push_back(columns[68] + " = " + std::to_string(e.ldon_points_tak));
+		v.push_back(columns[69] + " = " + std::to_string(e.ldon_points_available));
+		v.push_back(columns[70] + " = " + std::to_string(e.tribute_time_remaining));
+		v.push_back(columns[71] + " = " + std::to_string(e.career_tribute_points));
+		v.push_back(columns[72] + " = " + std::to_string(e.tribute_points));
+		v.push_back(columns[73] + " = " + std::to_string(e.tribute_active));
+		v.push_back(columns[74] + " = " + std::to_string(e.pvp_status));
+		v.push_back(columns[75] + " = " + std::to_string(e.pvp_kills));
+		v.push_back(columns[76] + " = " + std::to_string(e.pvp_deaths));
+		v.push_back(columns[77] + " = " + std::to_string(e.pvp_current_points));
+		v.push_back(columns[78] + " = " + std::to_string(e.pvp_career_points));
+		v.push_back(columns[79] + " = " + std::to_string(e.pvp_best_kill_streak));
+		v.push_back(columns[80] + " = " + std::to_string(e.pvp_worst_death_streak));
+		v.push_back(columns[81] + " = " + std::to_string(e.pvp_current_kill_streak));
+		v.push_back(columns[82] + " = " + std::to_string(e.pvp2));
+		v.push_back(columns[83] + " = " + std::to_string(e.pvp_type));
+		v.push_back(columns[84] + " = " + std::to_string(e.show_helm));
+		v.push_back(columns[85] + " = " + std::to_string(e.group_auto_consent));
+		v.push_back(columns[86] + " = " + std::to_string(e.raid_auto_consent));
+		v.push_back(columns[87] + " = " + std::to_string(e.guild_auto_consent));
+		v.push_back(columns[88] + " = " + std::to_string(e.leadership_exp_on));
+		v.push_back(columns[89] + " = " + std::to_string(e.RestTimer));
+		v.push_back(columns[90] + " = " + std::to_string(e.air_remaining));
+		v.push_back(columns[91] + " = " + std::to_string(e.autosplit_enabled));
+		v.push_back(columns[92] + " = " + std::to_string(e.lfp));
+		v.push_back(columns[93] + " = " + std::to_string(e.lfg));
+		v.push_back(columns[94] + " = '" + Strings::Escape(e.mailkey) + "'");
+		v.push_back(columns[95] + " = " + std::to_string(e.xtargets));
+		v.push_back(columns[96] + " = " + std::to_string(e.firstlogon));
+		v.push_back(columns[97] + " = " + std::to_string(e.e_aa_effects));
+		v.push_back(columns[98] + " = " + std::to_string(e.e_percent_to_aa));
+		v.push_back(columns[99] + " = " + std::to_string(e.e_expended_aa_spent));
+		v.push_back(columns[100] + " = " + std::to_string(e.aa_points_spent_old));
+		v.push_back(columns[101] + " = " + std::to_string(e.aa_points_old));
+		v.push_back(columns[102] + " = " + std::to_string(e.e_last_invsnapshot));
+		v.push_back(columns[103] + " = FROM_UNIXTIME(" + (e.deleted_at > 0 ? std::to_string(e.deleted_at) : "null") + ")");
 
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -840,6 +846,7 @@ public:
 		v.push_back(std::to_string(e.int_));
 		v.push_back(std::to_string(e.agi));
 		v.push_back(std::to_string(e.wis));
+		v.push_back(std::to_string(e.extra_haste));
 		v.push_back(std::to_string(e.zone_change_count));
 		v.push_back(std::to_string(e.toxicity));
 		v.push_back(std::to_string(e.hunger_level));
@@ -972,6 +979,7 @@ public:
 			v.push_back(std::to_string(e.int_));
 			v.push_back(std::to_string(e.agi));
 			v.push_back(std::to_string(e.wis));
+			v.push_back(std::to_string(e.extra_haste));
 			v.push_back(std::to_string(e.zone_change_count));
 			v.push_back(std::to_string(e.toxicity));
 			v.push_back(std::to_string(e.hunger_level));
@@ -1108,51 +1116,52 @@ public:
 			e.int_                    = row[55] ? static_cast<uint32_t>(strtoul(row[55], nullptr, 10)) : 0;
 			e.agi                     = row[56] ? static_cast<uint32_t>(strtoul(row[56], nullptr, 10)) : 0;
 			e.wis                     = row[57] ? static_cast<uint32_t>(strtoul(row[57], nullptr, 10)) : 0;
-			e.zone_change_count       = row[58] ? static_cast<uint32_t>(strtoul(row[58], nullptr, 10)) : 0;
-			e.toxicity                = row[59] ? static_cast<uint32_t>(strtoul(row[59], nullptr, 10)) : 0;
-			e.hunger_level            = row[60] ? static_cast<uint32_t>(strtoul(row[60], nullptr, 10)) : 0;
-			e.thirst_level            = row[61] ? static_cast<uint32_t>(strtoul(row[61], nullptr, 10)) : 0;
-			e.ability_up              = row[62] ? static_cast<uint32_t>(strtoul(row[62], nullptr, 10)) : 0;
-			e.ldon_points_guk         = row[63] ? static_cast<uint32_t>(strtoul(row[63], nullptr, 10)) : 0;
-			e.ldon_points_mir         = row[64] ? static_cast<uint32_t>(strtoul(row[64], nullptr, 10)) : 0;
-			e.ldon_points_mmc         = row[65] ? static_cast<uint32_t>(strtoul(row[65], nullptr, 10)) : 0;
-			e.ldon_points_ruj         = row[66] ? static_cast<uint32_t>(strtoul(row[66], nullptr, 10)) : 0;
-			e.ldon_points_tak         = row[67] ? static_cast<uint32_t>(strtoul(row[67], nullptr, 10)) : 0;
-			e.ldon_points_available   = row[68] ? static_cast<uint32_t>(strtoul(row[68], nullptr, 10)) : 0;
-			e.tribute_time_remaining  = row[69] ? static_cast<uint32_t>(strtoul(row[69], nullptr, 10)) : 0;
-			e.career_tribute_points   = row[70] ? static_cast<uint32_t>(strtoul(row[70], nullptr, 10)) : 0;
-			e.tribute_points          = row[71] ? static_cast<uint32_t>(strtoul(row[71], nullptr, 10)) : 0;
-			e.tribute_active          = row[72] ? static_cast<uint32_t>(strtoul(row[72], nullptr, 10)) : 0;
-			e.pvp_status              = row[73] ? static_cast<uint8_t>(strtoul(row[73], nullptr, 10)) : 0;
-			e.pvp_kills               = row[74] ? static_cast<uint32_t>(strtoul(row[74], nullptr, 10)) : 0;
-			e.pvp_deaths              = row[75] ? static_cast<uint32_t>(strtoul(row[75], nullptr, 10)) : 0;
-			e.pvp_current_points      = row[76] ? static_cast<uint32_t>(strtoul(row[76], nullptr, 10)) : 0;
-			e.pvp_career_points       = row[77] ? static_cast<uint32_t>(strtoul(row[77], nullptr, 10)) : 0;
-			e.pvp_best_kill_streak    = row[78] ? static_cast<uint32_t>(strtoul(row[78], nullptr, 10)) : 0;
-			e.pvp_worst_death_streak  = row[79] ? static_cast<uint32_t>(strtoul(row[79], nullptr, 10)) : 0;
-			e.pvp_current_kill_streak = row[80] ? static_cast<uint32_t>(strtoul(row[80], nullptr, 10)) : 0;
-			e.pvp2                    = row[81] ? static_cast<uint32_t>(strtoul(row[81], nullptr, 10)) : 0;
-			e.pvp_type                = row[82] ? static_cast<uint32_t>(strtoul(row[82], nullptr, 10)) : 0;
-			e.show_helm               = row[83] ? static_cast<uint32_t>(strtoul(row[83], nullptr, 10)) : 0;
-			e.group_auto_consent      = row[84] ? static_cast<uint8_t>(strtoul(row[84], nullptr, 10)) : 0;
-			e.raid_auto_consent       = row[85] ? static_cast<uint8_t>(strtoul(row[85], nullptr, 10)) : 0;
-			e.guild_auto_consent      = row[86] ? static_cast<uint8_t>(strtoul(row[86], nullptr, 10)) : 0;
-			e.leadership_exp_on       = row[87] ? static_cast<uint8_t>(strtoul(row[87], nullptr, 10)) : 0;
-			e.RestTimer               = row[88] ? static_cast<uint32_t>(strtoul(row[88], nullptr, 10)) : 0;
-			e.air_remaining           = row[89] ? static_cast<uint32_t>(strtoul(row[89], nullptr, 10)) : 0;
-			e.autosplit_enabled       = row[90] ? static_cast<uint32_t>(strtoul(row[90], nullptr, 10)) : 0;
-			e.lfp                     = row[91] ? static_cast<uint8_t>(strtoul(row[91], nullptr, 10)) : 0;
-			e.lfg                     = row[92] ? static_cast<uint8_t>(strtoul(row[92], nullptr, 10)) : 0;
-			e.mailkey                 = row[93] ? row[93] : "";
-			e.xtargets                = row[94] ? static_cast<uint8_t>(strtoul(row[94], nullptr, 10)) : 5;
-			e.firstlogon              = row[95] ? static_cast<int8_t>(atoi(row[95])) : 0;
-			e.e_aa_effects            = row[96] ? static_cast<uint32_t>(strtoul(row[96], nullptr, 10)) : 0;
-			e.e_percent_to_aa         = row[97] ? static_cast<uint32_t>(strtoul(row[97], nullptr, 10)) : 0;
-			e.e_expended_aa_spent     = row[98] ? static_cast<uint32_t>(strtoul(row[98], nullptr, 10)) : 0;
-			e.aa_points_spent_old     = row[99] ? static_cast<uint32_t>(strtoul(row[99], nullptr, 10)) : 0;
-			e.aa_points_old           = row[100] ? static_cast<uint32_t>(strtoul(row[100], nullptr, 10)) : 0;
-			e.e_last_invsnapshot      = row[101] ? static_cast<uint32_t>(strtoul(row[101], nullptr, 10)) : 0;
-			e.deleted_at              = strtoll(row[102] ? row[102] : "-1", nullptr, 10);
+			e.extra_haste             = row[58] ? static_cast<int32_t>(atoi(row[58])) : 0;
+			e.zone_change_count       = row[59] ? static_cast<uint32_t>(strtoul(row[59], nullptr, 10)) : 0;
+			e.toxicity                = row[60] ? static_cast<uint32_t>(strtoul(row[60], nullptr, 10)) : 0;
+			e.hunger_level            = row[61] ? static_cast<uint32_t>(strtoul(row[61], nullptr, 10)) : 0;
+			e.thirst_level            = row[62] ? static_cast<uint32_t>(strtoul(row[62], nullptr, 10)) : 0;
+			e.ability_up              = row[63] ? static_cast<uint32_t>(strtoul(row[63], nullptr, 10)) : 0;
+			e.ldon_points_guk         = row[64] ? static_cast<uint32_t>(strtoul(row[64], nullptr, 10)) : 0;
+			e.ldon_points_mir         = row[65] ? static_cast<uint32_t>(strtoul(row[65], nullptr, 10)) : 0;
+			e.ldon_points_mmc         = row[66] ? static_cast<uint32_t>(strtoul(row[66], nullptr, 10)) : 0;
+			e.ldon_points_ruj         = row[67] ? static_cast<uint32_t>(strtoul(row[67], nullptr, 10)) : 0;
+			e.ldon_points_tak         = row[68] ? static_cast<uint32_t>(strtoul(row[68], nullptr, 10)) : 0;
+			e.ldon_points_available   = row[69] ? static_cast<uint32_t>(strtoul(row[69], nullptr, 10)) : 0;
+			e.tribute_time_remaining  = row[70] ? static_cast<uint32_t>(strtoul(row[70], nullptr, 10)) : 0;
+			e.career_tribute_points   = row[71] ? static_cast<uint32_t>(strtoul(row[71], nullptr, 10)) : 0;
+			e.tribute_points          = row[72] ? static_cast<uint32_t>(strtoul(row[72], nullptr, 10)) : 0;
+			e.tribute_active          = row[73] ? static_cast<uint32_t>(strtoul(row[73], nullptr, 10)) : 0;
+			e.pvp_status              = row[74] ? static_cast<uint8_t>(strtoul(row[74], nullptr, 10)) : 0;
+			e.pvp_kills               = row[75] ? static_cast<uint32_t>(strtoul(row[75], nullptr, 10)) : 0;
+			e.pvp_deaths              = row[76] ? static_cast<uint32_t>(strtoul(row[76], nullptr, 10)) : 0;
+			e.pvp_current_points      = row[77] ? static_cast<uint32_t>(strtoul(row[77], nullptr, 10)) : 0;
+			e.pvp_career_points       = row[78] ? static_cast<uint32_t>(strtoul(row[78], nullptr, 10)) : 0;
+			e.pvp_best_kill_streak    = row[79] ? static_cast<uint32_t>(strtoul(row[79], nullptr, 10)) : 0;
+			e.pvp_worst_death_streak  = row[80] ? static_cast<uint32_t>(strtoul(row[80], nullptr, 10)) : 0;
+			e.pvp_current_kill_streak = row[81] ? static_cast<uint32_t>(strtoul(row[81], nullptr, 10)) : 0;
+			e.pvp2                    = row[82] ? static_cast<uint32_t>(strtoul(row[82], nullptr, 10)) : 0;
+			e.pvp_type                = row[83] ? static_cast<uint32_t>(strtoul(row[83], nullptr, 10)) : 0;
+			e.show_helm               = row[84] ? static_cast<uint32_t>(strtoul(row[84], nullptr, 10)) : 0;
+			e.group_auto_consent      = row[85] ? static_cast<uint8_t>(strtoul(row[85], nullptr, 10)) : 0;
+			e.raid_auto_consent       = row[86] ? static_cast<uint8_t>(strtoul(row[86], nullptr, 10)) : 0;
+			e.guild_auto_consent      = row[87] ? static_cast<uint8_t>(strtoul(row[87], nullptr, 10)) : 0;
+			e.leadership_exp_on       = row[88] ? static_cast<uint8_t>(strtoul(row[88], nullptr, 10)) : 0;
+			e.RestTimer               = row[89] ? static_cast<uint32_t>(strtoul(row[89], nullptr, 10)) : 0;
+			e.air_remaining           = row[90] ? static_cast<uint32_t>(strtoul(row[90], nullptr, 10)) : 0;
+			e.autosplit_enabled       = row[91] ? static_cast<uint32_t>(strtoul(row[91], nullptr, 10)) : 0;
+			e.lfp                     = row[92] ? static_cast<uint8_t>(strtoul(row[92], nullptr, 10)) : 0;
+			e.lfg                     = row[93] ? static_cast<uint8_t>(strtoul(row[93], nullptr, 10)) : 0;
+			e.mailkey                 = row[94] ? row[94] : "";
+			e.xtargets                = row[95] ? static_cast<uint8_t>(strtoul(row[95], nullptr, 10)) : 5;
+			e.firstlogon              = row[96] ? static_cast<int8_t>(atoi(row[96])) : 0;
+			e.e_aa_effects            = row[97] ? static_cast<uint32_t>(strtoul(row[97], nullptr, 10)) : 0;
+			e.e_percent_to_aa         = row[98] ? static_cast<uint32_t>(strtoul(row[98], nullptr, 10)) : 0;
+			e.e_expended_aa_spent     = row[99] ? static_cast<uint32_t>(strtoul(row[99], nullptr, 10)) : 0;
+			e.aa_points_spent_old     = row[100] ? static_cast<uint32_t>(strtoul(row[100], nullptr, 10)) : 0;
+			e.aa_points_old           = row[101] ? static_cast<uint32_t>(strtoul(row[101], nullptr, 10)) : 0;
+			e.e_last_invsnapshot      = row[102] ? static_cast<uint32_t>(strtoul(row[102], nullptr, 10)) : 0;
+			e.deleted_at              = strtoll(row[103] ? row[103] : "-1", nullptr, 10);
 
 			all_entries.push_back(e);
 		}
@@ -1235,51 +1244,52 @@ public:
 			e.int_                    = row[55] ? static_cast<uint32_t>(strtoul(row[55], nullptr, 10)) : 0;
 			e.agi                     = row[56] ? static_cast<uint32_t>(strtoul(row[56], nullptr, 10)) : 0;
 			e.wis                     = row[57] ? static_cast<uint32_t>(strtoul(row[57], nullptr, 10)) : 0;
-			e.zone_change_count       = row[58] ? static_cast<uint32_t>(strtoul(row[58], nullptr, 10)) : 0;
-			e.toxicity                = row[59] ? static_cast<uint32_t>(strtoul(row[59], nullptr, 10)) : 0;
-			e.hunger_level            = row[60] ? static_cast<uint32_t>(strtoul(row[60], nullptr, 10)) : 0;
-			e.thirst_level            = row[61] ? static_cast<uint32_t>(strtoul(row[61], nullptr, 10)) : 0;
-			e.ability_up              = row[62] ? static_cast<uint32_t>(strtoul(row[62], nullptr, 10)) : 0;
-			e.ldon_points_guk         = row[63] ? static_cast<uint32_t>(strtoul(row[63], nullptr, 10)) : 0;
-			e.ldon_points_mir         = row[64] ? static_cast<uint32_t>(strtoul(row[64], nullptr, 10)) : 0;
-			e.ldon_points_mmc         = row[65] ? static_cast<uint32_t>(strtoul(row[65], nullptr, 10)) : 0;
-			e.ldon_points_ruj         = row[66] ? static_cast<uint32_t>(strtoul(row[66], nullptr, 10)) : 0;
-			e.ldon_points_tak         = row[67] ? static_cast<uint32_t>(strtoul(row[67], nullptr, 10)) : 0;
-			e.ldon_points_available   = row[68] ? static_cast<uint32_t>(strtoul(row[68], nullptr, 10)) : 0;
-			e.tribute_time_remaining  = row[69] ? static_cast<uint32_t>(strtoul(row[69], nullptr, 10)) : 0;
-			e.career_tribute_points   = row[70] ? static_cast<uint32_t>(strtoul(row[70], nullptr, 10)) : 0;
-			e.tribute_points          = row[71] ? static_cast<uint32_t>(strtoul(row[71], nullptr, 10)) : 0;
-			e.tribute_active          = row[72] ? static_cast<uint32_t>(strtoul(row[72], nullptr, 10)) : 0;
-			e.pvp_status              = row[73] ? static_cast<uint8_t>(strtoul(row[73], nullptr, 10)) : 0;
-			e.pvp_kills               = row[74] ? static_cast<uint32_t>(strtoul(row[74], nullptr, 10)) : 0;
-			e.pvp_deaths              = row[75] ? static_cast<uint32_t>(strtoul(row[75], nullptr, 10)) : 0;
-			e.pvp_current_points      = row[76] ? static_cast<uint32_t>(strtoul(row[76], nullptr, 10)) : 0;
-			e.pvp_career_points       = row[77] ? static_cast<uint32_t>(strtoul(row[77], nullptr, 10)) : 0;
-			e.pvp_best_kill_streak    = row[78] ? static_cast<uint32_t>(strtoul(row[78], nullptr, 10)) : 0;
-			e.pvp_worst_death_streak  = row[79] ? static_cast<uint32_t>(strtoul(row[79], nullptr, 10)) : 0;
-			e.pvp_current_kill_streak = row[80] ? static_cast<uint32_t>(strtoul(row[80], nullptr, 10)) : 0;
-			e.pvp2                    = row[81] ? static_cast<uint32_t>(strtoul(row[81], nullptr, 10)) : 0;
-			e.pvp_type                = row[82] ? static_cast<uint32_t>(strtoul(row[82], nullptr, 10)) : 0;
-			e.show_helm               = row[83] ? static_cast<uint32_t>(strtoul(row[83], nullptr, 10)) : 0;
-			e.group_auto_consent      = row[84] ? static_cast<uint8_t>(strtoul(row[84], nullptr, 10)) : 0;
-			e.raid_auto_consent       = row[85] ? static_cast<uint8_t>(strtoul(row[85], nullptr, 10)) : 0;
-			e.guild_auto_consent      = row[86] ? static_cast<uint8_t>(strtoul(row[86], nullptr, 10)) : 0;
-			e.leadership_exp_on       = row[87] ? static_cast<uint8_t>(strtoul(row[87], nullptr, 10)) : 0;
-			e.RestTimer               = row[88] ? static_cast<uint32_t>(strtoul(row[88], nullptr, 10)) : 0;
-			e.air_remaining           = row[89] ? static_cast<uint32_t>(strtoul(row[89], nullptr, 10)) : 0;
-			e.autosplit_enabled       = row[90] ? static_cast<uint32_t>(strtoul(row[90], nullptr, 10)) : 0;
-			e.lfp                     = row[91] ? static_cast<uint8_t>(strtoul(row[91], nullptr, 10)) : 0;
-			e.lfg                     = row[92] ? static_cast<uint8_t>(strtoul(row[92], nullptr, 10)) : 0;
-			e.mailkey                 = row[93] ? row[93] : "";
-			e.xtargets                = row[94] ? static_cast<uint8_t>(strtoul(row[94], nullptr, 10)) : 5;
-			e.firstlogon              = row[95] ? static_cast<int8_t>(atoi(row[95])) : 0;
-			e.e_aa_effects            = row[96] ? static_cast<uint32_t>(strtoul(row[96], nullptr, 10)) : 0;
-			e.e_percent_to_aa         = row[97] ? static_cast<uint32_t>(strtoul(row[97], nullptr, 10)) : 0;
-			e.e_expended_aa_spent     = row[98] ? static_cast<uint32_t>(strtoul(row[98], nullptr, 10)) : 0;
-			e.aa_points_spent_old     = row[99] ? static_cast<uint32_t>(strtoul(row[99], nullptr, 10)) : 0;
-			e.aa_points_old           = row[100] ? static_cast<uint32_t>(strtoul(row[100], nullptr, 10)) : 0;
-			e.e_last_invsnapshot      = row[101] ? static_cast<uint32_t>(strtoul(row[101], nullptr, 10)) : 0;
-			e.deleted_at              = strtoll(row[102] ? row[102] : "-1", nullptr, 10);
+			e.extra_haste             = row[58] ? static_cast<int32_t>(atoi(row[58])) : 0;
+			e.zone_change_count       = row[59] ? static_cast<uint32_t>(strtoul(row[59], nullptr, 10)) : 0;
+			e.toxicity                = row[60] ? static_cast<uint32_t>(strtoul(row[60], nullptr, 10)) : 0;
+			e.hunger_level            = row[61] ? static_cast<uint32_t>(strtoul(row[61], nullptr, 10)) : 0;
+			e.thirst_level            = row[62] ? static_cast<uint32_t>(strtoul(row[62], nullptr, 10)) : 0;
+			e.ability_up              = row[63] ? static_cast<uint32_t>(strtoul(row[63], nullptr, 10)) : 0;
+			e.ldon_points_guk         = row[64] ? static_cast<uint32_t>(strtoul(row[64], nullptr, 10)) : 0;
+			e.ldon_points_mir         = row[65] ? static_cast<uint32_t>(strtoul(row[65], nullptr, 10)) : 0;
+			e.ldon_points_mmc         = row[66] ? static_cast<uint32_t>(strtoul(row[66], nullptr, 10)) : 0;
+			e.ldon_points_ruj         = row[67] ? static_cast<uint32_t>(strtoul(row[67], nullptr, 10)) : 0;
+			e.ldon_points_tak         = row[68] ? static_cast<uint32_t>(strtoul(row[68], nullptr, 10)) : 0;
+			e.ldon_points_available   = row[69] ? static_cast<uint32_t>(strtoul(row[69], nullptr, 10)) : 0;
+			e.tribute_time_remaining  = row[70] ? static_cast<uint32_t>(strtoul(row[70], nullptr, 10)) : 0;
+			e.career_tribute_points   = row[71] ? static_cast<uint32_t>(strtoul(row[71], nullptr, 10)) : 0;
+			e.tribute_points          = row[72] ? static_cast<uint32_t>(strtoul(row[72], nullptr, 10)) : 0;
+			e.tribute_active          = row[73] ? static_cast<uint32_t>(strtoul(row[73], nullptr, 10)) : 0;
+			e.pvp_status              = row[74] ? static_cast<uint8_t>(strtoul(row[74], nullptr, 10)) : 0;
+			e.pvp_kills               = row[75] ? static_cast<uint32_t>(strtoul(row[75], nullptr, 10)) : 0;
+			e.pvp_deaths              = row[76] ? static_cast<uint32_t>(strtoul(row[76], nullptr, 10)) : 0;
+			e.pvp_current_points      = row[77] ? static_cast<uint32_t>(strtoul(row[77], nullptr, 10)) : 0;
+			e.pvp_career_points       = row[78] ? static_cast<uint32_t>(strtoul(row[78], nullptr, 10)) : 0;
+			e.pvp_best_kill_streak    = row[79] ? static_cast<uint32_t>(strtoul(row[79], nullptr, 10)) : 0;
+			e.pvp_worst_death_streak  = row[80] ? static_cast<uint32_t>(strtoul(row[80], nullptr, 10)) : 0;
+			e.pvp_current_kill_streak = row[81] ? static_cast<uint32_t>(strtoul(row[81], nullptr, 10)) : 0;
+			e.pvp2                    = row[82] ? static_cast<uint32_t>(strtoul(row[82], nullptr, 10)) : 0;
+			e.pvp_type                = row[83] ? static_cast<uint32_t>(strtoul(row[83], nullptr, 10)) : 0;
+			e.show_helm               = row[84] ? static_cast<uint32_t>(strtoul(row[84], nullptr, 10)) : 0;
+			e.group_auto_consent      = row[85] ? static_cast<uint8_t>(strtoul(row[85], nullptr, 10)) : 0;
+			e.raid_auto_consent       = row[86] ? static_cast<uint8_t>(strtoul(row[86], nullptr, 10)) : 0;
+			e.guild_auto_consent      = row[87] ? static_cast<uint8_t>(strtoul(row[87], nullptr, 10)) : 0;
+			e.leadership_exp_on       = row[88] ? static_cast<uint8_t>(strtoul(row[88], nullptr, 10)) : 0;
+			e.RestTimer               = row[89] ? static_cast<uint32_t>(strtoul(row[89], nullptr, 10)) : 0;
+			e.air_remaining           = row[90] ? static_cast<uint32_t>(strtoul(row[90], nullptr, 10)) : 0;
+			e.autosplit_enabled       = row[91] ? static_cast<uint32_t>(strtoul(row[91], nullptr, 10)) : 0;
+			e.lfp                     = row[92] ? static_cast<uint8_t>(strtoul(row[92], nullptr, 10)) : 0;
+			e.lfg                     = row[93] ? static_cast<uint8_t>(strtoul(row[93], nullptr, 10)) : 0;
+			e.mailkey                 = row[94] ? row[94] : "";
+			e.xtargets                = row[95] ? static_cast<uint8_t>(strtoul(row[95], nullptr, 10)) : 5;
+			e.firstlogon              = row[96] ? static_cast<int8_t>(atoi(row[96])) : 0;
+			e.e_aa_effects            = row[97] ? static_cast<uint32_t>(strtoul(row[97], nullptr, 10)) : 0;
+			e.e_percent_to_aa         = row[98] ? static_cast<uint32_t>(strtoul(row[98], nullptr, 10)) : 0;
+			e.e_expended_aa_spent     = row[99] ? static_cast<uint32_t>(strtoul(row[99], nullptr, 10)) : 0;
+			e.aa_points_spent_old     = row[100] ? static_cast<uint32_t>(strtoul(row[100], nullptr, 10)) : 0;
+			e.aa_points_old           = row[101] ? static_cast<uint32_t>(strtoul(row[101], nullptr, 10)) : 0;
+			e.e_last_invsnapshot      = row[102] ? static_cast<uint32_t>(strtoul(row[102], nullptr, 10)) : 0;
+			e.deleted_at              = strtoll(row[103] ? row[103] : "-1", nullptr, 10);
 
 			all_entries.push_back(e);
 		}
@@ -1412,6 +1422,7 @@ public:
 		v.push_back(std::to_string(e.int_));
 		v.push_back(std::to_string(e.agi));
 		v.push_back(std::to_string(e.wis));
+		v.push_back(std::to_string(e.extra_haste));
 		v.push_back(std::to_string(e.zone_change_count));
 		v.push_back(std::to_string(e.toxicity));
 		v.push_back(std::to_string(e.hunger_level));
@@ -1537,6 +1548,7 @@ public:
 			v.push_back(std::to_string(e.int_));
 			v.push_back(std::to_string(e.agi));
 			v.push_back(std::to_string(e.wis));
+			v.push_back(std::to_string(e.extra_haste));
 			v.push_back(std::to_string(e.zone_change_count));
 			v.push_back(std::to_string(e.toxicity));
 			v.push_back(std::to_string(e.hunger_level));

common/repositories/base/base_character_parcels_containers_repository.h

@@ -0,0 +1,499 @@
+/**
+ * DO NOT MODIFY THIS FILE
+ *
+ * This repository was automatically generated and is NOT to be modified directly.
+ * Any repository modifications are meant to be made to the repository extending the base.
+ * Any modifications to base repositories are to be made by the generator only
+ *
+ * @generator ./utils/scripts/generators/repository-generator.pl
+ * @docs https://docs.eqemu.io/developer/repositories
+ */
+
+#ifndef EQEMU_BASE_CHARACTER_PARCELS_CONTAINERS_REPOSITORY_H
+#define EQEMU_BASE_CHARACTER_PARCELS_CONTAINERS_REPOSITORY_H
+
+#include "../../database.h"
+#include "../../strings.h"
+#include <ctime>
+
+class BaseCharacterParcelsContainersRepository {
+public:
+	struct CharacterParcelsContainers {
+		uint32_t id;
+		uint32_t parcels_id;
+		uint32_t slot_id;
+		uint32_t item_id;
+		uint32_t aug_slot_1;
+		uint32_t aug_slot_2;
+		uint32_t aug_slot_3;
+		uint32_t aug_slot_4;
+		uint32_t aug_slot_5;
+		uint32_t aug_slot_6;
+		uint32_t quantity;
+	};
+
+	static std::string PrimaryKey()
+	{
+		return std::string("id");
+	}
+
+	static std::vector<std::string> Columns()
+	{
+		return {
+			"id",
+			"parcels_id",
+			"slot_id",
+			"item_id",
+			"aug_slot_1",
+			"aug_slot_2",
+			"aug_slot_3",
+			"aug_slot_4",
+			"aug_slot_5",
+			"aug_slot_6",
+			"quantity",
+		};
+	}
+
+	static std::vector<std::string> SelectColumns()
+	{
+		return {
+			"id",
+			"parcels_id",
+			"slot_id",
+			"item_id",
+			"aug_slot_1",
+			"aug_slot_2",
+			"aug_slot_3",
+			"aug_slot_4",
+			"aug_slot_5",
+			"aug_slot_6",
+			"quantity",
+		};
+	}
+
+	static std::string ColumnsRaw()
+	{
+		return std::string(Strings::Implode(", ", Columns()));
+	}
+
+	static std::string SelectColumnsRaw()
+	{
+		return std::string(Strings::Implode(", ", SelectColumns()));
+	}
+
+	static std::string TableName()
+	{
+		return std::string("character_parcels_containers");
+	}
+
+	static std::string BaseSelect()
+	{
+		return fmt::format(
+			"SELECT {} FROM {}",
+			SelectColumnsRaw(),
+			TableName()
+		);
+	}
+
+	static std::string BaseInsert()
+	{
+		return fmt::format(
+			"INSERT INTO {} ({}) ",
+			TableName(),
+			ColumnsRaw()
+		);
+	}
+
+	static CharacterParcelsContainers NewEntity()
+	{
+		CharacterParcelsContainers e{};
+
+		e.id         = 0;
+		e.parcels_id = 0;
+		e.slot_id    = 0;
+		e.item_id    = 0;
+		e.aug_slot_1 = 0;
+		e.aug_slot_2 = 0;
+		e.aug_slot_3 = 0;
+		e.aug_slot_4 = 0;
+		e.aug_slot_5 = 0;
+		e.aug_slot_6 = 0;
+		e.quantity   = 0;
+
+		return e;
+	}
+
+	static CharacterParcelsContainers GetCharacterParcelsContainers(
+		const std::vector<CharacterParcelsContainers> &character_parcels_containerss,
+		int character_parcels_containers_id
+	)
+	{
+		for (auto &character_parcels_containers : character_parcels_containerss) {
+			if (character_parcels_containers.id == character_parcels_containers_id) {
+				return character_parcels_containers;
+			}
+		}
+
+		return NewEntity();
+	}
+
+	static CharacterParcelsContainers FindOne(
+		Database& db,
+		int character_parcels_containers_id
+	)
+	{
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} WHERE {} = {} LIMIT 1",
+				BaseSelect(),
+				PrimaryKey(),
+				character_parcels_containers_id
+			)
+		);
+
+		auto row = results.begin();
+		if (results.RowCount() == 1) {
+			CharacterParcelsContainers e{};
+
+			e.id         = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.parcels_id = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
+			e.slot_id    = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
+			e.item_id    = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
+			e.aug_slot_1 = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
+			e.aug_slot_2 = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
+			e.aug_slot_3 = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
+			e.aug_slot_4 = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
+			e.aug_slot_5 = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
+			e.aug_slot_6 = row[9] ? static_cast<uint32_t>(strtoul(row[9], nullptr, 10)) : 0;
+			e.quantity   = row[10] ? static_cast<uint32_t>(strtoul(row[10], nullptr, 10)) : 0;
+
+			return e;
+		}
+
+		return NewEntity();
+	}
+
+	static int DeleteOne(
+		Database& db,
+		int character_parcels_containers_id
+	)
+	{
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"DELETE FROM {} WHERE {} = {}",
+				TableName(),
+				PrimaryKey(),
+				character_parcels_containers_id
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static int UpdateOne(
+		Database& db,
+		const CharacterParcelsContainers &e
+	)
+	{
+		std::vector<std::string> v;
+
+		auto columns = Columns();
+
+		v.push_back(columns[1] + " = " + std::to_string(e.parcels_id));
+		v.push_back(columns[2] + " = " + std::to_string(e.slot_id));
+		v.push_back(columns[3] + " = " + std::to_string(e.item_id));
+		v.push_back(columns[4] + " = " + std::to_string(e.aug_slot_1));
+		v.push_back(columns[5] + " = " + std::to_string(e.aug_slot_2));
+		v.push_back(columns[6] + " = " + std::to_string(e.aug_slot_3));
+		v.push_back(columns[7] + " = " + std::to_string(e.aug_slot_4));
+		v.push_back(columns[8] + " = " + std::to_string(e.aug_slot_5));
+		v.push_back(columns[9] + " = " + std::to_string(e.aug_slot_6));
+		v.push_back(columns[10] + " = " + std::to_string(e.quantity));
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"UPDATE {} SET {} WHERE {} = {}",
+				TableName(),
+				Strings::Implode(", ", v),
+				PrimaryKey(),
+				e.id
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static CharacterParcelsContainers InsertOne(
+		Database& db,
+		CharacterParcelsContainers e
+	)
+	{
+		std::vector<std::string> v;
+
+		v.push_back(std::to_string(e.id));
+		v.push_back(std::to_string(e.parcels_id));
+		v.push_back(std::to_string(e.slot_id));
+		v.push_back(std::to_string(e.item_id));
+		v.push_back(std::to_string(e.aug_slot_1));
+		v.push_back(std::to_string(e.aug_slot_2));
+		v.push_back(std::to_string(e.aug_slot_3));
+		v.push_back(std::to_string(e.aug_slot_4));
+		v.push_back(std::to_string(e.aug_slot_5));
+		v.push_back(std::to_string(e.aug_slot_6));
+		v.push_back(std::to_string(e.quantity));
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES ({})",
+				BaseInsert(),
+				Strings::Implode(",", v)
+			)
+		);
+
+		if (results.Success()) {
+			e.id = results.LastInsertedID();
+			return e;
+		}
+
+		e = NewEntity();
+
+		return e;
+	}
+
+	static int InsertMany(
+		Database& db,
+		const std::vector<CharacterParcelsContainers> &entries
+	)
+	{
+		std::vector<std::string> insert_chunks;
+
+		for (auto &e: entries) {
+			std::vector<std::string> v;
+
+			v.push_back(std::to_string(e.id));
+			v.push_back(std::to_string(e.parcels_id));
+			v.push_back(std::to_string(e.slot_id));
+			v.push_back(std::to_string(e.item_id));
+			v.push_back(std::to_string(e.aug_slot_1));
+			v.push_back(std::to_string(e.aug_slot_2));
+			v.push_back(std::to_string(e.aug_slot_3));
+			v.push_back(std::to_string(e.aug_slot_4));
+			v.push_back(std::to_string(e.aug_slot_5));
+			v.push_back(std::to_string(e.aug_slot_6));
+			v.push_back(std::to_string(e.quantity));
+
+			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
+		}
+
+		std::vector<std::string> v;
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES {}",
+				BaseInsert(),
+				Strings::Implode(",", insert_chunks)
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static std::vector<CharacterParcelsContainers> All(Database& db)
+	{
+		std::vector<CharacterParcelsContainers> all_entries;
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{}",
+				BaseSelect()
+			)
+		);
+
+		all_entries.reserve(results.RowCount());
+
+		for (auto row = results.begin(); row != results.end(); ++row) {
+			CharacterParcelsContainers e{};
+
+			e.id         = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.parcels_id = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
+			e.slot_id    = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
+			e.item_id    = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
+			e.aug_slot_1 = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
+			e.aug_slot_2 = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
+			e.aug_slot_3 = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
+			e.aug_slot_4 = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
+			e.aug_slot_5 = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
+			e.aug_slot_6 = row[9] ? static_cast<uint32_t>(strtoul(row[9], nullptr, 10)) : 0;
+			e.quantity   = row[10] ? static_cast<uint32_t>(strtoul(row[10], nullptr, 10)) : 0;
+
+			all_entries.push_back(e);
+		}
+
+		return all_entries;
+	}
+
+	static std::vector<CharacterParcelsContainers> GetWhere(Database& db, const std::string &where_filter)
+	{
+		std::vector<CharacterParcelsContainers> all_entries;
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} WHERE {}",
+				BaseSelect(),
+				where_filter
+			)
+		);
+
+		all_entries.reserve(results.RowCount());
+
+		for (auto row = results.begin(); row != results.end(); ++row) {
+			CharacterParcelsContainers e{};
+
+			e.id         = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.parcels_id = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
+			e.slot_id    = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
+			e.item_id    = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
+			e.aug_slot_1 = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
+			e.aug_slot_2 = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
+			e.aug_slot_3 = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
+			e.aug_slot_4 = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
+			e.aug_slot_5 = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
+			e.aug_slot_6 = row[9] ? static_cast<uint32_t>(strtoul(row[9], nullptr, 10)) : 0;
+			e.quantity   = row[10] ? static_cast<uint32_t>(strtoul(row[10], nullptr, 10)) : 0;
+
+			all_entries.push_back(e);
+		}
+
+		return all_entries;
+	}
+
+	static int DeleteWhere(Database& db, const std::string &where_filter)
+	{
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"DELETE FROM {} WHERE {}",
+				TableName(),
+				where_filter
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static int Truncate(Database& db)
+	{
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"TRUNCATE TABLE {}",
+				TableName()
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static int64 GetMaxId(Database& db)
+	{
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"SELECT COALESCE(MAX({}), 0) FROM {}",
+				PrimaryKey(),
+				TableName()
+			)
+		);
+
+		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
+	}
+
+	static int64 Count(Database& db, const std::string &where_filter = "")
+	{
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"SELECT COUNT(*) FROM {} {}",
+				TableName(),
+				(where_filter.empty() ? "" : "WHERE " + where_filter)
+			)
+		);
+
+		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
+	}
+
+	static std::string BaseReplace()
+	{
+		return fmt::format(
+			"REPLACE INTO {} ({}) ",
+			TableName(),
+			ColumnsRaw()
+		);
+	}
+
+	static int ReplaceOne(
+		Database& db,
+		const CharacterParcelsContainers &e
+	)
+	{
+		std::vector<std::string> v;
+
+		v.push_back(std::to_string(e.id));
+		v.push_back(std::to_string(e.parcels_id));
+		v.push_back(std::to_string(e.slot_id));
+		v.push_back(std::to_string(e.item_id));
+		v.push_back(std::to_string(e.aug_slot_1));
+		v.push_back(std::to_string(e.aug_slot_2));
+		v.push_back(std::to_string(e.aug_slot_3));
+		v.push_back(std::to_string(e.aug_slot_4));
+		v.push_back(std::to_string(e.aug_slot_5));
+		v.push_back(std::to_string(e.aug_slot_6));
+		v.push_back(std::to_string(e.quantity));
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES ({})",
+				BaseReplace(),
+				Strings::Implode(",", v)
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static int ReplaceMany(
+		Database& db,
+		const std::vector<CharacterParcelsContainers> &entries
+	)
+	{
+		std::vector<std::string> insert_chunks;
+
+		for (auto &e: entries) {
+			std::vector<std::string> v;
+
+			v.push_back(std::to_string(e.id));
+			v.push_back(std::to_string(e.parcels_id));
+			v.push_back(std::to_string(e.slot_id));
+			v.push_back(std::to_string(e.item_id));
+			v.push_back(std::to_string(e.aug_slot_1));
+			v.push_back(std::to_string(e.aug_slot_2));
+			v.push_back(std::to_string(e.aug_slot_3));
+			v.push_back(std::to_string(e.aug_slot_4));
+			v.push_back(std::to_string(e.aug_slot_5));
+			v.push_back(std::to_string(e.aug_slot_6));
+			v.push_back(std::to_string(e.quantity));
+
+			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
+		}
+
+		std::vector<std::string> v;
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES {}",
+				BaseReplace(),
+				Strings::Implode(",", insert_chunks)
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+};
+
+#endif //EQEMU_BASE_CHARACTER_PARCELS_CONTAINERS_REPOSITORY_H

common/repositories/base/base_character_parcels_repository.h

@@ -0,0 +1,535 @@
+/**
+ * DO NOT MODIFY THIS FILE
+ *
+ * This repository was automatically generated and is NOT to be modified directly.
+ * Any repository modifications are meant to be made to the repository extending the base.
+ * Any modifications to base repositories are to be made by the generator only
+ *
+ * @generator ./utils/scripts/generators/repository-generator.pl
+ * @docs https://docs.eqemu.io/developer/repositories
+ */
+
+#ifndef EQEMU_BASE_CHARACTER_PARCELS_REPOSITORY_H
+#define EQEMU_BASE_CHARACTER_PARCELS_REPOSITORY_H
+
+#include "../../database.h"
+#include "../../strings.h"
+#include <ctime>
+
+class BaseCharacterParcelsRepository {
+public:
+	struct CharacterParcels {
+		uint32_t    id;
+		uint32_t    char_id;
+		uint32_t    item_id;
+		uint32_t    aug_slot_1;
+		uint32_t    aug_slot_2;
+		uint32_t    aug_slot_3;
+		uint32_t    aug_slot_4;
+		uint32_t    aug_slot_5;
+		uint32_t    aug_slot_6;
+		uint32_t    slot_id;
+		uint32_t    quantity;
+		std::string from_name;
+		std::string note;
+		time_t      sent_date;
+	};
+
+	static std::string PrimaryKey()
+	{
+		return std::string("id");
+	}
+
+	static std::vector<std::string> Columns()
+	{
+		return {
+			"id",
+			"char_id",
+			"item_id",
+			"aug_slot_1",
+			"aug_slot_2",
+			"aug_slot_3",
+			"aug_slot_4",
+			"aug_slot_5",
+			"aug_slot_6",
+			"slot_id",
+			"quantity",
+			"from_name",
+			"note",
+			"sent_date",
+		};
+	}
+
+	static std::vector<std::string> SelectColumns()
+	{
+		return {
+			"id",
+			"char_id",
+			"item_id",
+			"aug_slot_1",
+			"aug_slot_2",
+			"aug_slot_3",
+			"aug_slot_4",
+			"aug_slot_5",
+			"aug_slot_6",
+			"slot_id",
+			"quantity",
+			"from_name",
+			"note",
+			"UNIX_TIMESTAMP(sent_date)",
+		};
+	}
+
+	static std::string ColumnsRaw()
+	{
+		return std::string(Strings::Implode(", ", Columns()));
+	}
+
+	static std::string SelectColumnsRaw()
+	{
+		return std::string(Strings::Implode(", ", SelectColumns()));
+	}
+
+	static std::string TableName()
+	{
+		return std::string("character_parcels");
+	}
+
+	static std::string BaseSelect()
+	{
+		return fmt::format(
+			"SELECT {} FROM {}",
+			SelectColumnsRaw(),
+			TableName()
+		);
+	}
+
+	static std::string BaseInsert()
+	{
+		return fmt::format(
+			"INSERT INTO {} ({}) ",
+			TableName(),
+			ColumnsRaw()
+		);
+	}
+
+	static CharacterParcels NewEntity()
+	{
+		CharacterParcels e{};
+
+		e.id         = 0;
+		e.char_id    = 0;
+		e.item_id    = 0;
+		e.aug_slot_1 = 0;
+		e.aug_slot_2 = 0;
+		e.aug_slot_3 = 0;
+		e.aug_slot_4 = 0;
+		e.aug_slot_5 = 0;
+		e.aug_slot_6 = 0;
+		e.slot_id    = 0;
+		e.quantity   = 0;
+		e.from_name  = "";
+		e.note       = "";
+		e.sent_date  = 0;
+
+		return e;
+	}
+
+	static CharacterParcels GetCharacterParcels(
+		const std::vector<CharacterParcels> &character_parcelss,
+		int character_parcels_id
+	)
+	{
+		for (auto &character_parcels : character_parcelss) {
+			if (character_parcels.id == character_parcels_id) {
+				return character_parcels;
+			}
+		}
+
+		return NewEntity();
+	}
+
+	static CharacterParcels FindOne(
+		Database& db,
+		int character_parcels_id
+	)
+	{
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} WHERE {} = {} LIMIT 1",
+				BaseSelect(),
+				PrimaryKey(),
+				character_parcels_id
+			)
+		);
+
+		auto row = results.begin();
+		if (results.RowCount() == 1) {
+			CharacterParcels e{};
+
+			e.id         = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.char_id    = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
+			e.item_id    = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
+			e.aug_slot_1 = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
+			e.aug_slot_2 = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
+			e.aug_slot_3 = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
+			e.aug_slot_4 = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
+			e.aug_slot_5 = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
+			e.aug_slot_6 = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
+			e.slot_id    = row[9] ? static_cast<uint32_t>(strtoul(row[9], nullptr, 10)) : 0;
+			e.quantity   = row[10] ? static_cast<uint32_t>(strtoul(row[10], nullptr, 10)) : 0;
+			e.from_name  = row[11] ? row[11] : "";
+			e.note       = row[12] ? row[12] : "";
+			e.sent_date  = strtoll(row[13] ? row[13] : "-1", nullptr, 10);
+
+			return e;
+		}
+
+		return NewEntity();
+	}
+
+	static int DeleteOne(
+		Database& db,
+		int character_parcels_id
+	)
+	{
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"DELETE FROM {} WHERE {} = {}",
+				TableName(),
+				PrimaryKey(),
+				character_parcels_id
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static int UpdateOne(
+		Database& db,
+		const CharacterParcels &e
+	)
+	{
+		std::vector<std::string> v;
+
+		auto columns = Columns();
+
+		v.push_back(columns[1] + " = " + std::to_string(e.char_id));
+		v.push_back(columns[2] + " = " + std::to_string(e.item_id));
+		v.push_back(columns[3] + " = " + std::to_string(e.aug_slot_1));
+		v.push_back(columns[4] + " = " + std::to_string(e.aug_slot_2));
+		v.push_back(columns[5] + " = " + std::to_string(e.aug_slot_3));
+		v.push_back(columns[6] + " = " + std::to_string(e.aug_slot_4));
+		v.push_back(columns[7] + " = " + std::to_string(e.aug_slot_5));
+		v.push_back(columns[8] + " = " + std::to_string(e.aug_slot_6));
+		v.push_back(columns[9] + " = " + std::to_string(e.slot_id));
+		v.push_back(columns[10] + " = " + std::to_string(e.quantity));
+		v.push_back(columns[11] + " = '" + Strings::Escape(e.from_name) + "'");
+		v.push_back(columns[12] + " = '" + Strings::Escape(e.note) + "'");
+		v.push_back(columns[13] + " = FROM_UNIXTIME(" + (e.sent_date > 0 ? std::to_string(e.sent_date) : "null") + ")");
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"UPDATE {} SET {} WHERE {} = {}",
+				TableName(),
+				Strings::Implode(", ", v),
+				PrimaryKey(),
+				e.id
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static CharacterParcels InsertOne(
+		Database& db,
+		CharacterParcels e
+	)
+	{
+		std::vector<std::string> v;
+
+		v.push_back(std::to_string(e.id));
+		v.push_back(std::to_string(e.char_id));
+		v.push_back(std::to_string(e.item_id));
+		v.push_back(std::to_string(e.aug_slot_1));
+		v.push_back(std::to_string(e.aug_slot_2));
+		v.push_back(std::to_string(e.aug_slot_3));
+		v.push_back(std::to_string(e.aug_slot_4));
+		v.push_back(std::to_string(e.aug_slot_5));
+		v.push_back(std::to_string(e.aug_slot_6));
+		v.push_back(std::to_string(e.slot_id));
+		v.push_back(std::to_string(e.quantity));
+		v.push_back("'" + Strings::Escape(e.from_name) + "'");
+		v.push_back("'" + Strings::Escape(e.note) + "'");
+		v.push_back("FROM_UNIXTIME(" + (e.sent_date > 0 ? std::to_string(e.sent_date) : "null") + ")");
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES ({})",
+				BaseInsert(),
+				Strings::Implode(",", v)
+			)
+		);
+
+		if (results.Success()) {
+			e.id = results.LastInsertedID();
+			return e;
+		}
+
+		e = NewEntity();
+
+		return e;
+	}
+
+	static int InsertMany(
+		Database& db,
+		const std::vector<CharacterParcels> &entries
+	)
+	{
+		std::vector<std::string> insert_chunks;
+
+		for (auto &e: entries) {
+			std::vector<std::string> v;
+
+			v.push_back(std::to_string(e.id));
+			v.push_back(std::to_string(e.char_id));
+			v.push_back(std::to_string(e.item_id));
+			v.push_back(std::to_string(e.aug_slot_1));
+			v.push_back(std::to_string(e.aug_slot_2));
+			v.push_back(std::to_string(e.aug_slot_3));
+			v.push_back(std::to_string(e.aug_slot_4));
+			v.push_back(std::to_string(e.aug_slot_5));
+			v.push_back(std::to_string(e.aug_slot_6));
+			v.push_back(std::to_string(e.slot_id));
+			v.push_back(std::to_string(e.quantity));
+			v.push_back("'" + Strings::Escape(e.from_name) + "'");
+			v.push_back("'" + Strings::Escape(e.note) + "'");
+			v.push_back("FROM_UNIXTIME(" + (e.sent_date > 0 ? std::to_string(e.sent_date) : "null") + ")");
+
+			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
+		}
+
+		std::vector<std::string> v;
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES {}",
+				BaseInsert(),
+				Strings::Implode(",", insert_chunks)
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static std::vector<CharacterParcels> All(Database& db)
+	{
+		std::vector<CharacterParcels> all_entries;
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{}",
+				BaseSelect()
+			)
+		);
+
+		all_entries.reserve(results.RowCount());
+
+		for (auto row = results.begin(); row != results.end(); ++row) {
+			CharacterParcels e{};
+
+			e.id         = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.char_id    = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
+			e.item_id    = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
+			e.aug_slot_1 = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
+			e.aug_slot_2 = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
+			e.aug_slot_3 = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
+			e.aug_slot_4 = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
+			e.aug_slot_5 = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
+			e.aug_slot_6 = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
+			e.slot_id    = row[9] ? static_cast<uint32_t>(strtoul(row[9], nullptr, 10)) : 0;
+			e.quantity   = row[10] ? static_cast<uint32_t>(strtoul(row[10], nullptr, 10)) : 0;
+			e.from_name  = row[11] ? row[11] : "";
+			e.note       = row[12] ? row[12] : "";
+			e.sent_date  = strtoll(row[13] ? row[13] : "-1", nullptr, 10);
+
+			all_entries.push_back(e);
+		}
+
+		return all_entries;
+	}
+
+	static std::vector<CharacterParcels> GetWhere(Database& db, const std::string &where_filter)
+	{
+		std::vector<CharacterParcels> all_entries;
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} WHERE {}",
+				BaseSelect(),
+				where_filter
+			)
+		);
+
+		all_entries.reserve(results.RowCount());
+
+		for (auto row = results.begin(); row != results.end(); ++row) {
+			CharacterParcels e{};
+
+			e.id         = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.char_id    = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
+			e.item_id    = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
+			e.aug_slot_1 = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
+			e.aug_slot_2 = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
+			e.aug_slot_3 = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
+			e.aug_slot_4 = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
+			e.aug_slot_5 = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
+			e.aug_slot_6 = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
+			e.slot_id    = row[9] ? static_cast<uint32_t>(strtoul(row[9], nullptr, 10)) : 0;
+			e.quantity   = row[10] ? static_cast<uint32_t>(strtoul(row[10], nullptr, 10)) : 0;
+			e.from_name  = row[11] ? row[11] : "";
+			e.note       = row[12] ? row[12] : "";
+			e.sent_date  = strtoll(row[13] ? row[13] : "-1", nullptr, 10);
+
+			all_entries.push_back(e);
+		}
+
+		return all_entries;
+	}
+
+	static int DeleteWhere(Database& db, const std::string &where_filter)
+	{
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"DELETE FROM {} WHERE {}",
+				TableName(),
+				where_filter
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static int Truncate(Database& db)
+	{
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"TRUNCATE TABLE {}",
+				TableName()
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static int64 GetMaxId(Database& db)
+	{
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"SELECT COALESCE(MAX({}), 0) FROM {}",
+				PrimaryKey(),
+				TableName()
+			)
+		);
+
+		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
+	}
+
+	static int64 Count(Database& db, const std::string &where_filter = "")
+	{
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"SELECT COUNT(*) FROM {} {}",
+				TableName(),
+				(where_filter.empty() ? "" : "WHERE " + where_filter)
+			)
+		);
+
+		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
+	}
+
+	static std::string BaseReplace()
+	{
+		return fmt::format(
+			"REPLACE INTO {} ({}) ",
+			TableName(),
+			ColumnsRaw()
+		);
+	}
+
+	static int ReplaceOne(
+		Database& db,
+		const CharacterParcels &e
+	)
+	{
+		std::vector<std::string> v;
+
+		v.push_back(std::to_string(e.id));
+		v.push_back(std::to_string(e.char_id));
+		v.push_back(std::to_string(e.item_id));
+		v.push_back(std::to_string(e.aug_slot_1));
+		v.push_back(std::to_string(e.aug_slot_2));
+		v.push_back(std::to_string(e.aug_slot_3));
+		v.push_back(std::to_string(e.aug_slot_4));
+		v.push_back(std::to_string(e.aug_slot_5));
+		v.push_back(std::to_string(e.aug_slot_6));
+		v.push_back(std::to_string(e.slot_id));
+		v.push_back(std::to_string(e.quantity));
+		v.push_back("'" + Strings::Escape(e.from_name) + "'");
+		v.push_back("'" + Strings::Escape(e.note) + "'");
+		v.push_back("FROM_UNIXTIME(" + (e.sent_date > 0 ? std::to_string(e.sent_date) : "null") + ")");
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES ({})",
+				BaseReplace(),
+				Strings::Implode(",", v)
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static int ReplaceMany(
+		Database& db,
+		const std::vector<CharacterParcels> &entries
+	)
+	{
+		std::vector<std::string> insert_chunks;
+
+		for (auto &e: entries) {
+			std::vector<std::string> v;
+
+			v.push_back(std::to_string(e.id));
+			v.push_back(std::to_string(e.char_id));
+			v.push_back(std::to_string(e.item_id));
+			v.push_back(std::to_string(e.aug_slot_1));
+			v.push_back(std::to_string(e.aug_slot_2));
+			v.push_back(std::to_string(e.aug_slot_3));
+			v.push_back(std::to_string(e.aug_slot_4));
+			v.push_back(std::to_string(e.aug_slot_5));
+			v.push_back(std::to_string(e.aug_slot_6));
+			v.push_back(std::to_string(e.slot_id));
+			v.push_back(std::to_string(e.quantity));
+			v.push_back("'" + Strings::Escape(e.from_name) + "'");
+			v.push_back("'" + Strings::Escape(e.note) + "'");
+			v.push_back("FROM_UNIXTIME(" + (e.sent_date > 0 ? std::to_string(e.sent_date) : "null") + ")");
+
+			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
+		}
+
+		std::vector<std::string> v;
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES {}",
+				BaseReplace(),
+				Strings::Implode(",", insert_chunks)
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+};
+
+#endif //EQEMU_BASE_CHARACTER_PARCELS_REPOSITORY_H

common/repositories/base/base_doors_repository.h

@@ -50,6 +50,7 @@ public:
 		float       buffer;
 		uint32_t    client_version_mask;
 		int16_t     is_ldon_door;
+		int16_t     close_timer_ms;
 		int32_t     dz_switch_id;
 		int8_t      min_expansion;
 		int8_t      max_expansion;
@@ -96,6 +97,7 @@ public:
 			"buffer",
 			"client_version_mask",
 			"is_ldon_door",
+			"close_timer_ms",
 			"dz_switch_id",
 			"min_expansion",
 			"max_expansion",
@@ -138,6 +140,7 @@ public:
 			"buffer",
 			"client_version_mask",
 			"is_ldon_door",
+			"close_timer_ms",
 			"dz_switch_id",
 			"min_expansion",
 			"max_expansion",
@@ -214,6 +217,7 @@ public:
 		e.buffer                 = 0;
 		e.client_version_mask    = 4294967295;
 		e.is_ldon_door           = 0;
+		e.close_timer_ms         = 5000;
 		e.dz_switch_id           = 0;
 		e.min_expansion          = -1;
 		e.max_expansion          = -1;
@@ -286,11 +290,12 @@ public:
 			e.buffer                 = row[28] ? strtof(row[28], nullptr) : 0;
 			e.client_version_mask    = row[29] ? static_cast<uint32_t>(strtoul(row[29], nullptr, 10)) : 4294967295;
 			e.is_ldon_door           = row[30] ? static_cast<int16_t>(atoi(row[30])) : 0;
-			e.dz_switch_id           = row[31] ? static_cast<int32_t>(atoi(row[31])) : 0;
-			e.min_expansion          = row[32] ? static_cast<int8_t>(atoi(row[32])) : -1;
-			e.max_expansion          = row[33] ? static_cast<int8_t>(atoi(row[33])) : -1;
-			e.content_flags          = row[34] ? row[34] : "";
-			e.content_flags_disabled = row[35] ? row[35] : "";
+			e.close_timer_ms         = row[31] ? static_cast<int16_t>(atoi(row[31])) : 5000;
+			e.dz_switch_id           = row[32] ? static_cast<int32_t>(atoi(row[32])) : 0;
+			e.min_expansion          = row[33] ? static_cast<int8_t>(atoi(row[33])) : -1;
+			e.max_expansion          = row[34] ? static_cast<int8_t>(atoi(row[34])) : -1;
+			e.content_flags          = row[35] ? row[35] : "";
+			e.content_flags_disabled = row[36] ? row[36] : "";
 
 			return e;
 		}
@@ -354,11 +359,12 @@ public:
 		v.push_back(columns[28] + " = " + std::to_string(e.buffer));
 		v.push_back(columns[29] + " = " + std::to_string(e.client_version_mask));
 		v.push_back(columns[30] + " = " + std::to_string(e.is_ldon_door));
-		v.push_back(columns[31] + " = " + std::to_string(e.dz_switch_id));
-		v.push_back(columns[32] + " = " + std::to_string(e.min_expansion));
-		v.push_back(columns[33] + " = " + std::to_string(e.max_expansion));
-		v.push_back(columns[34] + " = '" + Strings::Escape(e.content_flags) + "'");
-		v.push_back(columns[35] + " = '" + Strings::Escape(e.content_flags_disabled) + "'");
+		v.push_back(columns[31] + " = " + std::to_string(e.close_timer_ms));
+		v.push_back(columns[32] + " = " + std::to_string(e.dz_switch_id));
+		v.push_back(columns[33] + " = " + std::to_string(e.min_expansion));
+		v.push_back(columns[34] + " = " + std::to_string(e.max_expansion));
+		v.push_back(columns[35] + " = '" + Strings::Escape(e.content_flags) + "'");
+		v.push_back(columns[36] + " = '" + Strings::Escape(e.content_flags_disabled) + "'");
 
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -411,6 +417,7 @@ public:
 		v.push_back(std::to_string(e.buffer));
 		v.push_back(std::to_string(e.client_version_mask));
 		v.push_back(std::to_string(e.is_ldon_door));
+		v.push_back(std::to_string(e.close_timer_ms));
 		v.push_back(std::to_string(e.dz_switch_id));
 		v.push_back(std::to_string(e.min_expansion));
 		v.push_back(std::to_string(e.max_expansion));
@@ -476,6 +483,7 @@ public:
 			v.push_back(std::to_string(e.buffer));
 			v.push_back(std::to_string(e.client_version_mask));
 			v.push_back(std::to_string(e.is_ldon_door));
+			v.push_back(std::to_string(e.close_timer_ms));
 			v.push_back(std::to_string(e.dz_switch_id));
 			v.push_back(std::to_string(e.min_expansion));
 			v.push_back(std::to_string(e.max_expansion));
@@ -545,11 +553,12 @@ public:
 			e.buffer                 = row[28] ? strtof(row[28], nullptr) : 0;
 			e.client_version_mask    = row[29] ? static_cast<uint32_t>(strtoul(row[29], nullptr, 10)) : 4294967295;
 			e.is_ldon_door           = row[30] ? static_cast<int16_t>(atoi(row[30])) : 0;
-			e.dz_switch_id           = row[31] ? static_cast<int32_t>(atoi(row[31])) : 0;
-			e.min_expansion          = row[32] ? static_cast<int8_t>(atoi(row[32])) : -1;
-			e.max_expansion          = row[33] ? static_cast<int8_t>(atoi(row[33])) : -1;
-			e.content_flags          = row[34] ? row[34] : "";
-			e.content_flags_disabled = row[35] ? row[35] : "";
+			e.close_timer_ms         = row[31] ? static_cast<int16_t>(atoi(row[31])) : 5000;
+			e.dz_switch_id           = row[32] ? static_cast<int32_t>(atoi(row[32])) : 0;
+			e.min_expansion          = row[33] ? static_cast<int8_t>(atoi(row[33])) : -1;
+			e.max_expansion          = row[34] ? static_cast<int8_t>(atoi(row[34])) : -1;
+			e.content_flags          = row[35] ? row[35] : "";
+			e.content_flags_disabled = row[36] ? row[36] : "";
 
 			all_entries.push_back(e);
 		}
@@ -605,11 +614,12 @@ public:
 			e.buffer                 = row[28] ? strtof(row[28], nullptr) : 0;
 			e.client_version_mask    = row[29] ? static_cast<uint32_t>(strtoul(row[29], nullptr, 10)) : 4294967295;
 			e.is_ldon_door           = row[30] ? static_cast<int16_t>(atoi(row[30])) : 0;
-			e.dz_switch_id           = row[31] ? static_cast<int32_t>(atoi(row[31])) : 0;
-			e.min_expansion          = row[32] ? static_cast<int8_t>(atoi(row[32])) : -1;
-			e.max_expansion          = row[33] ? static_cast<int8_t>(atoi(row[33])) : -1;
-			e.content_flags          = row[34] ? row[34] : "";
-			e.content_flags_disabled = row[35] ? row[35] : "";
+			e.close_timer_ms         = row[31] ? static_cast<int16_t>(atoi(row[31])) : 5000;
+			e.dz_switch_id           = row[32] ? static_cast<int32_t>(atoi(row[32])) : 0;
+			e.min_expansion          = row[33] ? static_cast<int8_t>(atoi(row[33])) : -1;
+			e.max_expansion          = row[34] ? static_cast<int8_t>(atoi(row[34])) : -1;
+			e.content_flags          = row[35] ? row[35] : "";
+			e.content_flags_disabled = row[36] ? row[36] : "";
 
 			all_entries.push_back(e);
 		}
@@ -715,6 +725,7 @@ public:
 		v.push_back(std::to_string(e.buffer));
 		v.push_back(std::to_string(e.client_version_mask));
 		v.push_back(std::to_string(e.is_ldon_door));
+		v.push_back(std::to_string(e.close_timer_ms));
 		v.push_back(std::to_string(e.dz_switch_id));
 		v.push_back(std::to_string(e.min_expansion));
 		v.push_back(std::to_string(e.max_expansion));
@@ -773,6 +784,7 @@ public:
 			v.push_back(std::to_string(e.buffer));
 			v.push_back(std::to_string(e.client_version_mask));
 			v.push_back(std::to_string(e.is_ldon_door));
+			v.push_back(std::to_string(e.close_timer_ms));
 			v.push_back(std::to_string(e.dz_switch_id));
 			v.push_back(std::to_string(e.min_expansion));
 			v.push_back(std::to_string(e.max_expansion));

common/repositories/base/base_ground_spawns_repository.h

@@ -33,6 +33,7 @@ public:
 		uint32_t    max_allowed;
 		std::string comment;
 		uint32_t    respawn_timer;
+		uint8_t     fix_z;
 		int8_t      min_expansion;
 		int8_t      max_expansion;
 		std::string content_flags;
@@ -61,6 +62,7 @@ public:
 			"max_allowed",
 			"comment",
 			"respawn_timer",
+			"fix_z",
 			"min_expansion",
 			"max_expansion",
 			"content_flags",
@@ -85,6 +87,7 @@ public:
 			"max_allowed",
 			"comment",
 			"respawn_timer",
+			"fix_z",
 			"min_expansion",
 			"max_expansion",
 			"content_flags",
@@ -143,6 +146,7 @@ public:
 		e.max_allowed            = 1;
 		e.comment                = "";
 		e.respawn_timer          = 300;
+		e.fix_z                  = 1;
 		e.min_expansion          = -1;
 		e.max_expansion          = -1;
 		e.content_flags          = "";
@@ -197,10 +201,11 @@ public:
 			e.max_allowed            = row[11] ? static_cast<uint32_t>(strtoul(row[11], nullptr, 10)) : 1;
 			e.comment                = row[12] ? row[12] : "";
 			e.respawn_timer          = row[13] ? static_cast<uint32_t>(strtoul(row[13], nullptr, 10)) : 300;
-			e.min_expansion          = row[14] ? static_cast<int8_t>(atoi(row[14])) : -1;
-			e.max_expansion          = row[15] ? static_cast<int8_t>(atoi(row[15])) : -1;
-			e.content_flags          = row[16] ? row[16] : "";
-			e.content_flags_disabled = row[17] ? row[17] : "";
+			e.fix_z                  = row[14] ? static_cast<uint8_t>(strtoul(row[14], nullptr, 10)) : 1;
+			e.min_expansion          = row[15] ? static_cast<int8_t>(atoi(row[15])) : -1;
+			e.max_expansion          = row[16] ? static_cast<int8_t>(atoi(row[16])) : -1;
+			e.content_flags          = row[17] ? row[17] : "";
+			e.content_flags_disabled = row[18] ? row[18] : "";
 
 			return e;
 		}
@@ -247,10 +252,11 @@ public:
 		v.push_back(columns[11] + " = " + std::to_string(e.max_allowed));
 		v.push_back(columns[12] + " = '" + Strings::Escape(e.comment) + "'");
 		v.push_back(columns[13] + " = " + std::to_string(e.respawn_timer));
-		v.push_back(columns[14] + " = " + std::to_string(e.min_expansion));
-		v.push_back(columns[15] + " = " + std::to_string(e.max_expansion));
-		v.push_back(columns[16] + " = '" + Strings::Escape(e.content_flags) + "'");
-		v.push_back(columns[17] + " = '" + Strings::Escape(e.content_flags_disabled) + "'");
+		v.push_back(columns[14] + " = " + std::to_string(e.fix_z));
+		v.push_back(columns[15] + " = " + std::to_string(e.min_expansion));
+		v.push_back(columns[16] + " = " + std::to_string(e.max_expansion));
+		v.push_back(columns[17] + " = '" + Strings::Escape(e.content_flags) + "'");
+		v.push_back(columns[18] + " = '" + Strings::Escape(e.content_flags_disabled) + "'");
 
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -286,6 +292,7 @@ public:
 		v.push_back(std::to_string(e.max_allowed));
 		v.push_back("'" + Strings::Escape(e.comment) + "'");
 		v.push_back(std::to_string(e.respawn_timer));
+		v.push_back(std::to_string(e.fix_z));
 		v.push_back(std::to_string(e.min_expansion));
 		v.push_back(std::to_string(e.max_expansion));
 		v.push_back("'" + Strings::Escape(e.content_flags) + "'");
@@ -333,6 +340,7 @@ public:
 			v.push_back(std::to_string(e.max_allowed));
 			v.push_back("'" + Strings::Escape(e.comment) + "'");
 			v.push_back(std::to_string(e.respawn_timer));
+			v.push_back(std::to_string(e.fix_z));
 			v.push_back(std::to_string(e.min_expansion));
 			v.push_back(std::to_string(e.max_expansion));
 			v.push_back("'" + Strings::Escape(e.content_flags) + "'");
@@ -384,10 +392,11 @@ public:
 			e.max_allowed            = row[11] ? static_cast<uint32_t>(strtoul(row[11], nullptr, 10)) : 1;
 			e.comment                = row[12] ? row[12] : "";
 			e.respawn_timer          = row[13] ? static_cast<uint32_t>(strtoul(row[13], nullptr, 10)) : 300;
-			e.min_expansion          = row[14] ? static_cast<int8_t>(atoi(row[14])) : -1;
-			e.max_expansion          = row[15] ? static_cast<int8_t>(atoi(row[15])) : -1;
-			e.content_flags          = row[16] ? row[16] : "";
-			e.content_flags_disabled = row[17] ? row[17] : "";
+			e.fix_z                  = row[14] ? static_cast<uint8_t>(strtoul(row[14], nullptr, 10)) : 1;
+			e.min_expansion          = row[15] ? static_cast<int8_t>(atoi(row[15])) : -1;
+			e.max_expansion          = row[16] ? static_cast<int8_t>(atoi(row[16])) : -1;
+			e.content_flags          = row[17] ? row[17] : "";
+			e.content_flags_disabled = row[18] ? row[18] : "";
 
 			all_entries.push_back(e);
 		}
@@ -426,10 +435,11 @@ public:
 			e.max_allowed            = row[11] ? static_cast<uint32_t>(strtoul(row[11], nullptr, 10)) : 1;
 			e.comment                = row[12] ? row[12] : "";
 			e.respawn_timer          = row[13] ? static_cast<uint32_t>(strtoul(row[13], nullptr, 10)) : 300;
-			e.min_expansion          = row[14] ? static_cast<int8_t>(atoi(row[14])) : -1;
-			e.max_expansion          = row[15] ? static_cast<int8_t>(atoi(row[15])) : -1;
-			e.content_flags          = row[16] ? row[16] : "";
-			e.content_flags_disabled = row[17] ? row[17] : "";
+			e.fix_z                  = row[14] ? static_cast<uint8_t>(strtoul(row[14], nullptr, 10)) : 1;
+			e.min_expansion          = row[15] ? static_cast<int8_t>(atoi(row[15])) : -1;
+			e.max_expansion          = row[16] ? static_cast<int8_t>(atoi(row[16])) : -1;
+			e.content_flags          = row[17] ? row[17] : "";
+			e.content_flags_disabled = row[18] ? row[18] : "";
 
 			all_entries.push_back(e);
 		}
@@ -518,6 +528,7 @@ public:
 		v.push_back(std::to_string(e.max_allowed));
 		v.push_back("'" + Strings::Escape(e.comment) + "'");
 		v.push_back(std::to_string(e.respawn_timer));
+		v.push_back(std::to_string(e.fix_z));
 		v.push_back(std::to_string(e.min_expansion));
 		v.push_back(std::to_string(e.max_expansion));
 		v.push_back("'" + Strings::Escape(e.content_flags) + "'");
@@ -558,6 +569,7 @@ public:
 			v.push_back(std::to_string(e.max_allowed));
 			v.push_back("'" + Strings::Escape(e.comment) + "'");
 			v.push_back(std::to_string(e.respawn_timer));
+			v.push_back(std::to_string(e.fix_z));
 			v.push_back(std::to_string(e.min_expansion));
 			v.push_back(std::to_string(e.max_expansion));
 			v.push_back("'" + Strings::Escape(e.content_flags) + "'");

common/repositories/base/base_group_id_repository.h

@@ -19,34 +19,37 @@
 class BaseGroupIdRepository {
 public:
 	struct GroupId {
-		int32_t     groupid;
-		int32_t     charid;
+		uint32_t    group_id;
 		std::string name;
-		int8_t      ismerc;
+		uint32_t    character_id;
+		uint32_t    bot_id;
+		uint32_t    merc_id;
 	};
 
 	static std::string PrimaryKey()
 	{
-		return std::string("groupid");
+		return std::string("group_id");
 	}
 
 	static std::vector<std::string> Columns()
 	{
 		return {
-			"groupid",
-			"charid",
+			"group_id",
 			"name",
-			"ismerc",
+			"character_id",
+			"bot_id",
+			"merc_id",
 		};
 	}
 
 	static std::vector<std::string> SelectColumns()
 	{
 		return {
-			"groupid",
-			"charid",
+			"group_id",
 			"name",
-			"ismerc",
+			"character_id",
+			"bot_id",
+			"merc_id",
 		};
 	}
 
@@ -87,10 +90,11 @@ public:
 	{
 		GroupId e{};
 
-		e.groupid = 0;
-		e.charid  = 0;
-		e.name    = "";
-		e.ismerc  = 0;
+		e.group_id     = 0;
+		e.name         = "";
+		e.character_id = 0;
+		e.bot_id       = 0;
+		e.merc_id      = 0;
 
 		return e;
 	}
@@ -101,7 +105,7 @@ public:
 	)
 	{
 		for (auto &group_id : group_ids) {
-			if (group_id.groupid == group_id_id) {
+			if (group_id.group_id == group_id_id) {
 				return group_id;
 			}
 		}
@@ -127,10 +131,11 @@ public:
 		if (results.RowCount() == 1) {
 			GroupId e{};
 
-			e.groupid = row[0] ? static_cast<int32_t>(atoi(row[0])) : 0;
-			e.charid  = row[1] ? static_cast<int32_t>(atoi(row[1])) : 0;
-			e.name    = row[2] ? row[2] : "";
-			e.ismerc  = row[3] ? static_cast<int8_t>(atoi(row[3])) : 0;
+			e.group_id     = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.name         = row[1] ? row[1] : "";
+			e.character_id = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
+			e.bot_id       = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
+			e.merc_id      = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
 
 			return e;
 		}
@@ -164,10 +169,11 @@ public:
 
 		auto columns = Columns();
 
-		v.push_back(columns[0] + " = " + std::to_string(e.groupid));
-		v.push_back(columns[1] + " = " + std::to_string(e.charid));
-		v.push_back(columns[2] + " = '" + Strings::Escape(e.name) + "'");
-		v.push_back(columns[3] + " = " + std::to_string(e.ismerc));
+		v.push_back(columns[0] + " = " + std::to_string(e.group_id));
+		v.push_back(columns[1] + " = '" + Strings::Escape(e.name) + "'");
+		v.push_back(columns[2] + " = " + std::to_string(e.character_id));
+		v.push_back(columns[3] + " = " + std::to_string(e.bot_id));
+		v.push_back(columns[4] + " = " + std::to_string(e.merc_id));
 
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -175,7 +181,7 @@ public:
 				TableName(),
 				Strings::Implode(", ", v),
 				PrimaryKey(),
-				e.groupid
+				e.group_id
 			)
 		);
 
@@ -189,10 +195,11 @@ public:
 	{
 		std::vector<std::string> v;
 
-		v.push_back(std::to_string(e.groupid));
-		v.push_back(std::to_string(e.charid));
+		v.push_back(std::to_string(e.group_id));
 		v.push_back("'" + Strings::Escape(e.name) + "'");
-		v.push_back(std::to_string(e.ismerc));
+		v.push_back(std::to_string(e.character_id));
+		v.push_back(std::to_string(e.bot_id));
+		v.push_back(std::to_string(e.merc_id));
 
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -203,7 +210,7 @@ public:
 		);
 
 		if (results.Success()) {
-			e.groupid = results.LastInsertedID();
+			e.group_id = results.LastInsertedID();
 			return e;
 		}
 
@@ -222,10 +229,11 @@ public:
 		for (auto &e: entries) {
 			std::vector<std::string> v;
 
-			v.push_back(std::to_string(e.groupid));
-			v.push_back(std::to_string(e.charid));
+			v.push_back(std::to_string(e.group_id));
 			v.push_back("'" + Strings::Escape(e.name) + "'");
-			v.push_back(std::to_string(e.ismerc));
+			v.push_back(std::to_string(e.character_id));
+			v.push_back(std::to_string(e.bot_id));
+			v.push_back(std::to_string(e.merc_id));
 
 			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
 		}
@@ -259,10 +267,11 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			GroupId e{};
 
-			e.groupid = row[0] ? static_cast<int32_t>(atoi(row[0])) : 0;
-			e.charid  = row[1] ? static_cast<int32_t>(atoi(row[1])) : 0;
-			e.name    = row[2] ? row[2] : "";
-			e.ismerc  = row[3] ? static_cast<int8_t>(atoi(row[3])) : 0;
+			e.group_id     = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.name         = row[1] ? row[1] : "";
+			e.character_id = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
+			e.bot_id       = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
+			e.merc_id      = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
 
 			all_entries.push_back(e);
 		}
@@ -287,10 +296,11 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			GroupId e{};
 
-			e.groupid = row[0] ? static_cast<int32_t>(atoi(row[0])) : 0;
-			e.charid  = row[1] ? static_cast<int32_t>(atoi(row[1])) : 0;
-			e.name    = row[2] ? row[2] : "";
-			e.ismerc  = row[3] ? static_cast<int8_t>(atoi(row[3])) : 0;
+			e.group_id     = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.name         = row[1] ? row[1] : "";
+			e.character_id = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
+			e.bot_id       = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
+			e.merc_id      = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
 
 			all_entries.push_back(e);
 		}
@@ -365,10 +375,11 @@ public:
 	{
 		std::vector<std::string> v;
 
-		v.push_back(std::to_string(e.groupid));
-		v.push_back(std::to_string(e.charid));
+		v.push_back(std::to_string(e.group_id));
 		v.push_back("'" + Strings::Escape(e.name) + "'");
-		v.push_back(std::to_string(e.ismerc));
+		v.push_back(std::to_string(e.character_id));
+		v.push_back(std::to_string(e.bot_id));
+		v.push_back(std::to_string(e.merc_id));
 
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -391,10 +402,11 @@ public:
 		for (auto &e: entries) {
 			std::vector<std::string> v;
 
-			v.push_back(std::to_string(e.groupid));
-			v.push_back(std::to_string(e.charid));
+			v.push_back(std::to_string(e.group_id));
 			v.push_back("'" + Strings::Escape(e.name) + "'");
-			v.push_back(std::to_string(e.ismerc));
+			v.push_back(std::to_string(e.character_id));
+			v.push_back(std::to_string(e.bot_id));
+			v.push_back(std::to_string(e.merc_id));
 
 			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
 		}

common/repositories/base/base_group_leaders_repository.h

@@ -105,7 +105,7 @@ public:
 		e.gid            = 0;
 		e.leadername     = "";
 		e.marknpc        = "";
-		e.leadershipaa   = 0;
+		e.leadershipaa   = "";
 		e.maintank       = "";
 		e.assist         = "";
 		e.puller         = "";
@@ -150,7 +150,7 @@ public:
 			e.gid            = row[0] ? static_cast<int32_t>(atoi(row[0])) : 0;
 			e.leadername     = row[1] ? row[1] : "";
 			e.marknpc        = row[2] ? row[2] : "";
-			e.leadershipaa   = row[3] ? row[3] : 0;
+			e.leadershipaa   = row[3] ? row[3] : "";
 			e.maintank       = row[4] ? row[4] : "";
 			e.assist         = row[5] ? row[5] : "";
 			e.puller         = row[6] ? row[6] : "";
@@ -192,7 +192,7 @@ public:
 		v.push_back(columns[0] + " = " + std::to_string(e.gid));
 		v.push_back(columns[1] + " = '" + Strings::Escape(e.leadername) + "'");
 		v.push_back(columns[2] + " = '" + Strings::Escape(e.marknpc) + "'");
-		v.push_back(columns[3] + " = '" + Strings::Escape(e.leadershipaa) + "'");
+		v.push_back(columns[3] + " = '" + e.leadershipaa + "'");
 		v.push_back(columns[4] + " = '" + Strings::Escape(e.maintank) + "'");
 		v.push_back(columns[5] + " = '" + Strings::Escape(e.assist) + "'");
 		v.push_back(columns[6] + " = '" + Strings::Escape(e.puller) + "'");
@@ -222,7 +222,7 @@ public:
 		v.push_back(std::to_string(e.gid));
 		v.push_back("'" + Strings::Escape(e.leadername) + "'");
 		v.push_back("'" + Strings::Escape(e.marknpc) + "'");
-		v.push_back("'" + Strings::Escape(e.leadershipaa) + "'");
+		v.push_back("'" + e.leadershipaa + "'");
 		v.push_back("'" + Strings::Escape(e.maintank) + "'");
 		v.push_back("'" + Strings::Escape(e.assist) + "'");
 		v.push_back("'" + Strings::Escape(e.puller) + "'");
@@ -260,7 +260,7 @@ public:
 			v.push_back(std::to_string(e.gid));
 			v.push_back("'" + Strings::Escape(e.leadername) + "'");
 			v.push_back("'" + Strings::Escape(e.marknpc) + "'");
-			v.push_back("'" + Strings::Escape(e.leadershipaa) + "'");
+			v.push_back("'" + e.leadershipaa + "'");
 			v.push_back("'" + Strings::Escape(e.maintank) + "'");
 			v.push_back("'" + Strings::Escape(e.assist) + "'");
 			v.push_back("'" + Strings::Escape(e.puller) + "'");
@@ -302,7 +302,7 @@ public:
 			e.gid            = row[0] ? static_cast<int32_t>(atoi(row[0])) : 0;
 			e.leadername     = row[1] ? row[1] : "";
 			e.marknpc        = row[2] ? row[2] : "";
-			e.leadershipaa   = row[3] ? row[3] : 0;
+			e.leadershipaa   = row[3] ? row[3] : "";
 			e.maintank       = row[4] ? row[4] : "";
 			e.assist         = row[5] ? row[5] : "";
 			e.puller         = row[6] ? row[6] : "";
@@ -335,7 +335,7 @@ public:
 			e.gid            = row[0] ? static_cast<int32_t>(atoi(row[0])) : 0;
 			e.leadername     = row[1] ? row[1] : "";
 			e.marknpc        = row[2] ? row[2] : "";
-			e.leadershipaa   = row[3] ? row[3] : 0;
+			e.leadershipaa   = row[3] ? row[3] : "";
 			e.maintank       = row[4] ? row[4] : "";
 			e.assist         = row[5] ? row[5] : "";
 			e.puller         = row[6] ? row[6] : "";
@@ -418,7 +418,7 @@ public:
 		v.push_back(std::to_string(e.gid));
 		v.push_back("'" + Strings::Escape(e.leadername) + "'");
 		v.push_back("'" + Strings::Escape(e.marknpc) + "'");
-		v.push_back("'" + Strings::Escape(e.leadershipaa) + "'");
+		v.push_back("'" + e.leadershipaa + "'");
 		v.push_back("'" + Strings::Escape(e.maintank) + "'");
 		v.push_back("'" + Strings::Escape(e.assist) + "'");
 		v.push_back("'" + Strings::Escape(e.puller) + "'");
@@ -449,7 +449,7 @@ public:
 			v.push_back(std::to_string(e.gid));
 			v.push_back("'" + Strings::Escape(e.leadername) + "'");
 			v.push_back("'" + Strings::Escape(e.marknpc) + "'");
-			v.push_back("'" + Strings::Escape(e.leadershipaa) + "'");
+			v.push_back("'" + e.leadershipaa + "'");
 			v.push_back("'" + Strings::Escape(e.maintank) + "'");
 			v.push_back("'" + Strings::Escape(e.assist) + "'");
 			v.push_back("'" + Strings::Escape(e.puller) + "'");

common/repositories/base/base_guild_bank_repository.h

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

common/repositories/base/base_guild_permissions_repository.h

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

common/repositories/base/base_guild_tributes_repository.h

@@ -0,0 +1,453 @@
+/**
+ * DO NOT MODIFY THIS FILE
+ *
+ * This repository was automatically generated and is NOT to be modified directly.
+ * Any repository modifications are meant to be made to the repository extending the base.
+ * Any modifications to base repositories are to be made by the generator only
+ *
+ * @generator ./utils/scripts/generators/repository-generator.pl
+ * @docs https://docs.eqemu.io/developer/repositories
+ */
+
+#ifndef EQEMU_BASE_GUILD_TRIBUTES_REPOSITORY_H
+#define EQEMU_BASE_GUILD_TRIBUTES_REPOSITORY_H
+
+#include "../../database.h"
+#include "../../strings.h"
+#include <ctime>
+
+
+class BaseGuildTributesRepository {
+public:
+	struct GuildTributes {
+		uint32_t guild_id;
+		uint32_t tribute_id_1;
+		uint32_t tribute_id_1_tier;
+		uint32_t tribute_id_2;
+		uint32_t tribute_id_2_tier;
+		uint32_t time_remaining;
+		uint32_t enabled;
+	};
+
+	static std::string PrimaryKey()
+	{
+		return std::string("guild_id");
+	}
+
+	static std::vector<std::string> Columns()
+	{
+		return {
+			"guild_id",
+			"tribute_id_1",
+			"tribute_id_1_tier",
+			"tribute_id_2",
+			"tribute_id_2_tier",
+			"time_remaining",
+			"enabled",
+		};
+	}
+
+	static std::vector<std::string> SelectColumns()
+	{
+		return {
+			"guild_id",
+			"tribute_id_1",
+			"tribute_id_1_tier",
+			"tribute_id_2",
+			"tribute_id_2_tier",
+			"time_remaining",
+			"enabled",
+		};
+	}
+
+	static std::string ColumnsRaw()
+	{
+		return std::string(Strings::Implode(", ", Columns()));
+	}
+
+	static std::string SelectColumnsRaw()
+	{
+		return std::string(Strings::Implode(", ", SelectColumns()));
+	}
+
+	static std::string TableName()
+	{
+		return std::string("guild_tributes");
+	}
+
+	static std::string BaseSelect()
+	{
+		return fmt::format(
+			"SELECT {} FROM {}",
+			SelectColumnsRaw(),
+			TableName()
+		);
+	}
+
+	static std::string BaseInsert()
+	{
+		return fmt::format(
+			"INSERT INTO {} ({}) ",
+			TableName(),
+			ColumnsRaw()
+		);
+	}
+
+	static GuildTributes NewEntity()
+	{
+		GuildTributes e{};
+
+		e.guild_id          = 0;
+		e.tribute_id_1      = 0;
+		e.tribute_id_1_tier = 0;
+		e.tribute_id_2      = 0;
+		e.tribute_id_2_tier = 0;
+		e.time_remaining    = 0;
+		e.enabled           = 0;
+
+		return e;
+	}
+
+	static GuildTributes GetGuildTributes(
+		const std::vector<GuildTributes> &guild_tributess,
+		int guild_tributes_id
+	)
+	{
+		for (auto &guild_tributes : guild_tributess) {
+			if (guild_tributes.guild_id == guild_tributes_id) {
+				return guild_tributes;
+			}
+		}
+
+		return NewEntity();
+	}
+
+	static GuildTributes FindOne(
+		Database& db,
+		int guild_tributes_id
+	)
+	{
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} WHERE {} = {} LIMIT 1",
+				BaseSelect(),
+				PrimaryKey(),
+				guild_tributes_id
+			)
+		);
+
+		auto row = results.begin();
+		if (results.RowCount() == 1) {
+			GuildTributes e{};
+
+			e.guild_id          = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
+			e.tribute_id_1      = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
+			e.tribute_id_1_tier = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
+			e.tribute_id_2      = static_cast<uint32_t>(strtoul(row[3], nullptr, 10));
+			e.tribute_id_2_tier = static_cast<uint32_t>(strtoul(row[4], nullptr, 10));
+			e.time_remaining    = static_cast<uint32_t>(strtoul(row[5], nullptr, 10));
+			e.enabled           = static_cast<uint32_t>(strtoul(row[6], nullptr, 10));
+
+			return e;
+		}
+
+		return NewEntity();
+	}
+
+	static int DeleteOne(
+		Database& db,
+		int guild_tributes_id
+	)
+	{
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"DELETE FROM {} WHERE {} = {}",
+				TableName(),
+				PrimaryKey(),
+				guild_tributes_id
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static int UpdateOne(
+		Database& db,
+		const GuildTributes &e
+	)
+	{
+		std::vector<std::string> v;
+
+		auto columns = Columns();
+
+		v.push_back(columns[0] + " = " + std::to_string(e.guild_id));
+		v.push_back(columns[1] + " = " + std::to_string(e.tribute_id_1));
+		v.push_back(columns[2] + " = " + std::to_string(e.tribute_id_1_tier));
+		v.push_back(columns[3] + " = " + std::to_string(e.tribute_id_2));
+		v.push_back(columns[4] + " = " + std::to_string(e.tribute_id_2_tier));
+		v.push_back(columns[5] + " = " + std::to_string(e.time_remaining));
+		v.push_back(columns[6] + " = " + std::to_string(e.enabled));
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"UPDATE {} SET {} WHERE {} = {}",
+				TableName(),
+				Strings::Implode(", ", v),
+				PrimaryKey(),
+				e.guild_id
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static GuildTributes InsertOne(
+		Database& db,
+		GuildTributes e
+	)
+	{
+		std::vector<std::string> v;
+
+		v.push_back(std::to_string(e.guild_id));
+		v.push_back(std::to_string(e.tribute_id_1));
+		v.push_back(std::to_string(e.tribute_id_1_tier));
+		v.push_back(std::to_string(e.tribute_id_2));
+		v.push_back(std::to_string(e.tribute_id_2_tier));
+		v.push_back(std::to_string(e.time_remaining));
+		v.push_back(std::to_string(e.enabled));
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES ({})",
+				BaseInsert(),
+				Strings::Implode(",", v)
+			)
+		);
+
+		if (results.Success()) {
+			e.guild_id = results.LastInsertedID();
+			return e;
+		}
+
+		e = NewEntity();
+
+		return e;
+	}
+
+	static int InsertMany(
+		Database& db,
+		const std::vector<GuildTributes> &entries
+	)
+	{
+		std::vector<std::string> insert_chunks;
+
+		for (auto &e: entries) {
+			std::vector<std::string> v;
+
+			v.push_back(std::to_string(e.guild_id));
+			v.push_back(std::to_string(e.tribute_id_1));
+			v.push_back(std::to_string(e.tribute_id_1_tier));
+			v.push_back(std::to_string(e.tribute_id_2));
+			v.push_back(std::to_string(e.tribute_id_2_tier));
+			v.push_back(std::to_string(e.time_remaining));
+			v.push_back(std::to_string(e.enabled));
+
+			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
+		}
+
+		std::vector<std::string> v;
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES {}",
+				BaseInsert(),
+				Strings::Implode(",", insert_chunks)
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static std::vector<GuildTributes> All(Database& db)
+	{
+		std::vector<GuildTributes> all_entries;
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{}",
+				BaseSelect()
+			)
+		);
+
+		all_entries.reserve(results.RowCount());
+
+		for (auto row = results.begin(); row != results.end(); ++row) {
+			GuildTributes e{};
+
+			e.guild_id          = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
+			e.tribute_id_1      = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
+			e.tribute_id_1_tier = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
+			e.tribute_id_2      = static_cast<uint32_t>(strtoul(row[3], nullptr, 10));
+			e.tribute_id_2_tier = static_cast<uint32_t>(strtoul(row[4], nullptr, 10));
+			e.time_remaining    = static_cast<uint32_t>(strtoul(row[5], nullptr, 10));
+			e.enabled           = static_cast<uint32_t>(strtoul(row[6], nullptr, 10));
+
+			all_entries.push_back(e);
+		}
+
+		return all_entries;
+	}
+
+	static std::vector<GuildTributes> GetWhere(Database& db, const std::string &where_filter)
+	{
+		std::vector<GuildTributes> all_entries;
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} WHERE {}",
+				BaseSelect(),
+				where_filter
+			)
+		);
+
+		all_entries.reserve(results.RowCount());
+
+		for (auto row = results.begin(); row != results.end(); ++row) {
+			GuildTributes e{};
+
+			e.guild_id          = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
+			e.tribute_id_1      = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
+			e.tribute_id_1_tier = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
+			e.tribute_id_2      = static_cast<uint32_t>(strtoul(row[3], nullptr, 10));
+			e.tribute_id_2_tier = static_cast<uint32_t>(strtoul(row[4], nullptr, 10));
+			e.time_remaining    = static_cast<uint32_t>(strtoul(row[5], nullptr, 10));
+			e.enabled           = static_cast<uint32_t>(strtoul(row[6], nullptr, 10));
+
+			all_entries.push_back(e);
+		}
+
+		return all_entries;
+	}
+
+	static int DeleteWhere(Database& db, const std::string &where_filter)
+	{
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"DELETE FROM {} WHERE {}",
+				TableName(),
+				where_filter
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static int Truncate(Database& db)
+	{
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"TRUNCATE TABLE {}",
+				TableName()
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static int64 GetMaxId(Database& db)
+	{
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"SELECT COALESCE(MAX({}), 0) FROM {}",
+				PrimaryKey(),
+				TableName()
+			)
+		);
+
+		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
+	}
+
+	static int64 Count(Database& db, const std::string &where_filter = "")
+	{
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"SELECT COUNT(*) FROM {} {}",
+				TableName(),
+				(where_filter.empty() ? "" : "WHERE " + where_filter)
+			)
+		);
+
+		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
+	}
+
+	static std::string BaseReplace()
+	{
+		return fmt::format(
+			"REPLACE INTO {} ({}) ",
+			TableName(),
+			ColumnsRaw()
+		);
+	}
+
+	static int ReplaceOne(
+		Database& db,
+		const GuildTributes &e
+	)
+	{
+		std::vector<std::string> v;
+
+		v.push_back(std::to_string(e.guild_id));
+		v.push_back(std::to_string(e.tribute_id_1));
+		v.push_back(std::to_string(e.tribute_id_1_tier));
+		v.push_back(std::to_string(e.tribute_id_2));
+		v.push_back(std::to_string(e.tribute_id_2_tier));
+		v.push_back(std::to_string(e.time_remaining));
+		v.push_back(std::to_string(e.enabled));
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES ({})",
+				BaseReplace(),
+				Strings::Implode(",", v)
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static int ReplaceMany(
+		Database& db,
+		const std::vector<GuildTributes> &entries
+	)
+	{
+		std::vector<std::string> insert_chunks;
+
+		for (auto &e: entries) {
+			std::vector<std::string> v;
+
+			v.push_back(std::to_string(e.guild_id));
+			v.push_back(std::to_string(e.tribute_id_1));
+			v.push_back(std::to_string(e.tribute_id_1_tier));
+			v.push_back(std::to_string(e.tribute_id_2));
+			v.push_back(std::to_string(e.tribute_id_2_tier));
+			v.push_back(std::to_string(e.time_remaining));
+			v.push_back(std::to_string(e.enabled));
+
+			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
+		}
+
+		std::vector<std::string> v;
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES {}",
+				BaseReplace(),
+				Strings::Implode(",", insert_chunks)
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+};
+
+#endif //EQEMU_BASE_GUILD_TRIBUTES_REPOSITORY_H

common/repositories/base/base_guilds_repository.h

@@ -16,6 +16,7 @@
 #include "../../strings.h"
 #include <ctime>
 
+
 class BaseGuildsRepository {
 public:
 	struct Guilds {

common/repositories/base/base_lootdrop_entries_repository.h

@@ -19,17 +19,21 @@
 class BaseLootdropEntriesRepository {
 public:
 	struct LootdropEntries {
-		uint32_t lootdrop_id;
-		int32_t  item_id;
-		uint16_t item_charges;
-		uint8_t  equip_item;
-		float    chance;
-		float    disabled_chance;
-		uint16_t trivial_min_level;
-		uint16_t trivial_max_level;
-		uint8_t  multiplier;
-		uint16_t npc_min_level;
-		uint16_t npc_max_level;
+		uint32_t    lootdrop_id;
+		int32_t     item_id;
+		uint16_t    item_charges;
+		uint8_t     equip_item;
+		float       chance;
+		float       disabled_chance;
+		uint16_t    trivial_min_level;
+		uint16_t    trivial_max_level;
+		uint8_t     multiplier;
+		uint16_t    npc_min_level;
+		uint16_t    npc_max_level;
+		int8_t      min_expansion;
+		int8_t      max_expansion;
+		std::string content_flags;
+		std::string content_flags_disabled;
 	};
 
 	static std::string PrimaryKey()
@@ -51,6 +55,10 @@ public:
 			"multiplier",
 			"npc_min_level",
 			"npc_max_level",
+			"min_expansion",
+			"max_expansion",
+			"content_flags",
+			"content_flags_disabled",
 		};
 	}
 
@@ -68,6 +76,10 @@ public:
 			"multiplier",
 			"npc_min_level",
 			"npc_max_level",
+			"min_expansion",
+			"max_expansion",
+			"content_flags",
+			"content_flags_disabled",
 		};
 	}
 
@@ -108,17 +120,21 @@ public:
 	{
 		LootdropEntries e{};
 
-		e.lootdrop_id       = 0;
-		e.item_id           = 0;
-		e.item_charges      = 1;
-		e.equip_item        = 0;
-		e.chance            = 1;
-		e.disabled_chance   = 0;
-		e.trivial_min_level = 0;
-		e.trivial_max_level = 0;
-		e.multiplier        = 1;
-		e.npc_min_level     = 0;
-		e.npc_max_level     = 0;
+		e.lootdrop_id            = 0;
+		e.item_id                = 0;
+		e.item_charges           = 1;
+		e.equip_item             = 0;
+		e.chance                 = 1;
+		e.disabled_chance        = 0;
+		e.trivial_min_level      = 0;
+		e.trivial_max_level      = 0;
+		e.multiplier             = 1;
+		e.npc_min_level          = 0;
+		e.npc_max_level          = 0;
+		e.min_expansion          = -1;
+		e.max_expansion          = -1;
+		e.content_flags          = "";
+		e.content_flags_disabled = "";
 
 		return e;
 	}
@@ -155,17 +171,21 @@ public:
 		if (results.RowCount() == 1) {
 			LootdropEntries e{};
 
-			e.lootdrop_id       = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
-			e.item_id           = row[1] ? static_cast<int32_t>(atoi(row[1])) : 0;
-			e.item_charges      = row[2] ? static_cast<uint16_t>(strtoul(row[2], nullptr, 10)) : 1;
-			e.equip_item        = row[3] ? static_cast<uint8_t>(strtoul(row[3], nullptr, 10)) : 0;
-			e.chance            = row[4] ? strtof(row[4], nullptr) : 1;
-			e.disabled_chance   = row[5] ? strtof(row[5], nullptr) : 0;
-			e.trivial_min_level = row[6] ? static_cast<uint16_t>(strtoul(row[6], nullptr, 10)) : 0;
-			e.trivial_max_level = row[7] ? static_cast<uint16_t>(strtoul(row[7], nullptr, 10)) : 0;
-			e.multiplier        = row[8] ? static_cast<uint8_t>(strtoul(row[8], nullptr, 10)) : 1;
-			e.npc_min_level     = row[9] ? static_cast<uint16_t>(strtoul(row[9], nullptr, 10)) : 0;
-			e.npc_max_level     = row[10] ? static_cast<uint16_t>(strtoul(row[10], nullptr, 10)) : 0;
+			e.lootdrop_id            = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.item_id                = row[1] ? static_cast<int32_t>(atoi(row[1])) : 0;
+			e.item_charges           = row[2] ? static_cast<uint16_t>(strtoul(row[2], nullptr, 10)) : 1;
+			e.equip_item             = row[3] ? static_cast<uint8_t>(strtoul(row[3], nullptr, 10)) : 0;
+			e.chance                 = row[4] ? strtof(row[4], nullptr) : 1;
+			e.disabled_chance        = row[5] ? strtof(row[5], nullptr) : 0;
+			e.trivial_min_level      = row[6] ? static_cast<uint16_t>(strtoul(row[6], nullptr, 10)) : 0;
+			e.trivial_max_level      = row[7] ? static_cast<uint16_t>(strtoul(row[7], nullptr, 10)) : 0;
+			e.multiplier             = row[8] ? static_cast<uint8_t>(strtoul(row[8], nullptr, 10)) : 1;
+			e.npc_min_level          = row[9] ? static_cast<uint16_t>(strtoul(row[9], nullptr, 10)) : 0;
+			e.npc_max_level          = row[10] ? static_cast<uint16_t>(strtoul(row[10], nullptr, 10)) : 0;
+			e.min_expansion          = row[11] ? static_cast<int8_t>(atoi(row[11])) : -1;
+			e.max_expansion          = row[12] ? static_cast<int8_t>(atoi(row[12])) : -1;
+			e.content_flags          = row[13] ? row[13] : "";
+			e.content_flags_disabled = row[14] ? row[14] : "";
 
 			return e;
 		}
@@ -210,6 +230,10 @@ public:
 		v.push_back(columns[8] + " = " + std::to_string(e.multiplier));
 		v.push_back(columns[9] + " = " + std::to_string(e.npc_min_level));
 		v.push_back(columns[10] + " = " + std::to_string(e.npc_max_level));
+		v.push_back(columns[11] + " = " + std::to_string(e.min_expansion));
+		v.push_back(columns[12] + " = " + std::to_string(e.max_expansion));
+		v.push_back(columns[13] + " = '" + Strings::Escape(e.content_flags) + "'");
+		v.push_back(columns[14] + " = '" + Strings::Escape(e.content_flags_disabled) + "'");
 
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -242,6 +266,10 @@ public:
 		v.push_back(std::to_string(e.multiplier));
 		v.push_back(std::to_string(e.npc_min_level));
 		v.push_back(std::to_string(e.npc_max_level));
+		v.push_back(std::to_string(e.min_expansion));
+		v.push_back(std::to_string(e.max_expansion));
+		v.push_back("'" + Strings::Escape(e.content_flags) + "'");
+		v.push_back("'" + Strings::Escape(e.content_flags_disabled) + "'");
 
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -282,6 +310,10 @@ public:
 			v.push_back(std::to_string(e.multiplier));
 			v.push_back(std::to_string(e.npc_min_level));
 			v.push_back(std::to_string(e.npc_max_level));
+			v.push_back(std::to_string(e.min_expansion));
+			v.push_back(std::to_string(e.max_expansion));
+			v.push_back("'" + Strings::Escape(e.content_flags) + "'");
+			v.push_back("'" + Strings::Escape(e.content_flags_disabled) + "'");
 
 			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
 		}
@@ -315,17 +347,21 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			LootdropEntries e{};
 
-			e.lootdrop_id       = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
-			e.item_id           = row[1] ? static_cast<int32_t>(atoi(row[1])) : 0;
-			e.item_charges      = row[2] ? static_cast<uint16_t>(strtoul(row[2], nullptr, 10)) : 1;
-			e.equip_item        = row[3] ? static_cast<uint8_t>(strtoul(row[3], nullptr, 10)) : 0;
-			e.chance            = row[4] ? strtof(row[4], nullptr) : 1;
-			e.disabled_chance   = row[5] ? strtof(row[5], nullptr) : 0;
-			e.trivial_min_level = row[6] ? static_cast<uint16_t>(strtoul(row[6], nullptr, 10)) : 0;
-			e.trivial_max_level = row[7] ? static_cast<uint16_t>(strtoul(row[7], nullptr, 10)) : 0;
-			e.multiplier        = row[8] ? static_cast<uint8_t>(strtoul(row[8], nullptr, 10)) : 1;
-			e.npc_min_level     = row[9] ? static_cast<uint16_t>(strtoul(row[9], nullptr, 10)) : 0;
-			e.npc_max_level     = row[10] ? static_cast<uint16_t>(strtoul(row[10], nullptr, 10)) : 0;
+			e.lootdrop_id            = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.item_id                = row[1] ? static_cast<int32_t>(atoi(row[1])) : 0;
+			e.item_charges           = row[2] ? static_cast<uint16_t>(strtoul(row[2], nullptr, 10)) : 1;
+			e.equip_item             = row[3] ? static_cast<uint8_t>(strtoul(row[3], nullptr, 10)) : 0;
+			e.chance                 = row[4] ? strtof(row[4], nullptr) : 1;
+			e.disabled_chance        = row[5] ? strtof(row[5], nullptr) : 0;
+			e.trivial_min_level      = row[6] ? static_cast<uint16_t>(strtoul(row[6], nullptr, 10)) : 0;
+			e.trivial_max_level      = row[7] ? static_cast<uint16_t>(strtoul(row[7], nullptr, 10)) : 0;
+			e.multiplier             = row[8] ? static_cast<uint8_t>(strtoul(row[8], nullptr, 10)) : 1;
+			e.npc_min_level          = row[9] ? static_cast<uint16_t>(strtoul(row[9], nullptr, 10)) : 0;
+			e.npc_max_level          = row[10] ? static_cast<uint16_t>(strtoul(row[10], nullptr, 10)) : 0;
+			e.min_expansion          = row[11] ? static_cast<int8_t>(atoi(row[11])) : -1;
+			e.max_expansion          = row[12] ? static_cast<int8_t>(atoi(row[12])) : -1;
+			e.content_flags          = row[13] ? row[13] : "";
+			e.content_flags_disabled = row[14] ? row[14] : "";
 
 			all_entries.push_back(e);
 		}
@@ -350,17 +386,21 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			LootdropEntries e{};
 
-			e.lootdrop_id       = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
-			e.item_id           = row[1] ? static_cast<int32_t>(atoi(row[1])) : 0;
-			e.item_charges      = row[2] ? static_cast<uint16_t>(strtoul(row[2], nullptr, 10)) : 1;
-			e.equip_item        = row[3] ? static_cast<uint8_t>(strtoul(row[3], nullptr, 10)) : 0;
-			e.chance            = row[4] ? strtof(row[4], nullptr) : 1;
-			e.disabled_chance   = row[5] ? strtof(row[5], nullptr) : 0;
-			e.trivial_min_level = row[6] ? static_cast<uint16_t>(strtoul(row[6], nullptr, 10)) : 0;
-			e.trivial_max_level = row[7] ? static_cast<uint16_t>(strtoul(row[7], nullptr, 10)) : 0;
-			e.multiplier        = row[8] ? static_cast<uint8_t>(strtoul(row[8], nullptr, 10)) : 1;
-			e.npc_min_level     = row[9] ? static_cast<uint16_t>(strtoul(row[9], nullptr, 10)) : 0;
-			e.npc_max_level     = row[10] ? static_cast<uint16_t>(strtoul(row[10], nullptr, 10)) : 0;
+			e.lootdrop_id            = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.item_id                = row[1] ? static_cast<int32_t>(atoi(row[1])) : 0;
+			e.item_charges           = row[2] ? static_cast<uint16_t>(strtoul(row[2], nullptr, 10)) : 1;
+			e.equip_item             = row[3] ? static_cast<uint8_t>(strtoul(row[3], nullptr, 10)) : 0;
+			e.chance                 = row[4] ? strtof(row[4], nullptr) : 1;
+			e.disabled_chance        = row[5] ? strtof(row[5], nullptr) : 0;
+			e.trivial_min_level      = row[6] ? static_cast<uint16_t>(strtoul(row[6], nullptr, 10)) : 0;
+			e.trivial_max_level      = row[7] ? static_cast<uint16_t>(strtoul(row[7], nullptr, 10)) : 0;
+			e.multiplier             = row[8] ? static_cast<uint8_t>(strtoul(row[8], nullptr, 10)) : 1;
+			e.npc_min_level          = row[9] ? static_cast<uint16_t>(strtoul(row[9], nullptr, 10)) : 0;
+			e.npc_max_level          = row[10] ? static_cast<uint16_t>(strtoul(row[10], nullptr, 10)) : 0;
+			e.min_expansion          = row[11] ? static_cast<int8_t>(atoi(row[11])) : -1;
+			e.max_expansion          = row[12] ? static_cast<int8_t>(atoi(row[12])) : -1;
+			e.content_flags          = row[13] ? row[13] : "";
+			e.content_flags_disabled = row[14] ? row[14] : "";
 
 			all_entries.push_back(e);
 		}
@@ -446,6 +486,10 @@ public:
 		v.push_back(std::to_string(e.multiplier));
 		v.push_back(std::to_string(e.npc_min_level));
 		v.push_back(std::to_string(e.npc_max_level));
+		v.push_back(std::to_string(e.min_expansion));
+		v.push_back(std::to_string(e.max_expansion));
+		v.push_back("'" + Strings::Escape(e.content_flags) + "'");
+		v.push_back("'" + Strings::Escape(e.content_flags_disabled) + "'");
 
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -479,6 +523,10 @@ public:
 			v.push_back(std::to_string(e.multiplier));
 			v.push_back(std::to_string(e.npc_min_level));
 			v.push_back(std::to_string(e.npc_max_level));
+			v.push_back(std::to_string(e.min_expansion));
+			v.push_back(std::to_string(e.max_expansion));
+			v.push_back("'" + Strings::Escape(e.content_flags) + "'");
+			v.push_back("'" + Strings::Escape(e.content_flags_disabled) + "'");
 
 			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
 		}

common/repositories/base/base_npc_spells_entries_repository.h

@@ -19,18 +19,22 @@
 class BaseNpcSpellsEntriesRepository {
 public:
 	struct NpcSpellsEntries {
-		uint32_t id;
-		int32_t  npc_spells_id;
-		uint16_t spellid;
-		uint32_t type;
-		uint8_t  minlevel;
-		uint8_t  maxlevel;
-		int16_t  manacost;
-		int32_t  recast_delay;
-		int16_t  priority;
-		int32_t  resist_adjust;
-		int16_t  min_hp;
-		int16_t  max_hp;
+		uint32_t    id;
+		int32_t     npc_spells_id;
+		uint16_t    spellid;
+		uint32_t    type;
+		uint8_t     minlevel;
+		uint8_t     maxlevel;
+		int16_t     manacost;
+		int32_t     recast_delay;
+		int16_t     priority;
+		int32_t     resist_adjust;
+		int16_t     min_hp;
+		int16_t     max_hp;
+		int8_t      min_expansion;
+		int8_t      max_expansion;
+		std::string content_flags;
+		std::string content_flags_disabled;
 	};
 
 	static std::string PrimaryKey()
@@ -53,6 +57,10 @@ public:
 			"resist_adjust",
 			"min_hp",
 			"max_hp",
+			"min_expansion",
+			"max_expansion",
+			"content_flags",
+			"content_flags_disabled",
 		};
 	}
 
@@ -71,6 +79,10 @@ public:
 			"resist_adjust",
 			"min_hp",
 			"max_hp",
+			"min_expansion",
+			"max_expansion",
+			"content_flags",
+			"content_flags_disabled",
 		};
 	}
 
@@ -111,18 +123,22 @@ public:
 	{
 		NpcSpellsEntries e{};
 
-		e.id            = 0;
-		e.npc_spells_id = 0;
-		e.spellid       = 0;
-		e.type          = 0;
-		e.minlevel      = 0;
-		e.maxlevel      = 255;
-		e.manacost      = -1;
-		e.recast_delay  = -1;
-		e.priority      = 0;
-		e.resist_adjust = 0;
-		e.min_hp        = 0;
-		e.max_hp        = 0;
+		e.id                     = 0;
+		e.npc_spells_id          = 0;
+		e.spellid                = 0;
+		e.type                   = 0;
+		e.minlevel               = 0;
+		e.maxlevel               = 255;
+		e.manacost               = -1;
+		e.recast_delay           = -1;
+		e.priority               = 0;
+		e.resist_adjust          = 0;
+		e.min_hp                 = 0;
+		e.max_hp                 = 0;
+		e.min_expansion          = -1;
+		e.max_expansion          = -1;
+		e.content_flags          = "";
+		e.content_flags_disabled = "";
 
 		return e;
 	}
@@ -159,18 +175,22 @@ public:
 		if (results.RowCount() == 1) {
 			NpcSpellsEntries e{};
 
-			e.id            = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
-			e.npc_spells_id = row[1] ? static_cast<int32_t>(atoi(row[1])) : 0;
-			e.spellid       = row[2] ? static_cast<uint16_t>(strtoul(row[2], nullptr, 10)) : 0;
-			e.type          = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
-			e.minlevel      = row[4] ? static_cast<uint8_t>(strtoul(row[4], nullptr, 10)) : 0;
-			e.maxlevel      = row[5] ? static_cast<uint8_t>(strtoul(row[5], nullptr, 10)) : 255;
-			e.manacost      = row[6] ? static_cast<int16_t>(atoi(row[6])) : -1;
-			e.recast_delay  = row[7] ? static_cast<int32_t>(atoi(row[7])) : -1;
-			e.priority      = row[8] ? static_cast<int16_t>(atoi(row[8])) : 0;
-			e.resist_adjust = row[9] ? static_cast<int32_t>(atoi(row[9])) : 0;
-			e.min_hp        = row[10] ? static_cast<int16_t>(atoi(row[10])) : 0;
-			e.max_hp        = row[11] ? static_cast<int16_t>(atoi(row[11])) : 0;
+			e.id                     = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.npc_spells_id          = row[1] ? static_cast<int32_t>(atoi(row[1])) : 0;
+			e.spellid                = row[2] ? static_cast<uint16_t>(strtoul(row[2], nullptr, 10)) : 0;
+			e.type                   = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
+			e.minlevel               = row[4] ? static_cast<uint8_t>(strtoul(row[4], nullptr, 10)) : 0;
+			e.maxlevel               = row[5] ? static_cast<uint8_t>(strtoul(row[5], nullptr, 10)) : 255;
+			e.manacost               = row[6] ? static_cast<int16_t>(atoi(row[6])) : -1;
+			e.recast_delay           = row[7] ? static_cast<int32_t>(atoi(row[7])) : -1;
+			e.priority               = row[8] ? static_cast<int16_t>(atoi(row[8])) : 0;
+			e.resist_adjust          = row[9] ? static_cast<int32_t>(atoi(row[9])) : 0;
+			e.min_hp                 = row[10] ? static_cast<int16_t>(atoi(row[10])) : 0;
+			e.max_hp                 = row[11] ? static_cast<int16_t>(atoi(row[11])) : 0;
+			e.min_expansion          = row[12] ? static_cast<int8_t>(atoi(row[12])) : -1;
+			e.max_expansion          = row[13] ? static_cast<int8_t>(atoi(row[13])) : -1;
+			e.content_flags          = row[14] ? row[14] : "";
+			e.content_flags_disabled = row[15] ? row[15] : "";
 
 			return e;
 		}
@@ -215,6 +235,10 @@ public:
 		v.push_back(columns[9] + " = " + std::to_string(e.resist_adjust));
 		v.push_back(columns[10] + " = " + std::to_string(e.min_hp));
 		v.push_back(columns[11] + " = " + std::to_string(e.max_hp));
+		v.push_back(columns[12] + " = " + std::to_string(e.min_expansion));
+		v.push_back(columns[13] + " = " + std::to_string(e.max_expansion));
+		v.push_back(columns[14] + " = '" + Strings::Escape(e.content_flags) + "'");
+		v.push_back(columns[15] + " = '" + Strings::Escape(e.content_flags_disabled) + "'");
 
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -248,6 +272,10 @@ public:
 		v.push_back(std::to_string(e.resist_adjust));
 		v.push_back(std::to_string(e.min_hp));
 		v.push_back(std::to_string(e.max_hp));
+		v.push_back(std::to_string(e.min_expansion));
+		v.push_back(std::to_string(e.max_expansion));
+		v.push_back("'" + Strings::Escape(e.content_flags) + "'");
+		v.push_back("'" + Strings::Escape(e.content_flags_disabled) + "'");
 
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -289,6 +317,10 @@ public:
 			v.push_back(std::to_string(e.resist_adjust));
 			v.push_back(std::to_string(e.min_hp));
 			v.push_back(std::to_string(e.max_hp));
+			v.push_back(std::to_string(e.min_expansion));
+			v.push_back(std::to_string(e.max_expansion));
+			v.push_back("'" + Strings::Escape(e.content_flags) + "'");
+			v.push_back("'" + Strings::Escape(e.content_flags_disabled) + "'");
 
 			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
 		}
@@ -322,18 +354,22 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			NpcSpellsEntries e{};
 
-			e.id            = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
-			e.npc_spells_id = row[1] ? static_cast<int32_t>(atoi(row[1])) : 0;
-			e.spellid       = row[2] ? static_cast<uint16_t>(strtoul(row[2], nullptr, 10)) : 0;
-			e.type          = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
-			e.minlevel      = row[4] ? static_cast<uint8_t>(strtoul(row[4], nullptr, 10)) : 0;
-			e.maxlevel      = row[5] ? static_cast<uint8_t>(strtoul(row[5], nullptr, 10)) : 255;
-			e.manacost      = row[6] ? static_cast<int16_t>(atoi(row[6])) : -1;
-			e.recast_delay  = row[7] ? static_cast<int32_t>(atoi(row[7])) : -1;
-			e.priority      = row[8] ? static_cast<int16_t>(atoi(row[8])) : 0;
-			e.resist_adjust = row[9] ? static_cast<int32_t>(atoi(row[9])) : 0;
-			e.min_hp        = row[10] ? static_cast<int16_t>(atoi(row[10])) : 0;
-			e.max_hp        = row[11] ? static_cast<int16_t>(atoi(row[11])) : 0;
+			e.id                     = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.npc_spells_id          = row[1] ? static_cast<int32_t>(atoi(row[1])) : 0;
+			e.spellid                = row[2] ? static_cast<uint16_t>(strtoul(row[2], nullptr, 10)) : 0;
+			e.type                   = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
+			e.minlevel               = row[4] ? static_cast<uint8_t>(strtoul(row[4], nullptr, 10)) : 0;
+			e.maxlevel               = row[5] ? static_cast<uint8_t>(strtoul(row[5], nullptr, 10)) : 255;
+			e.manacost               = row[6] ? static_cast<int16_t>(atoi(row[6])) : -1;
+			e.recast_delay           = row[7] ? static_cast<int32_t>(atoi(row[7])) : -1;
+			e.priority               = row[8] ? static_cast<int16_t>(atoi(row[8])) : 0;
+			e.resist_adjust          = row[9] ? static_cast<int32_t>(atoi(row[9])) : 0;
+			e.min_hp                 = row[10] ? static_cast<int16_t>(atoi(row[10])) : 0;
+			e.max_hp                 = row[11] ? static_cast<int16_t>(atoi(row[11])) : 0;
+			e.min_expansion          = row[12] ? static_cast<int8_t>(atoi(row[12])) : -1;
+			e.max_expansion          = row[13] ? static_cast<int8_t>(atoi(row[13])) : -1;
+			e.content_flags          = row[14] ? row[14] : "";
+			e.content_flags_disabled = row[15] ? row[15] : "";
 
 			all_entries.push_back(e);
 		}
@@ -358,18 +394,22 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			NpcSpellsEntries e{};
 
-			e.id            = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
-			e.npc_spells_id = row[1] ? static_cast<int32_t>(atoi(row[1])) : 0;
-			e.spellid       = row[2] ? static_cast<uint16_t>(strtoul(row[2], nullptr, 10)) : 0;
-			e.type          = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
-			e.minlevel      = row[4] ? static_cast<uint8_t>(strtoul(row[4], nullptr, 10)) : 0;
-			e.maxlevel      = row[5] ? static_cast<uint8_t>(strtoul(row[5], nullptr, 10)) : 255;
-			e.manacost      = row[6] ? static_cast<int16_t>(atoi(row[6])) : -1;
-			e.recast_delay  = row[7] ? static_cast<int32_t>(atoi(row[7])) : -1;
-			e.priority      = row[8] ? static_cast<int16_t>(atoi(row[8])) : 0;
-			e.resist_adjust = row[9] ? static_cast<int32_t>(atoi(row[9])) : 0;
-			e.min_hp        = row[10] ? static_cast<int16_t>(atoi(row[10])) : 0;
-			e.max_hp        = row[11] ? static_cast<int16_t>(atoi(row[11])) : 0;
+			e.id                     = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.npc_spells_id          = row[1] ? static_cast<int32_t>(atoi(row[1])) : 0;
+			e.spellid                = row[2] ? static_cast<uint16_t>(strtoul(row[2], nullptr, 10)) : 0;
+			e.type                   = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
+			e.minlevel               = row[4] ? static_cast<uint8_t>(strtoul(row[4], nullptr, 10)) : 0;
+			e.maxlevel               = row[5] ? static_cast<uint8_t>(strtoul(row[5], nullptr, 10)) : 255;
+			e.manacost               = row[6] ? static_cast<int16_t>(atoi(row[6])) : -1;
+			e.recast_delay           = row[7] ? static_cast<int32_t>(atoi(row[7])) : -1;
+			e.priority               = row[8] ? static_cast<int16_t>(atoi(row[8])) : 0;
+			e.resist_adjust          = row[9] ? static_cast<int32_t>(atoi(row[9])) : 0;
+			e.min_hp                 = row[10] ? static_cast<int16_t>(atoi(row[10])) : 0;
+			e.max_hp                 = row[11] ? static_cast<int16_t>(atoi(row[11])) : 0;
+			e.min_expansion          = row[12] ? static_cast<int8_t>(atoi(row[12])) : -1;
+			e.max_expansion          = row[13] ? static_cast<int8_t>(atoi(row[13])) : -1;
+			e.content_flags          = row[14] ? row[14] : "";
+			e.content_flags_disabled = row[15] ? row[15] : "";
 
 			all_entries.push_back(e);
 		}
@@ -456,6 +496,10 @@ public:
 		v.push_back(std::to_string(e.resist_adjust));
 		v.push_back(std::to_string(e.min_hp));
 		v.push_back(std::to_string(e.max_hp));
+		v.push_back(std::to_string(e.min_expansion));
+		v.push_back(std::to_string(e.max_expansion));
+		v.push_back("'" + Strings::Escape(e.content_flags) + "'");
+		v.push_back("'" + Strings::Escape(e.content_flags_disabled) + "'");
 
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -490,6 +534,10 @@ public:
 			v.push_back(std::to_string(e.resist_adjust));
 			v.push_back(std::to_string(e.min_hp));
 			v.push_back(std::to_string(e.max_hp));
+			v.push_back(std::to_string(e.min_expansion));
+			v.push_back(std::to_string(e.max_expansion));
+			v.push_back("'" + Strings::Escape(e.content_flags) + "'");
+			v.push_back("'" + Strings::Escape(e.content_flags_disabled) + "'");
 
 			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
 		}

common/repositories/base/base_object_contents_repository.h

@@ -116,7 +116,7 @@ public:
 		e.bagidx   = 0;
 		e.itemid   = 0;
 		e.charges  = 0;
-		e.droptime = 0;
+		e.droptime = std::time(nullptr);
 		e.augslot1 = 0;
 		e.augslot2 = 0;
 		e.augslot3 = 0;

common/repositories/base/base_skill_caps_repository.h

@@ -19,8 +19,9 @@
 class BaseSkillCapsRepository {
 public:
 	struct SkillCaps {
-		uint8_t  skillID;
-		uint8_t  class_;
+		uint32_t id;
+		uint8_t  skill_id;
+		uint8_t  class_id;
 		uint8_t  level;
 		uint32_t cap;
 		uint8_t  class_;
@@ -28,14 +29,15 @@ public:
 
 	static std::string PrimaryKey()
 	{
-		return std::string("skillID");
+		return std::string("id");
 	}
 
 	static std::vector<std::string> Columns()
 	{
 		return {
-			"skillID",
-			"`class`",
+			"id",
+			"skill_id",
+			"class_id",
 			"level",
 			"cap",
 			"class_",
@@ -45,8 +47,9 @@ public:
 	static std::vector<std::string> SelectColumns()
 	{
 		return {
-			"skillID",
-			"`class`",
+			"id",
+			"skill_id",
+			"class_id",
 			"level",
 			"cap",
 			"class_",
@@ -90,11 +93,12 @@ public:
 	{
 		SkillCaps e{};
 
-		e.skillID = 0;
-		e.class_  = 0;
-		e.level   = 0;
-		e.cap     = 0;
-		e.class_  = 0;
+		e.id       = 0;
+		e.skill_id = 0;
+		e.class_id = 0;
+		e.level    = 0;
+		e.cap      = 0;
+		e.class_   = 0;
 
 		return e;
 	}
@@ -105,7 +109,7 @@ public:
 	)
 	{
 		for (auto &skill_caps : skill_capss) {
-			if (skill_caps.skillID == skill_caps_id) {
+			if (skill_caps.id == skill_caps_id) {
 				return skill_caps;
 			}
 		}
@@ -131,11 +135,12 @@ public:
 		if (results.RowCount() == 1) {
 			SkillCaps e{};
 
-			e.skillID = row[0] ? static_cast<uint8_t>(strtoul(row[0], nullptr, 10)) : 0;
-			e.class_  = row[1] ? static_cast<uint8_t>(strtoul(row[1], nullptr, 10)) : 0;
-			e.level   = row[2] ? static_cast<uint8_t>(strtoul(row[2], nullptr, 10)) : 0;
-			e.cap     = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
-			e.class_  = row[4] ? static_cast<uint8_t>(strtoul(row[4], nullptr, 10)) : 0;
+			e.id       = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.skill_id = row[1] ? static_cast<uint8_t>(strtoul(row[1], nullptr, 10)) : 0;
+			e.class_id = row[2] ? static_cast<uint8_t>(strtoul(row[2], nullptr, 10)) : 0;
+			e.level    = row[3] ? static_cast<uint8_t>(strtoul(row[3], nullptr, 10)) : 0;
+			e.cap      = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
+			e.class_   = row[5] ? static_cast<uint8_t>(strtoul(row[5], nullptr, 10)) : 0;
 
 			return e;
 		}
@@ -169,11 +174,11 @@ public:
 
 		auto columns = Columns();
 
-		v.push_back(columns[0] + " = " + std::to_string(e.skillID));
-		v.push_back(columns[1] + " = " + std::to_string(e.class_));
-		v.push_back(columns[2] + " = " + std::to_string(e.level));
-		v.push_back(columns[3] + " = " + std::to_string(e.cap));
-		v.push_back(columns[4] + " = " + std::to_string(e.class_));
+		v.push_back(columns[1] + " = " + std::to_string(e.skill_id));
+		v.push_back(columns[2] + " = " + std::to_string(e.class_id));
+		v.push_back(columns[3] + " = " + std::to_string(e.level));
+		v.push_back(columns[4] + " = " + std::to_string(e.cap));
+		v.push_back(columns[5] + " = " + std::to_string(e.class_));
 
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -181,7 +186,7 @@ public:
 				TableName(),
 				Strings::Implode(", ", v),
 				PrimaryKey(),
-				e.skillID
+				e.id
 			)
 		);
 
@@ -195,8 +200,9 @@ public:
 	{
 		std::vector<std::string> v;
 
-		v.push_back(std::to_string(e.skillID));
-		v.push_back(std::to_string(e.class_));
+		v.push_back(std::to_string(e.id));
+		v.push_back(std::to_string(e.skill_id));
+		v.push_back(std::to_string(e.class_id));
 		v.push_back(std::to_string(e.level));
 		v.push_back(std::to_string(e.cap));
 		v.push_back(std::to_string(e.class_));
@@ -210,7 +216,7 @@ public:
 		);
 
 		if (results.Success()) {
-			e.skillID = results.LastInsertedID();
+			e.id = results.LastInsertedID();
 			return e;
 		}
 
@@ -229,8 +235,9 @@ public:
 		for (auto &e: entries) {
 			std::vector<std::string> v;
 
-			v.push_back(std::to_string(e.skillID));
-			v.push_back(std::to_string(e.class_));
+			v.push_back(std::to_string(e.id));
+			v.push_back(std::to_string(e.skill_id));
+			v.push_back(std::to_string(e.class_id));
 			v.push_back(std::to_string(e.level));
 			v.push_back(std::to_string(e.cap));
 			v.push_back(std::to_string(e.class_));
@@ -267,11 +274,12 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			SkillCaps e{};
 
-			e.skillID = row[0] ? static_cast<uint8_t>(strtoul(row[0], nullptr, 10)) : 0;
-			e.class_  = row[1] ? static_cast<uint8_t>(strtoul(row[1], nullptr, 10)) : 0;
-			e.level   = row[2] ? static_cast<uint8_t>(strtoul(row[2], nullptr, 10)) : 0;
-			e.cap     = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
-			e.class_  = row[4] ? static_cast<uint8_t>(strtoul(row[4], nullptr, 10)) : 0;
+			e.id       = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.skill_id = row[1] ? static_cast<uint8_t>(strtoul(row[1], nullptr, 10)) : 0;
+			e.class_id = row[2] ? static_cast<uint8_t>(strtoul(row[2], nullptr, 10)) : 0;
+			e.level    = row[3] ? static_cast<uint8_t>(strtoul(row[3], nullptr, 10)) : 0;
+			e.cap      = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
+			e.class_   = row[5] ? static_cast<uint8_t>(strtoul(row[5], nullptr, 10)) : 0;
 
 			all_entries.push_back(e);
 		}
@@ -296,11 +304,12 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			SkillCaps e{};
 
-			e.skillID = row[0] ? static_cast<uint8_t>(strtoul(row[0], nullptr, 10)) : 0;
-			e.class_  = row[1] ? static_cast<uint8_t>(strtoul(row[1], nullptr, 10)) : 0;
-			e.level   = row[2] ? static_cast<uint8_t>(strtoul(row[2], nullptr, 10)) : 0;
-			e.cap     = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
-			e.class_  = row[4] ? static_cast<uint8_t>(strtoul(row[4], nullptr, 10)) : 0;
+			e.id       = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.skill_id = row[1] ? static_cast<uint8_t>(strtoul(row[1], nullptr, 10)) : 0;
+			e.class_id = row[2] ? static_cast<uint8_t>(strtoul(row[2], nullptr, 10)) : 0;
+			e.level    = row[3] ? static_cast<uint8_t>(strtoul(row[3], nullptr, 10)) : 0;
+			e.cap      = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
+			e.class_   = row[5] ? static_cast<uint8_t>(strtoul(row[5], nullptr, 10)) : 0;
 
 			all_entries.push_back(e);
 		}
@@ -375,8 +384,9 @@ public:
 	{
 		std::vector<std::string> v;
 
-		v.push_back(std::to_string(e.skillID));
-		v.push_back(std::to_string(e.class_));
+		v.push_back(std::to_string(e.id));
+		v.push_back(std::to_string(e.skill_id));
+		v.push_back(std::to_string(e.class_id));
 		v.push_back(std::to_string(e.level));
 		v.push_back(std::to_string(e.cap));
 		v.push_back(std::to_string(e.class_));
@@ -402,8 +412,9 @@ public:
 		for (auto &e: entries) {
 			std::vector<std::string> v;
 
-			v.push_back(std::to_string(e.skillID));
-			v.push_back(std::to_string(e.class_));
+			v.push_back(std::to_string(e.id));
+			v.push_back(std::to_string(e.skill_id));
+			v.push_back(std::to_string(e.class_id));
 			v.push_back(std::to_string(e.level));
 			v.push_back(std::to_string(e.cap));
 			v.push_back(std::to_string(e.class_));